svn commit: r361448 - head/net/libvncserver

[Tijl Coosemans]

Author: tijl
Date: Thu Jul 10 13:01:01 2014
New Revision: 361448
URL: http://svnweb.freebsd.org/changeset/ports/361448
QAT: https://qat.redports.org/buildarchive/r361448/

Log:
  - Add USES=libtool and INSTALL_TARGET=install-strip
  - Use better option helper
  - Remove use of PTHREAD_LIBS

Modified:
  head/net/libvncserver/Makefile
  head/net/libvncserver/pkg-plist

Modified: head/net/libvncserver/Makefile
==============================================================================
--- head/net/libvncserver/Makefile	Thu Jul 10 12:50:35 2014	(r361447)
+++ head/net/libvncserver/Makefile	Thu Jul 10 13:01:01 2014	(r361448)
@@ -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:

Modified: head/net/libvncserver/pkg-plist
==============================================================================
--- head/net/libvncserver/pkg-plist	Thu Jul 10 12:50:35 2014	(r361447)
+++ head/net/libvncserver/pkg-plist	Thu Jul 10 13:01:01 2014	(r361448)
@@ -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