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/ecc166d15e72
branches: trunk
changeset: 465735:ecc166d15e72
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Jan 05 11:28:07 2004 +0000
description:
bl3ify
diffstat:
devel/m4/Makefile | 6 ++++--
lang/ocaml/Makefile | 28 ++++++++++++++++------------
net/netcat/Makefile | 8 ++++++--
net/unison/Makefile | 10 +++++++---
pkgtools/digest/Makefile | 5 +++--
pkgtools/pkgdiff/Makefile | 10 +++++++---
pkgtools/pkglint/Makefile | 9 +++++++--
security/audit-packages/Makefile | 9 +++++++--
security/sudo/Makefile | 6 ++++--
9 files changed, 61 insertions(+), 30 deletions(-)
diffs (287 lines):
diff -r f025fbe4ed57 -r ecc166d15e72 devel/m4/Makefile
--- a/devel/m4/Makefile Mon Jan 05 11:25:13 2004 +0000
+++ b/devel/m4/Makefile Mon Jan 05 11:28:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/08/09 10:44:45 seb Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/05 11:34:26 jlam Exp $
#
DISTNAME= m4-1.4
@@ -10,7 +10,9 @@
HOMEPAGE= http://www.gnu.org/directory/gnum4.html
COMMENT= GNU version of Unix m4 macro-processor
-USE_BUILDLINK2= yes
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
INFO_FILES= m4.info
USE_MAKEINFO= yes
diff -r f025fbe4ed57 -r ecc166d15e72 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile Mon Jan 05 11:25:13 2004 +0000
+++ b/lang/ocaml/Makefile Mon Jan 05 11:28:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/11/10 23:12:47 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/05 11:28:07 jlam Exp $
#
DISTNAME= ocaml-3.06
@@ -10,17 +10,20 @@
HOMEPAGE= http://caml.inria.fr/ocaml/
COMMENT= The latest implementation of the Caml dialect of ML
-DEPENDS+= tk>=8.3.2:../../x11/tk
+PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GMAKE= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS+= -prefix ${LOCALBASE}
-CONFIGURE_ARGS+= -tklibs -L${LOCALBASE}/lib
-CONFIGURE_ARGS+= -tkdefs "-I${LOCALBASE}/include "
-CONFIGURE_ARGS+= -libs "${OCAML_LDFLAGS}"
-OCAML_LDFLAGS= -Wl,${RPATH_FLAG}${X11BASE}/lib \
- -Wl,${RPATH_FLAG}${LOCALBASE}/lib
-FIX_RPATH+= OCAML_LDFLAGS
+USE_BUILDLINK3= yes
+USE_GMAKE= yes
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS+= -prefix ${PREFIX}
+CONFIGURE_ARGS+= -tkdefs "${OCAML_CPPFLAGS}"
+CONFIGURE_ARGS+= -tklibs "${OCAML_LDFLAGS}"
+CONFIGURE_ARGS+= -libs "${OCAML_LIBS}"
+
+OCAML_CPPFLAGS= ${CPPFLAGS}
+OCAML_LDFLAGS= ${LDFLAGS:M-L*}
+OCAML_LIBS= ${LDFLAGS:N-L*}
+FIX_RPATH+= OCAML_LIBS
ALL_TARGET= world
@@ -44,7 +47,7 @@
.endif
PTHREAD_OPTS+= native
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
CONFIGURE_ARGS+= -with-pthread
@@ -56,4 +59,5 @@
PLIST_SRC+= ${PKGDIR}/PLIST.common_end
+.include "../../x11/tk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f025fbe4ed57 -r ecc166d15e72 net/netcat/Makefile
--- a/net/netcat/Makefile Mon Jan 05 11:25:13 2004 +0000
+++ b/net/netcat/Makefile Mon Jan 05 11:28:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/11/23 01:23:58 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/05 11:29:41 jlam Exp $
DISTNAME= nc110
PKGNAME= netcat-1.10
@@ -17,7 +17,9 @@
HOMEPAGE= http://www.atstake.com/research/tools/network_utilities/
COMMENT= Read and write data across network connections
-USE_BUILDLINK2= yes
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= yes
MAKE_ENV+= DFLAGS="-DGAPING_SECURITY_HOLE -DTELNET"
ALL_TARGET= ${LOWER_OPSYS}
@@ -26,6 +28,8 @@
PLIST_SRC= ${PKGDIR}/PLIST ${WRKSRC}/data/PLIST.data
+INSTALLATION_DIRS= man/man1 sbin
+
post-build:
@cd ${WRKSRC}/data && ${SETENV} ${MAKE_ENV} ${MAKE} ${EXTRA_PROGS}
diff -r f025fbe4ed57 -r ecc166d15e72 net/unison/Makefile
--- a/net/unison/Makefile Mon Jan 05 11:25:13 2004 +0000
+++ b/net/unison/Makefile Mon Jan 05 11:28:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/21 17:11:26 martti Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/05 11:28:52 jlam Exp $
DISTNAME= src
PKGNAME= unison-2.9.1
@@ -11,11 +11,12 @@
HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
COMMENT= File-synchronization tool
-BUILD_DEPENDS= ocaml>=3.00:../../lang/ocaml
+PKG_INSTALLATION_TYPES= overwrite pkgviews
DIST_SUBDIR= ${PKGNAME_NOREV}
# docs: unison-manual.pdf/html/ps/dvi
+USE_BUILDLINK3= yes
USE_GMAKE= yes
MAKE_FLAGS+= CFLAGS="" UISTYLE=text
MAKE_ENV+= HOME=${WRKDIR}
@@ -28,12 +29,14 @@
MAKE_FLAGS+= NATIVE=false
.endif
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
MAKE_FLAGS+= THREADS=true
.endif
+INSTALLATION_DIRS= bin
+
post-install:
${INSTALL_MAN_DIR} ${PREFIX}/share/doc/unison
${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${PREFIX}/share/doc/unison
@@ -46,4 +49,5 @@
${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${PREFIX}/share/doc/unison
${INSTALL_MAN} ${WRKSRC}/TODO.txt ${PREFIX}/share/doc/unison
+.include "../../lang/ocaml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f025fbe4ed57 -r ecc166d15e72 pkgtools/digest/Makefile
--- a/pkgtools/digest/Makefile Mon Jan 05 11:25:13 2004 +0000
+++ b/pkgtools/digest/Makefile Mon Jan 05 11:28:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/07/17 22:52:13 grant Exp $
+# $NetBSD: Makefile,v 1.38 2004/01/05 11:32:40 jlam Exp $
#
# When adding new digest algorithms, please use rmd160 as the template,
# and bump the VERSION definition.
@@ -12,8 +12,9 @@
HOMEPAGE= http://www.NetBSD.org/Documentation/software/packages.html
COMMENT= Message digest wrapper utility
-USE_BUILDLINK2= # defined
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_BUILDLINK3= # defined
GNU_CONFIGURE= # defined
NO_PKGTOOLS_REQD_CHECK= # defined
diff -r f025fbe4ed57 -r ecc166d15e72 pkgtools/pkgdiff/Makefile
--- a/pkgtools/pkgdiff/Makefile Mon Jan 05 11:25:13 2004 +0000
+++ b/pkgtools/pkgdiff/Makefile Mon Jan 05 11:28:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2003/09/15 16:16:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.42 2004/01/05 11:32:40 jlam Exp $
#
DISTNAME= pkgdiff-0.113
@@ -11,13 +11,15 @@
HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/Packages.txt
COMMENT= Tools to ease creating and maintaining patches for pkgsrc
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
PERL5_REQD= 5.6.0
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
NO_CONFIGURE= yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
MAKE_ENV= PKGSRCDIR=${_PKGSRCDIR:Q}
@@ -34,6 +36,8 @@
DIFF?= diff
.endif
+INSTALLATION_DIRS= bin man/cat1 man/man1
+
do-build:
.for FILE in mkpatches patchdiff
${SED} -e 's|@PREFIX@|${PREFIX}|g' \
@@ -63,5 +67,5 @@
. endif
.endfor
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f025fbe4ed57 -r ecc166d15e72 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Mon Jan 05 11:25:13 2004 +0000
+++ b/pkgtools/pkglint/Makefile Mon Jan 05 11:28:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.173 2003/12/24 09:54:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.174 2004/01/05 11:32:40 jlam Exp $
#
DISTNAME= pkglint-3.66
@@ -13,8 +13,11 @@
DEPENDS+= digest>=20010101:../../pkgtools/digest
-USE_PERL5= YES
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_PERL5= yes
+
+NO_BUILDLINK= yes
NO_CHECKSUM= yes
NO_CONFIGURE= yes
@@ -22,6 +25,8 @@
DISTVER= ${DISTNAME:S/pkglint-//}
+INSTALLATION_DIRS= bin man/cat1 man/man1
+
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
diff -r f025fbe4ed57 -r ecc166d15e72 security/audit-packages/Makefile
--- a/security/audit-packages/Makefile Mon Jan 05 11:25:13 2004 +0000
+++ b/security/audit-packages/Makefile Mon Jan 05 11:28:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/01/01 23:35:28 agc Exp $
+# $NetBSD: Makefile,v 1.40 2004/01/05 11:36:40 jlam Exp $
DISTNAME= audit-packages-1.28
WRKSRC= ${WRKDIR}
@@ -9,9 +9,14 @@
MAINTAINER= agc%NetBSD.org@localhost
COMMENT= Tools to show vulnerabilities in installed packages
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+DEPENDS+= digest-[0-9]*:../../pkgtools/digest
+
+USE_BUILDLINK3= yes
NO_CHECKSUM= yes
-DEPENDS+= digest-[0-9]*:../../pkgtools/digest
+INSTALLATION_DIRS= man/cat8 man/man8 sbin
.include "../../mk/bsd.prefs.mk"
diff -r f025fbe4ed57 -r ecc166d15e72 security/sudo/Makefile
--- a/security/sudo/Makefile Mon Jan 05 11:25:13 2004 +0000
+++ b/security/sudo/Makefile Mon Jan 05 11:28:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2003/11/03 22:43:38 kim Exp $
+# $NetBSD: Makefile,v 1.62 2004/01/05 11:37:13 jlam Exp $
#
DISTNAME= sudo-1.6.7p5
@@ -15,7 +15,9 @@
HOMEPAGE= http://www.courtesan.com/sudo/
COMMENT= Allow others to run commands as root
-USE_BUILDLINK2= yes
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+USE_BUILDLINK3= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
Home |
Main Index |
Thread Index |
Old Index