[pkgsrc/trunk]: pkgsrc/graphics bl3ify

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec9514604042
branches:  trunk
changeset: 465749:ec9514604042
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jan 05 20:38:34 2004 +0000

description:
bl3ify

diffstat:

 graphics/aalib-x11/Makefile           |   8 ++++++--
 graphics/freetype-lib/Makefile.common |   8 +++++---
 graphics/freetype-utils/Makefile      |   5 +++--
 graphics/jpeg/Makefile                |   7 +++++--
 graphics/libungif/Makefile            |  10 ++++++----
 graphics/png/Makefile                 |  10 +++++++---
 6 files changed, 32 insertions(+), 16 deletions(-)

diffs (169 lines):

diff -r 5a777b91bad3 -r ec9514604042 graphics/aalib-x11/Makefile
--- a/graphics/aalib-x11/Makefile       Mon Jan 05 19:18:09 2004 +0000
+++ b/graphics/aalib-x11/Makefile       Mon Jan 05 20:38:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/10/26 06:50:10 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/05 20:38:34 jlam Exp $
 
 PKGNAME=       aalib-x11-${BASE_VERS}
 CATEGORIES+=   x11
@@ -6,12 +6,16 @@
 
 COMMENT=       ASCII Art library with X11 support
 
-USE_BUILDLINK2=                # defined
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                # defined
 USE_X11=               # defined
 
 ALL_TARGET=            libaa-x11.la
 INSTALL_TARGET=                install-libLTLIBRARIES
 
+INSTALLATION_DIRS=     bin include lib
+
 # We need to correct the aalib-config script to return "-laa-x11" instead
 # of "-laa".
 #
diff -r 5a777b91bad3 -r ec9514604042 graphics/freetype-lib/Makefile.common
--- a/graphics/freetype-lib/Makefile.common     Mon Jan 05 19:18:09 2004 +0000
+++ b/graphics/freetype-lib/Makefile.common     Mon Jan 05 20:38:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2003/07/17 21:40:34 grant Exp $
+# $NetBSD: Makefile.common,v 1.24 2004/01/05 20:38:34 jlam Exp $
 
 DISTNAME=              freetype-${FT_VERS}
 FT_VERS=               1.3.1
@@ -12,9 +12,11 @@
 
 CONFLICTS=             freetype-1.[12]*
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 BUILD_USES_MSGFMT=     # defined
 
-USE_BUILDLINK2=                # defined
+USE_BUILDLINK3=                # defined
 USE_PKGLOCALEDIR=      # defined
 USE_LIBTOOL=           # defined
 LTCONFIG_OVERRIDE=     ${WRKSRC}/ltconfig
@@ -25,4 +27,4 @@
 DISTINFO_FILE=         ${.CURDIR}/../freetype-lib/distinfo
 PATCHDIR=              ${.CURDIR}/../freetype-lib/patches
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
diff -r 5a777b91bad3 -r ec9514604042 graphics/freetype-utils/Makefile
--- a/graphics/freetype-utils/Makefile  Mon Jan 05 19:18:09 2004 +0000
+++ b/graphics/freetype-utils/Makefile  Mon Jan 05 20:38:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/09/11 08:52:58 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/05 20:38:34 jlam Exp $
 
 .include "../freetype-lib/Makefile.common"
 
@@ -6,12 +6,13 @@
 COMMENT=       Utilities for manipulating TrueType fonts
 
 BUILDLINK_DEPENDS.freetype=    freetype-lib>=${FT_VERS}
+
 USE_X11=               # defined
 
 CONFIGURE_ARGS+=       --with-x
 ALL_TARGET=            tttest
 INSTALL_TARGET=                install-tttest
 
-.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../graphics/freetype-lib/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5a777b91bad3 -r ec9514604042 graphics/jpeg/Makefile
--- a/graphics/jpeg/Makefile    Mon Jan 05 19:18:09 2004 +0000
+++ b/graphics/jpeg/Makefile    Mon Jan 05 20:38:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/10/03 14:48:40 salo Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/05 20:38:35 jlam Exp $
 #
 
 DISTNAME=              jpegsrc.v6b
@@ -13,7 +13,9 @@
 HOMEPAGE=              http://www.ijg.org/
 COMMENT=               IJG's jpeg compression utilities
 
-USE_BUILDLINK2=                yes
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                yes
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 
@@ -25,6 +27,7 @@
 CONFIGURE_ARGS+=       --enable-static
 
 INSTALL_TARGET=                install install-lib
+INSTALLATION_DIRS=     bin lib include man/man1
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jpeg
diff -r 5a777b91bad3 -r ec9514604042 graphics/libungif/Makefile
--- a/graphics/libungif/Makefile        Mon Jan 05 19:18:09 2004 +0000
+++ b/graphics/libungif/Makefile        Mon Jan 05 20:38:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/12/02 06:57:46 xtraeme Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/05 20:38:35 jlam Exp $
 #
 
 DISTNAME=      libungif-4.1.0b1
@@ -13,13 +13,15 @@
 
 CONFLICTS=     giflib-[0-9]*
 
-USE_LIBTOOL=           # defined
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_LIBTOOL=           yes
 LTCONFIG_OVERRIDE=     ${WRKSRC}/ltconfig
 
-GNU_CONFIGURE=         # defined
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS=                --without-x
 
-USE_BUILDLINK2=                # defined
+USE_BUILDLINK3=                yes
 
 DOCDIR=                        ${PREFIX}/share/doc/libungif
 HTMLDIR=               ${PREFIX}/share/doc/html/libungif
diff -r 5a777b91bad3 -r ec9514604042 graphics/png/Makefile
--- a/graphics/png/Makefile     Mon Jan 05 19:18:09 2004 +0000
+++ b/graphics/png/Makefile     Mon Jan 05 20:38:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2003/08/29 20:49:30 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2004/01/05 20:38:35 jlam Exp $
 
 # On update, don't forget to increase shared library major/minor's in
 # accordance with changes (patch-aa).
@@ -17,7 +17,9 @@
 HOMEPAGE=      http://www.libpng.org/pub/png/
 COMMENT=       Library for manipulating PNG images
 
-USE_BUILDLINK2=        yes
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=        yes
 USE_LIBTOOL=   yes
 TEST_TARGET=   test
 
@@ -31,10 +33,12 @@
 PLIST_SUBST+=  LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR}
 PLIST_SUBST+=  LIBPNG_SO_MINOR=${LIBPNG_SO_MINOR}
 
+INSTALLATION_DIRS=     include lib man/man3 man/man5
+
 post-install:
        ${INSTALL_MAN} ${WRKSRC}/libpng.3 ${PREFIX}/man/man3
        ${INSTALL_MAN} ${WRKSRC}/libpngpf.3 ${PREFIX}/man/man3
        ${INSTALL_MAN} ${WRKSRC}/png.5 ${PREFIX}/man/man5
 
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"