[Midnightbsd-cvs] mports [17460] trunk/www/links/Makefile: modernize links

[laffer1 at midnightbsd.org]

Revision: 17460
          http://svnweb.midnightbsd.org/mports/?rev=17460
Author:   laffer1
Date:     2014-09-23 22:41:11 -0400 (Tue, 23 Sep 2014)
Log Message:
-----------
modernize links

Modified Paths:
--------------
    trunk/www/links/Makefile

Modified: trunk/www/links/Makefile
===================================================================
--- trunk/www/links/Makefile	2014-09-24 02:39:40 UTC (rev 17459)
+++ trunk/www/links/Makefile	2014-09-24 02:41:11 UTC (rev 17460)
@@ -2,6 +2,7 @@
 
 PORTNAME=	links
 DISTVERSION=	2.8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://links.twibright.com/download/ LOCAL/bf
@@ -11,7 +12,7 @@
 
 LICENSE=	gpl2
 
-CONFLICTS=	links-0*
+CONFLICTS=	links-0* links1-*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-ssl --without-pmshell --without-atheos \
@@ -20,58 +21,76 @@
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_OPENSSL=	yes
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
-DESKTOP_ENTRIES="links" \
-		"Lynx-like text WWW browser" \
-		"${DATADIR}/links.xpm" \
-		"links -g" \
-		"Application;Network;WebBrowser;" \
-		${FALSE}
+OPTIONS_DEFINE=	CIPHERSTRING DIRECTFB IPV6 SVGALIB THREADS TRANS UTF8 X11
 
-OPTIONS=	SVGALIB "non-X11 graphics support" off \
-		X11 "X11 graphics support" on \
-		TRANS "Hack for background transparency" off
+CIPHERSTRING_DESC=	Select the OpenSSL ciphers used via CIPHERSTRING
+DIRECTFB_DESC=	DirectFB graphics support
+SVGALIB_DESC=	SVGALib graphics support
+TRANS_DESC=	Hack for background transparency
+UTF8_DESC=	UTF-8 support
+X11_DESC=	X11 graphics support
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=	IPV6 UTF8 X11
 
-.if ${OSVERSION} < 4015
-LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz
-.endif
+PLIST_FILES=	bin/links man/man1/links.1.gz
 
-.ifdef(WITH_SVGALIB) || defined(WITH_X11) || defined(WITH_DIRECTFB)
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff
+DIRECTFB_LIB_DEPENDS=	libdirectfb.so:${PORTSDIR}/devel/directfb
+DIRECTFB_CONFIGURE_WITH=directfb
+
+IPV6_CONFIGURE_WITH=	ipv6
+
+SVGALIB_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+SVGALIB_CONFIGURE_WITH=	svgalib
+
+THREADS_CFLAGS=	-DHAVE_PTHREADS
+THREADS_LDFLAGS=-pthread
+
+TRANS_EXTRA_PATCHES=	${FILESDIR}/extra-terminal.c.diff
+
+UTF8_CONFIGURE_ENABLE=	utf8
+
+X11_USE=	xorg=x11,xproto
+X11_CONFIGURE_WITH=	x
+X11_PLIST_FILES=	share/pixmaps/links.xpm
+
+.include <bsd.mport.options.mk>
+
+#CIPHERSTRING must be a valid OpenSSL cipher string(see ciphers(1)):
+CIPHERSTRING?=	HIGH:!SSLv2:!aNULL:!eNULL:@STRENGTH
+
+.if ${PORT_OPTIONS:MDIRECTFB} || ${PORT_OPTIONS:MSVGALIB} || ${PORT_OPTIONS:MX11}
+LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libtiff.so:${PORTSDIR}/graphics/tiff
 CONFIGURE_ARGS+=	--enable-graphics
 .else
 CONFIGURE_ARGS+=	--disable-graphics --without-libjpeg --without-libtiff
 .endif
 
-.ifdef(WITH_SVGALIB)
-LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
-CONFIGURE_ARGS+=	--with-svgalib
-.else
-CONFIGURE_ARGS+=	--without-svgalib
+.if ${PORT_OPTIONS:MX11}
+DESKTOP_ENTRIES="links" \
+		"Lynx-like text WWW browser" \
+		"${PREFIX}/share/pixmaps/links.xpm" \
+		"links -g" \
+		"Network;WebBrowser;" \
+		false
 .endif
 
-CONFIGURE_ARGS+=	--without-directfb
-
-.if !defined(WITHOUT_X11)
-USE_XORG=	x11 xproto
-CONFIGURE_ARGS+=	--with-x
-.else
-CONFIGURE_ARGS+=	--without-x
+post-patch:
+	@${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/os_dep.h
+	@${REINPLACE_CMD} -e "/LIBS=/{s/-lpthread/-pthread/;s/-ldl//;}" \
+		${WRKSRC}/configure
+.if ${PORT_OPTIONS:MCIPHERSTRING}
+	@${REINPLACE_CMD} -e '/SSL_CTX_set_options/ \
+	s/;/; SSL_CTX_set_cipher_list(context, "${CIPHERSTRING}");/' \
+		${WRKSRC}/https.c
 .endif
 
-.if defined(WITH_TRANS)
-EXTRA_PATCHES+=		${FILESDIR}/extra-terminal.c.diff
+.if ${PORT_OPTIONS:MX11}
+post-install:
+	@${INSTALL_DATA} ${WRKSRC}/graphics/links.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/links.xpm
 .endif
 
-MAN1=		links.1
-PLIST_FILES=	bin/links
-
-post-patch:
-	@${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/os_dep.h
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>