aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2014-07-10 21:01:01 +0800
committertijl <tijl@FreeBSD.org>2014-07-10 21:01:01 +0800
commit1d49a06ccfc4d95bf96dad6a9cd2978debd4f9a1 (patch)
tree0f7a2ea844e30175edef99e9422f232a8a7dfa6f
parentafbbe99a6519c3a4dd0c14d820569be1771a7277 (diff)
downloadfreebsd-ports-gnome-1d49a06ccfc4d95bf96dad6a9cd2978debd4f9a1.tar.gz
freebsd-ports-gnome-1d49a06ccfc4d95bf96dad6a9cd2978debd4f9a1.tar.zst
freebsd-ports-gnome-1d49a06ccfc4d95bf96dad6a9cd2978debd4f9a1.zip
- Add USES=libtool and INSTALL_TARGET=install-strip
- Use better option helper - Remove use of PTHREAD_LIBS
-rw-r--r--net/libvncserver/Makefile28
-rw-r--r--net/libvncserver/pkg-plist4
2 files changed, 13 insertions, 19 deletions
diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile
index 0dfef8e9f083..d085070b458b 100644
--- a/net/libvncserver/Makefile
+++ b/net/libvncserver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libvncserver
PORTVERSION= 0.9.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net devel
MASTER_SITES= SF
DISTNAME= LibVNCServer-${PORTVERSION}
@@ -16,37 +16,31 @@ LICENSE= GPLv2
LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
libpng15.so:${PORTSDIR}/graphics/png
-USES= pathfix
+USES= libtool pathfix
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --without-x
+INSTALL_TARGET= install-strip
OPTIONS_DEFINE= GNUTLS OPENSSL GCRYPT IPV6
-OPTIONS_DEFAULT= OPENSSL
+OPTIONS_DEFAULT=OPENSSL
GCRYPT_DESC= libgcrypt support
-GNUTLS_LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls
-GNUTLS_CONFIGURE_ON= --with-gnutls
-GNUTLS_CONFIGURE_OFF= --without-gnutls
+GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_CONFIGURE_WITH= gnutls
-OPENSSL_CONFIGURE_ON= --with-ssl
-OPENSSL_CONFIGURE_OFF= --without-crypto --without-ssl
+OPENSSL_CONFIGURE_WITH= crypto ssl
+OPENSSL_USE= OPENSSL=yes
-GCRYPT_LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt
-GCRYPT_CONFIGURE_ON= --with-gcrypt
-GCRYPT_CONFIGURE_OFF= --without-gcrypt
+GCRYPT_LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GCRYPT_CONFIGURE_WITH= gcrypt
-IPV6_CONFIGURE_ON= --with-ipv6
-IPV6_CONFIGURE_OFF= --without-ipv6
-
-OPENSSL_USE= OPENSSL=yes
+IPV6_CONFIGURE_WITH= ipv6
post-patch:
@${REINPLACE_CMD} -e \
- 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e \
'/^SUBDIRS/s|x11vnc||g' ${WRKSRC}/Makefile.in
post-install:
diff --git a/net/libvncserver/pkg-plist b/net/libvncserver/pkg-plist
index 9d92f28de743..eedeb70fe28b 100644
--- a/net/libvncserver/pkg-plist
+++ b/net/libvncserver/pkg-plist
@@ -8,13 +8,13 @@ include/rfb/rfbint.h
include/rfb/rfbproto.h
include/rfb/rfbregion.h
lib/libvncclient.a
-lib/libvncclient.la
lib/libvncclient.so
lib/libvncclient.so.0
+lib/libvncclient.so.0.0.0
lib/libvncserver.a
-lib/libvncserver.la
lib/libvncserver.so
lib/libvncserver.so.0
+lib/libvncserver.so.0.0.0
libdata/pkgconfig/libvncclient.pc
libdata/pkgconfig/libvncserver.pc
@dirrm include/rfb