summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archivers/bzip2/Makefile9
-rw-r--r--archivers/unzip/Makefile14
-rw-r--r--archivers/unzip/PLIST4
-rw-r--r--devel/cvs/Makefile8
-rw-r--r--devel/nasm/Makefile7
-rw-r--r--devel/zlib/Makefile17
-rw-r--r--graphics/MesaLib/Makefile12
-rw-r--r--graphics/glu/Makefile14
-rw-r--r--graphics/glu/PLIST6
-rw-r--r--graphics/glut/Makefile16
10 files changed, 55 insertions, 52 deletions
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index b2d822d982e..7d5864ff11a 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -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 @@ MAINTAINER= tech-pkg@NetBSD.org
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 @@ BZIP_CFLAGS= -Wall -Winline -fomit-frame-pointer -fno-strength-reduce
.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 --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 31467477e15..c2c98729bf6 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -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 @@ MAINTAINER= tech-pkg@NetBSD.org
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. -DBSD -DUNIX -Dunix -DUSE_UNSHRINK" LF2="-lz ${_ST
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 @@ do-install:
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 --git a/archivers/unzip/PLIST b/archivers/unzip/PLIST
index 03a9c9049fe..e8922b40965 100644
--- a/archivers/unzip/PLIST
+++ b/archivers/unzip/PLIST
@@ -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/unzipsfx.1
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 --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 9e09c08ba15..b8d091a607b 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -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 @@ MAINTAINER= wiz@NetBSD.org
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 @@ INFO_FILES= cvs.info cvsclient.info
USE_MAKEINFO= yes
TEXINFO_REQD?= 4.0
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 0436bcf11de..35ab1521f36 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -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 @@ MAINTAINER= tech-pkg@NetBSD.org
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 @@ INFO_FILES= nasm.info
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 --git a/devel/zlib/Makefile b/devel/zlib/Makefile
index 1be638cb45a..3fdf32ccf26 100644
--- a/devel/zlib/Makefile
+++ b/devel/zlib/Makefile
@@ -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 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gzip.org/zlib/
COMMENT= General purpose data compression library
-BUILD_DEPENDS+= libtool-base>=${LIBTOOL_REQD}:../../devel/libtool-base
+PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= # defined
+USE_LIBTOOL= # defined
HAS_CONFIGURE= # defined
-NOT_FOR_PLATFORM= NetBSD-1.[4-9]*-* # in base NetBSD system
-
-# 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}"
+INSTALLATION_DIRS= include lib
post-extract:
${CP} ${FILESDIR}/lt.mk ${WRKSRC}
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index a1ae76f0e5f..556ddae69d5 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -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 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//}
MAINTAINER= rh@NetBSD.org
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 @@ post-install:
done
.include "../../mk/bsd.pkg.mk"
-
-# must be below bsd.pkg.mk to overwrite values
-PREFIX= ${LOCALBASE}
-X11PREFIX= ${LOCALBASE}
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 1dc8a22e965..f9553b1967e 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -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 @@ COMMENT= GLU polygon tesselation facility for Mesa
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 @@ post-install:
${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 --git a/graphics/glu/PLIST b/graphics/glu/PLIST
index 6849717127e..407d185715d 100644
--- a/graphics/glu/PLIST
+++ b/graphics/glu/PLIST
@@ -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 --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 97c72f30e0c..648e7378da7 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -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 @@ COMMENT= GLUT Graphics library similar to SGI's OpenGL
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 @@ post-install:
${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
-PREFIX= ${LOCALBASE}
-X11PREFIX= ${LOCALBASE}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 07:08:36 +0000