Add bzip2/zlib support to links. Add destdir support. Bump rev.

4 files changed, 29 insertions, 5 deletions

diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile
index 8dc2f1b380b..97b3e539232 100644
--- a/www/links-gui/Makefile
+++ b/www/links-gui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2007/08/29 20:46:51 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2007/10/16 17:12:23 bjs Exp $
 #
 
 PKGNAME=	links-gui-2.1.0.30
+PKGREVISION=	1
 
 COMMENT=	Lynx-like text and graphics WWW browser
 
diff --git a/www/links/Makefile b/www/links/Makefile
index 70df85122dd..afdc925060c 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2007/08/29 20:46:51 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2007/10/16 17:12:23 bjs Exp $
 #
 
 PKGNAME=	links-2.1.0.30
+PKGREVISION=	1
 COMMENT=	Lynx-like text WWW browser
 
 CONFLICTS+=	links-gui-[0-9]* elinks-0.3*
diff --git a/www/links/Makefile.common b/www/links/Makefile.common
index 0d651f04305..ea27d3ad06f 100644
--- a/www/links/Makefile.common
+++ b/www/links/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2007/08/29 20:46:51 wiz Exp $
+# $NetBSD: Makefile.common,v 1.38 2007/10/16 17:12:23 bjs Exp $
 
 DISTNAME=	links-2.1pre30
 CATEGORIES=	www
@@ -9,6 +9,7 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://links.twibright.com/
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-javascript
@@ -17,8 +18,10 @@ PLIST_SRC=		${.CURDIR}/../../www/links/PLIST
 PATCHDIR=		${.CURDIR}/../../www/links/patches
 DISTINFO_FILE=		${.CURDIR}/../../www/links/distinfo
 
+.include "options.mk"
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/links
-	${INSTALL_DATA} ${WRKSRC}/KEYS ${PREFIX}/share/doc/links
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/links
+	${INSTALL_DATA} ${WRKSRC}/KEYS ${DESTDIR}${PREFIX}/share/doc/links
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/www/links/options.mk b/www/links/options.mk
new file mode 100644
index 00000000000..26ca0bc41b0
--- /dev/null
+++ b/www/links/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2007/10/16 17:12:23 bjs Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.links
+PKG_SUPPORTED_OPTIONS=	bzip2 links-zlib
+PKG_SUGGESTED_OPTIONS=	bzip2 links-zlib
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mbzip2)
+.  include "../../archivers/bzip2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-bzip2
+.endif
+
+.if !empty(PKG_OPTIONS:Mlinks-zlib)
+.  include "../../devel/zlib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-zlib
+.endif