pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc bl3ify
details: https://anonhg.NetBSD.org/pkgsrc/rev/03ecbfc42997
branches: trunk
changeset: 465736:03ecbfc42997
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Jan 05 11:42:20 2004 +0000
description:
bl3ify
diffstat:
archivers/bzip2/Makefile | 9 ++++++---
archivers/unzip/Makefile | 14 ++++++++++----
archivers/unzip/PLIST | 4 ++--
devel/cvs/Makefile | 8 +++++---
devel/nasm/Makefile | 7 ++++++-
devel/zlib/Makefile | 19 ++++++-------------
graphics/MesaLib/Makefile | 12 +++++-------
graphics/glu/Makefile | 14 ++++++--------
graphics/glu/PLIST | 6 +++---
graphics/glut/Makefile | 16 +++++++---------
10 files changed, 56 insertions(+), 53 deletions(-)
diffs (truncated from 302 to 300 lines):
diff -r ecc166d15e72 -r 03ecbfc42997 archivers/bzip2/Makefile
--- a/archivers/bzip2/Makefile Mon Jan 05 11:28:07 2004 +0000
+++ b/archivers/bzip2/Makefile Mon Jan 05 11:42:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/12/03 16:47:25 erh Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/05 11:42:20 jlam Exp $
#
DISTNAME= bzip2-1.0.2
@@ -9,8 +9,10 @@
HOMEPAGE= http://sources.redhat.com/bzip2/
COMMENT= Block-sorting file compressor
-USE_BUILDLINK2= # defined
-USE_LIBTOOL= # defined
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= yes
+USE_LIBTOOL= yes
MAKE_ENV+= REALCC="${BUILDLINK_CC}"
.include "../../mk/bsd.prefs.mk"
@@ -20,6 +22,7 @@
.endif
MAKE_ENV+= BZIP_CFLAGS="${BZIP_CFLAGS}"
+INSTALLATION_DIRS= bin include lib man/man1
do-install:
${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/libbz2.la ${PREFIX}/lib
diff -r ecc166d15e72 -r 03ecbfc42997 archivers/unzip/Makefile
--- a/archivers/unzip/Makefile Mon Jan 05 11:28:07 2004 +0000
+++ b/archivers/unzip/Makefile Mon Jan 05 11:42:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2003/09/05 19:00:58 tron Exp $
+# $NetBSD: Makefile,v 1.44 2004/01/05 11:42:20 jlam Exp $
DISTNAME= unzip550
PKGNAME= unzip-5.50
@@ -18,7 +18,9 @@
HOMEPAGE= http://www.info-zip.org/pub/infozip/UnZip.html
COMMENT= List, test and extract compressed files in a ZIP archive
-USE_BUILDLINK2= yes
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= yes
.include "../../mk/bsd.prefs.mk"
@@ -30,6 +32,8 @@
MAKE_FLAGS= CF="${CFLAGS} -I. -DUNIX -Dunix -DUSE_UNSHRINK" LF2="-lz ${_STRIPFLAG_CC} ${LDFLAGS}"
.endif
+INSTALLATION_DIRS= bin man/man1 share/doc
+
do-install:
cd ${WRKSRC} && ${INSTALL_PROGRAM} unzip funzip unzipsfx ${PREFIX}/bin
${LN} -sf unzip ${PREFIX}/bin/zipinfo
@@ -37,8 +41,10 @@
cd ${WRKSRC}/man && ${INSTALL_MAN} funzip.1 unzip.1 unzipsfx.1 \
zipgrep.1 zipinfo.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unzip
- cd ${WRKSRC} && ${INSTALL_DATA} BUGS COPYING.OLD LICENSE README WHERE \
+ cd ${WRKSRC} && ${INSTALL_DATA} BUGS LICENSE README WHERE \
${PREFIX}/share/doc/unzip
+ cd ${WRKSRC} && ${INSTALL_DATA} COPYING.OLD \
+ ${PREFIX}/share/doc/unzip/COPYING
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r ecc166d15e72 -r 03ecbfc42997 archivers/unzip/PLIST
--- a/archivers/unzip/PLIST Mon Jan 05 11:28:07 2004 +0000
+++ b/archivers/unzip/PLIST Mon Jan 05 11:42:20 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:24:47 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/01/05 11:42:20 jlam Exp $
bin/funzip
bin/unzip
bin/unzipsfx
@@ -10,7 +10,7 @@
man/man1/zipgrep.1
man/man1/zipinfo.1
share/doc/unzip/BUGS
-share/doc/unzip/COPYING.OLD
+share/doc/unzip/COPYING
share/doc/unzip/LICENSE
share/doc/unzip/README
share/doc/unzip/WHERE
diff -r ecc166d15e72 -r 03ecbfc42997 devel/cvs/Makefile
--- a/devel/cvs/Makefile Mon Jan 05 11:28:07 2004 +0000
+++ b/devel/cvs/Makefile Mon Jan 05 11:42:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2004/01/03 17:24:07 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2004/01/05 11:44:22 jlam Exp $
#
DISTNAME= cvs-1.11.11
@@ -12,12 +12,14 @@
HOMEPAGE= http://www.cvshome.org/
COMMENT= Concurrent Versions System
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
BUILD_DEFS+= USE_INET6
-USE_BUILDLINK2= yes
.if defined(USE_INET6) && ${USE_INET6} == "YES" && \
empty(MACHINE_PLATFORM:MSunOS-5.[89]-*) && empty(MACHINE_PLATFORM:MLinux-*)
@@ -51,5 +53,5 @@
USE_MAKEINFO= yes
TEXINFO_REQD?= 4.0
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r ecc166d15e72 -r 03ecbfc42997 devel/nasm/Makefile
--- a/devel/nasm/Makefile Mon Jan 05 11:28:07 2004 +0000
+++ b/devel/nasm/Makefile Mon Jan 05 11:42:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/10/05 09:45:13 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/05 11:45:05 jlam Exp $
#
DISTNAME= nasm-0.98.38
@@ -9,6 +9,9 @@
HOMEPAGE= http://nasm.sourceforge.net/
COMMENT= General-purpose x86 assembler
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_BUILDLINK3= YES
+
ALL_TARGET= everything
INSTALL_TARGET= install_everything
GNU_CONFIGURE= yes
@@ -20,4 +23,6 @@
MAKE_ENV+= PERL5="${PERL5}" \
INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
+INSTALLATION_DIRS= bin info man/man1 share/doc/html
+
.include "../../mk/bsd.pkg.mk"
diff -r ecc166d15e72 -r 03ecbfc42997 devel/zlib/Makefile
--- a/devel/zlib/Makefile Mon Jan 05 11:28:07 2004 +0000
+++ b/devel/zlib/Makefile Mon Jan 05 11:42:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/17 21:34:17 grant Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/05 11:44:01 jlam Exp $
DISTNAME= zlib-1.1.4
PKGREVISION= 1
@@ -12,19 +12,12 @@
HOMEPAGE= http://www.gzip.org/zlib/
COMMENT= General purpose data compression library
-BUILD_DEPENDS+= libtool-base>=${LIBTOOL_REQD}:../../devel/libtool-base
-
-USE_BUILDLINK2= # defined
-HAS_CONFIGURE= # defined
-NOT_FOR_PLATFORM= NetBSD-1.[4-9]*-* # in base NetBSD system
+PKG_INSTALLATION_TYPES= overwrite pkgviews
-# To avoid circular dependences we must not use "USE_LIBTOOL" but
-# depend on the "libtool-base" package manually.
-#
-LIBTOOL= ${LOCALBASE}/bin/libtool
-PKGLIBTOOL= ${BUILDLINK_LIBTOOL}
-CONFIGURE_ENV+= LIBTOOL="${PKGLIBTOOL} ${LIBTOOL_FLAGS}"
-MAKE_ENV+= LIBTOOL="${PKGLIBTOOL} ${LIBTOOL_FLAGS}"
+USE_BUILDLINK3= # defined
+USE_LIBTOOL= # defined
+HAS_CONFIGURE= # defined
+INSTALLATION_DIRS= include lib
post-extract:
${CP} ${FILESDIR}/lt.mk ${WRKSRC}
diff -r ecc166d15e72 -r 03ecbfc42997 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Mon Jan 05 11:28:07 2004 +0000
+++ b/graphics/MesaLib/Makefile Mon Jan 05 11:42:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2003/11/18 16:10:55 jschauma Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/05 11:47:33 jlam Exp $
PKGNAME= MesaLib-${MESA_VERSION}
PKGREVISION= 2
@@ -6,10 +6,12 @@
MAINTAINER= rh%NetBSD.org@localhost
COMMENT= Graphics library similar to SGI's OpenGL
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
.include "../../graphics/Mesa/Makefile.common"
-USE_BUILDLINK2= yes
-USE_X11BASE= yes
+USE_BUILDLINK3= yes
+USE_X11= yes
USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --without-glut
@@ -34,7 +36,3 @@
done
.include "../../mk/bsd.pkg.mk"
-
-# must be below bsd.pkg.mk to overwrite values
-PREFIX= ${LOCALBASE}
-X11PREFIX= ${LOCALBASE}
diff -r ecc166d15e72 -r 03ecbfc42997 graphics/glu/Makefile
--- a/graphics/glu/Makefile Mon Jan 05 11:28:07 2004 +0000
+++ b/graphics/glu/Makefile Mon Jan 05 11:42:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/11/28 18:41:03 jschauma Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/05 11:47:33 jlam Exp $
PKGNAME= ${DISTNAME:C/MesaLib/glu/}
PKGREVISION= 3
@@ -9,10 +9,12 @@
CONFLICTS+= Mesa-glx-[0-9]*
CONFLICTS+= Mesa<3.2.1
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
.include "../../graphics/Mesa/Makefile.common"
-USE_BUILDLINK2= yes
-USE_X11BASE= yes
+USE_BUILDLINK3= yes
+USE_X11= yes
BUILD_DIRS= ${WRKSRC}/si-glu
.include "../../mk/bsd.prefs.mk"
@@ -25,9 +27,5 @@
${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL; \
done
-.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
-
-# must be below bsd.pkg.mk to overwrite values
-PREFIX= ${LOCALBASE}
-X11PREFIX= ${LOCALBASE}
diff -r ecc166d15e72 -r 03ecbfc42997 graphics/glu/PLIST
--- a/graphics/glu/PLIST Mon Jan 05 11:28:07 2004 +0000
+++ b/graphics/glu/PLIST Mon Jan 05 11:42:20 2004 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2003/11/28 18:41:03 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/01/05 11:47:33 jlam Exp $
include/GL/glu.h
include/GL/glu_mangle.h
+lib/libGLU.a
+lib/libGLU.la
lib/libGLU.so
lib/libGLU.so.4
lib/libGLU.so.4.502
-lib/libGLU.a
-lib/libGLU.la
@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff -r ecc166d15e72 -r 03ecbfc42997 graphics/glut/Makefile
--- a/graphics/glut/Makefile Mon Jan 05 11:28:07 2004 +0000
+++ b/graphics/glut/Makefile Mon Jan 05 11:42:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/11/28 18:41:03 jschauma Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/05 11:47:33 jlam Exp $
PKGNAME= ${DISTNAME:S/MesaLib/glut/}
PKGREVISION= 3
@@ -11,10 +11,12 @@
CONFLICTS+= Mesa-glx-[0-9]*
CONFLICTS+= Mesa<3.2.1
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
.include "../../graphics/Mesa/Makefile.common"
-USE_BUILDLINK2= yes
-USE_X11BASE= yes
+USE_BUILDLINK3= yes
+USE_X11= yes
CONFIGURE_DIRS= ${WRKSRC}
BUILD_DIRS= ${WRKSRC}/src-glut
USE_LIBTOOL= yes
@@ -28,10 +30,6 @@
${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL; \
done
-.include "../../graphics/MesaLib/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
-
-# must be below bsd.pkg.mk to overwrite values
Home |
Main Index |
Thread Index |
Old Index