[pkgsrc/trunk]: pkgsrc bl3ify

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/73e919c7108d
branches:  trunk
changeset: 465764:73e919c7108d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jan 05 22:33:45 2004 +0000

description:
bl3ify

diffstat:

 graphics/tiff/Makefile    |  12 ++++++++----
 security/openssl/Makefile |  11 ++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diffs (79 lines):

diff -r 59c2fd85ec58 -r 73e919c7108d graphics/tiff/Makefile
--- a/graphics/tiff/Makefile    Mon Jan 05 22:27:19 2004 +0000
+++ b/graphics/tiff/Makefile    Mon Jan 05 22:33:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2004/01/03 18:33:24 reed Exp $
+# $NetBSD: Makefile,v 1.50 2004/01/05 22:33:45 jlam Exp $
 
 DISTNAME=      tiff-v3.6.1
 PKGNAME=       tiff-3.6.1
@@ -23,7 +23,9 @@
 
 BUILD_DEFS+=   USE_GIF
 
-USE_BUILDLINK2=        yes
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=        yes
 USE_LIBTOOL=   yes
 HAS_CONFIGURE= yes
 CONFIGURE_ARGS=        --noninteractive --site=${FILESDIR} --prefix=${PREFIX}
@@ -52,6 +54,8 @@
 CONFIGURE_ENV+=        PREFIX="${PREFIX}"
 CONFIGURE_ENV+=        ENVOPTS="${CFLAGS} ${CPPFLAGS}"
 
+INSTALLATION_DIRS=     share/doc/html
+
 post-patch:
        # reference correct relative man page when using .so
        #
@@ -66,6 +70,6 @@
        ${SED}  -e "s,\(\$${CC} -o\),\$${LIBTOOL} \1,g" \
                ${WRKSRC}/tools/Makefile.in.in  > ${WRKSRC}/tools/Makefile.in
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 59c2fd85ec58 -r 73e919c7108d security/openssl/Makefile
--- a/security/openssl/Makefile Mon Jan 05 22:27:19 2004 +0000
+++ b/security/openssl/Makefile Mon Jan 05 22:33:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2003/11/19 02:57:44 jschauma Exp $
+# $NetBSD: Makefile,v 1.85 2004/01/05 22:39:11 jlam Exp $
 
 DISTNAME=              openssl-0.9.6l
 SVR4_PKGNAME=          ossl
@@ -9,8 +9,6 @@
 HOMEPAGE=              http://www.openssl.org/
 COMMENT=               Secure Socket Layer and cryptographic library
 
-USE_PERL5=             build
-
 CONFLICTS=             SSLeay-[0-9]* ssleay-[0-9]*
 
 CRYPTO=                        YES
@@ -18,9 +16,12 @@
 # openssl supplies IDEA/RC5.  IDEA/RC5 need license for commercial use.
 LICENCE=               fee-based-commercial-use
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK2=                YES
+USE_PERL5=             build
+USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
 HAS_CONFIGURE=         YES
 CONFIGURE_SCRIPT=      ./config
@@ -29,7 +30,7 @@
 CONFIGURE_ARGS+=       shared
 
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == "YES"
-.  include "../../security/rsaref/buildlink2.mk"
+.  include "../../security/rsaref/buildlink3.mk"
 CONFIGURE_ARGS+=       rsaref
 PLIST_RSAREF=          ${PKGDIR}/PLIST.rsaref
 .endif