summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2017-01-05 22:58:02 +0000
committerJan Beich <jbeich@FreeBSD.org>2017-01-05 22:58:02 +0000
commit7277ec6a16005fbbf00e59a8beacc7634f4376fc (patch)
tree89becbb47fd3ca1d6f3fd97d6677e0b01732e970 /security
parent96966101c6558191cb15925803ded6baf1737eb7 (diff)
downloadfreebsd-ports-7277ec6a16005fbbf00e59a8beacc7634f4376fc.zip
Assume "pkg-config libusb*" works after 9.x EOL
FreeBSD appears to use different pkg-config name for 0.1.x API but it doesn't matter much as 0.1, 1.0 and 2.0 share CFLAGS/LIBS.
Diffstat (limited to 'security')
-rw-r--r--security/libfprint/Makefile1
-rw-r--r--security/openct/Makefile7
2 files changed, 3 insertions, 5 deletions
diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile
index 96da28b9a2ba..d20e3f7b81a3 100644
--- a/security/libfprint/Makefile
+++ b/security/libfprint/Makefile
@@ -20,7 +20,6 @@ USE_OPENSSL= yes
USE_GNOME= glib20
INSTALL_TARGET= install-strip
-CONFIGURE_ENV= LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
CPPFLAGS+= -DHAVE_MEMMEM
MAKE_JOBS_UNSAFE=yes
diff --git a/security/openct/Makefile b/security/openct/Makefile
index 16b5c625e03c..33c5fff5e5d3 100644
--- a/security/openct/Makefile
+++ b/security/openct/Makefile
@@ -24,9 +24,7 @@ USE_RC_SUBR= openct
SUB_FILES= etoken.conf
CONFIGURE_ENV= LTLIB_CFLAGS="-I${LOCALBASE}/include" \
- LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl" \
- LIBUSB_CFLAGS="-I/usr/include" \
- LIBUSB_LIBS="-lusb"
+ LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl"
CONFIGURE_ARGS= --localstatedir=/var --enable-usb
@@ -48,7 +46,8 @@ CONFIGURE_ARGS+=--enable-doc
.endif
post-patch:
- @${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
+ @${REINPLACE_CMD} -e '/PKG_CONFIG/s/libusb/&-0.1/' \
+ -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
${WRKSRC}/configure
@${REINPLACE_CMD} 's|install-data-am: install-dist_apidocDATA install-dist_docDATA|install-data-am: install-dist_docDATA|' \
${WRKSRC}/doc/Makefile.in