[pkgsrc/trunk]: pkgsrc/www Add bzip2/zlib support to links. Add destdir supp...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7add66f9105
branches:  trunk
changeset: 534322:f7add66f9105
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Tue Oct 16 17:12:23 2007 +0000

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

diffstat:

 www/links-gui/Makefile    |   3 ++-
 www/links/Makefile        |   3 ++-
 www/links/Makefile.common |   9 ++++++---
 www/links/options.mk      |  19 +++++++++++++++++++
 4 files changed, 29 insertions(+), 5 deletions(-)

diffs (79 lines):

diff -r c9ae89f05cd8 -r f7add66f9105 www/links-gui/Makefile
--- a/www/links-gui/Makefile    Tue Oct 16 14:08:03 2007 +0000
+++ b/www/links-gui/Makefile    Tue Oct 16 17:12:23 2007 +0000
@@ -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 -r c9ae89f05cd8 -r f7add66f9105 www/links/Makefile
--- a/www/links/Makefile        Tue Oct 16 14:08:03 2007 +0000
+++ b/www/links/Makefile        Tue Oct 16 17:12:23 2007 +0000
@@ -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 -r c9ae89f05cd8 -r f7add66f9105 www/links/Makefile.common
--- a/www/links/Makefile.common Tue Oct 16 14:08:03 2007 +0000
+++ b/www/links/Makefile.common Tue Oct 16 17:12:23 2007 +0000
@@ -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 @@
 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 @@
 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 -r c9ae89f05cd8 -r f7add66f9105 www/links/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/links/options.mk      Tue Oct 16 17:12:23 2007 +0000
@@ -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