summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Packages.txt29
-rw-r--r--audio/esound/Makefile4
-rw-r--r--audio/nas/Makefile10
-rw-r--r--audio/oss/Makefile8
-rw-r--r--audio/rplay/Makefile4
-rw-r--r--audio/tracker/Makefile6
-rw-r--r--audio/xmcd/Makefile8
-rw-r--r--audio/xmp/Makefile4
-rw-r--r--benchmarks/bytebench/Makefile5
-rw-r--r--cad/pcb/Makefile4
-rw-r--r--chat/bitchx/Makefile5
-rw-r--r--chat/gale/Makefile5
-rw-r--r--chat/irssi/Makefile4
-rw-r--r--chat/silc-client/Makefile8
-rw-r--r--chat/silc-server/Makefile7
-rw-r--r--comms/conserver/Makefile5
-rw-r--r--comms/efax-gtk/Makefile5
-rw-r--r--comms/fidogate/Makefile8
-rw-r--r--comms/hylafax/Makefile5
-rw-r--r--comms/minicom/Makefile10
-rw-r--r--databases/freetds/Makefile4
-rw-r--r--databases/geneweb/Makefile4
-rw-r--r--databases/gnome-mime-data/Makefile5
-rw-r--r--databases/libgda/Makefile.common4
-rw-r--r--databases/mysql-server/Makefile5
-rw-r--r--databases/openldap/Makefile4
-rw-r--r--databases/postgresql-server/Makefile4
-rw-r--r--databases/unixodbc/Makefile4
-rw-r--r--devel/bonobo-activation/Makefile5
-rw-r--r--devel/cvs2p4/Makefile8
-rw-r--r--devel/cvsgraph/Makefile5
-rw-r--r--devel/isect/Makefile4
-rw-r--r--devel/opencm/Makefile4
-rw-r--r--devel/p4d/Makefile5
-rw-r--r--devel/pango/Makefile4
-rw-r--r--devel/pwlib/Makefile4
-rw-r--r--devel/rt-mysql/Makefile.common5
-rw-r--r--emulators/xmame/Makefile5
-rw-r--r--emulators/xmess/Makefile5
-rw-r--r--fonts/fontconfig/Makefile4
-rw-r--r--fonts/ghostscript-cidfonts/Makefile8
-rw-r--r--fonts/ghostscript-cmaps/Makefile8
-rw-r--r--fonts/kochi-ttf/Makefile8
-rw-r--r--fonts/monafonts/Makefile8
-rw-r--r--fonts/t1lib/Makefile4
-rw-r--r--games/koth/Makefile7
-rw-r--r--games/sarien/Makefile4
-rw-r--r--games/xmris/Makefile4
-rw-r--r--games/xpat2/Makefile4
-rw-r--r--games/xsoldier/Makefile4
-rw-r--r--graphics/aview-x11/Makefile12
-rw-r--r--graphics/aview/Makefile10
-rw-r--r--graphics/fnlib/Makefile12
-rw-r--r--graphics/gimp-base/Makefile4
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/libggi/Makefile12
-rw-r--r--graphics/libgii/Makefile12
-rw-r--r--graphics/tcm/Makefile4
-rw-r--r--graphics/tiff/Makefile13
-rw-r--r--graphics/tuxpaint/Makefile5
-rw-r--r--inputmethod/ja-freewnn-server-bin/Makefile4
-rw-r--r--lang/gcc/Makefile4
-rw-r--r--lang/gcc3/Makefile4
-rw-r--r--mail/courier-auth/Makefile4
-rw-r--r--mail/courier-authldap/Makefile4
-rw-r--r--mail/courier-authmysql/Makefile4
-rw-r--r--mail/courier-authpgsql/Makefile4
-rw-r--r--mail/courier-imap/Makefile4
-rw-r--r--mail/courier-maildirmake/Makefile4
-rw-r--r--mail/cyrus-imapd/Makefile5
-rw-r--r--mail/cyrus-imapd21/Makefile5
-rw-r--r--mail/demime/Makefile4
-rw-r--r--mail/elm-me/Makefile4
-rw-r--r--mail/imp/Makefile4
-rw-r--r--mail/mailman/Makefile4
-rw-r--r--mail/mimedefang/Makefile4
-rw-r--r--mail/mutt/Makefile16
-rw-r--r--mail/nail/Makefile4
-rw-r--r--mail/nullmailer/Makefile4
-rw-r--r--mail/popa3d/Makefile4
-rw-r--r--mail/postfix/Makefile4
-rw-r--r--mail/prayer/Makefile4
-rw-r--r--mail/qmail-users/Makefile4
-rw-r--r--mail/qmail/Makefile4
-rw-r--r--mail/qpopper/Makefile7
-rw-r--r--mail/sendmail/Makefile4
-rw-r--r--mail/spamassassin/Makefile4
-rw-r--r--mail/squirrelmail/Makefile8
-rw-r--r--mail/sqwebmail/Makefile4
-rw-r--r--mail/sylpheed-claws/Makefile4
-rw-r--r--mail/sylpheed/Makefile4
-rw-r--r--mail/sympa/Makefile8
-rw-r--r--mail/teapop/Makefile4
-rw-r--r--math/pspp/Makefile4
-rw-r--r--math/udunits/Makefile4
-rw-r--r--misc/kdeutils3/Makefile4
-rw-r--r--misc/libutf/Makefile8
-rw-r--r--misc/qterm/Makefile4
-rw-r--r--misc/rpm/Makefile4
-rw-r--r--misc/screen/Makefile6
-rw-r--r--mk/bsd.pkg.mk6
-rw-r--r--net/arla/Makefile10
-rw-r--r--net/bind8/Makefile5
-rw-r--r--net/bpalogin/Makefile4
-rw-r--r--net/chrony/Makefile4
-rw-r--r--net/coda5_client/Makefile4
-rw-r--r--net/coda5_server/Makefile4
-rw-r--r--net/ddclient/Makefile5
-rw-r--r--net/dhid/Makefile4
-rw-r--r--net/ipa/Makefile6
-rw-r--r--net/ja-samba/Makefile10
-rw-r--r--net/jwhois/Makefile9
-rw-r--r--net/lambdamoo/Makefile4
-rw-r--r--net/lftp/Makefile4
-rw-r--r--net/net-snmp/Makefile10
-rw-r--r--net/netatalk/Makefile4
-rw-r--r--net/netsaint-base/Makefile7
-rw-r--r--net/openh323/Makefile4
-rw-r--r--net/openslp/Makefile4
-rw-r--r--net/pureftpd/Makefile4
-rw-r--r--net/rp-pppoe/Makefile4
-rw-r--r--net/samba/Makefile6
-rw-r--r--net/samba20/Makefile10
-rw-r--r--net/socks5/Makefile4
-rw-r--r--net/speedtouch/Makefile4
-rw-r--r--net/tspc/Makefile4
-rw-r--r--net/userppp/Makefile4
-rw-r--r--net/vtun/Makefile4
-rw-r--r--net/wget/Makefile5
-rw-r--r--net/ytalk/Makefile4
-rw-r--r--news/inn/Makefile4
-rw-r--r--news/nntpclnt/Makefile5
-rw-r--r--print/a2ps/Makefile4
-rw-r--r--print/apsfilter/Makefile4
-rw-r--r--print/auctex/Makefile6
-rw-r--r--print/cups/Makefile14
-rw-r--r--print/ghostscript-esp/Makefile.common10
-rw-r--r--print/pnm2ppa/Makefile4
-rw-r--r--print/psutils/Makefile4
-rw-r--r--print/teTeX-bin/Makefile4
-rw-r--r--print/xpdf/Makefile4
-rw-r--r--security/PAM/Makefile4
-rw-r--r--security/cyrus-sasl/Makefile5
-rw-r--r--security/cyrus-sasl2/Makefile4
-rw-r--r--security/isakmpd/Makefile4
-rw-r--r--security/mirrordir/Makefile4
-rw-r--r--security/openssh/Makefile4
-rw-r--r--security/openssl/Makefile4
-rw-r--r--security/pks/Makefile5
-rw-r--r--security/ssh2/Makefile4
-rw-r--r--security/sudo/Makefile8
-rw-r--r--security/uvscan/Makefile4
-rw-r--r--security/winbind/Makefile6
-rw-r--r--security/xdm-krb4/Makefile8
-rw-r--r--shells/ast-ksh/Makefile4
-rw-r--r--shells/bash2/Makefile8
-rw-r--r--shells/es/Makefile4
-rw-r--r--shells/esh/Makefile4
-rw-r--r--shells/osh/Makefile4
-rw-r--r--shells/pdksh/Makefile4
-rw-r--r--shells/rc/Makefile4
-rw-r--r--shells/scsh/Makefile4
-rw-r--r--shells/tcsh/Makefile4
-rw-r--r--shells/zsh/Makefile4
-rw-r--r--shells/zsh3/Makefile4
-rw-r--r--sysutils/amanda-common/Makefile4
-rw-r--r--sysutils/amanda-dev-common/Makefile4
-rw-r--r--sysutils/apcupsd/Makefile11
-rw-r--r--sysutils/gentoo/Makefile11
-rw-r--r--sysutils/libirman/Makefile6
-rw-r--r--sysutils/rox-base/Makefile4
-rw-r--r--sysutils/sysbuild/Makefile4
-rw-r--r--sysutils/ups-nut-cgi/Makefile4
-rw-r--r--sysutils/ups-nut/Makefile4
-rw-r--r--sysutils/xcdroast/Makefile7
-rw-r--r--textproc/chasen-base/Makefile10
-rw-r--r--textproc/ipadic/Makefile6
-rw-r--r--textproc/ndtpd/Makefile10
-rw-r--r--textproc/xmlcatmgr/Makefile4
-rw-r--r--wm/ion/Makefile4
-rw-r--r--wm/pwm/Makefile4
-rw-r--r--wm/windowmaker/Makefile4
-rw-r--r--www/analog/Makefile4
-rw-r--r--www/ap-ruby/Makefile5
-rw-r--r--www/ap-ssl/Makefile4
-rw-r--r--www/apache/Makefile4
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/apache6/Makefile4
-rw-r--r--www/apc-gui/Makefile4
-rw-r--r--www/cvsweb/Makefile5
-rw-r--r--www/dillo/Makefile4
-rw-r--r--www/horde/Makefile4
-rw-r--r--www/iasp/Makefile4
-rw-r--r--www/jakarta-tomcat/Makefile6
-rw-r--r--www/p5-Apache-Gallery/Makefile5
-rw-r--r--www/php3/Makefile4
-rw-r--r--www/php4/Makefile4
-rw-r--r--www/squid/Makefile9
-rw-r--r--www/surfraw/Makefile4
-rw-r--r--www/thttpd/Makefile4
-rw-r--r--www/webalizer/Makefile5
-rw-r--r--x11/gdm/Makefile5
-rw-r--r--x11/gtk2/Makefile4
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/kterm/Makefile4
-rw-r--r--x11/openmotif/Makefile8
-rw-r--r--x11/xfstt/Makefile4
207 files changed, 570 insertions, 557 deletions
diff --git a/Packages.txt b/Packages.txt
index e0603049fe6..2d3da9fc450 100644
--- a/Packages.txt
+++ b/Packages.txt
@@ -1,4 +1,4 @@
-# $NetBSD: Packages.txt,v 1.282 2003/01/22 19:22:05 jdolecek Exp $
+# $NetBSD: Packages.txt,v 1.283 2003/01/28 22:03:00 jlam Exp $
###########################################################################
==========================
@@ -2256,9 +2256,9 @@ A more complex example is that creates two groups and two users is:
By default, a new user will have home directory /nonexistent, and login shell
/sbin/nologin unless they are specified as part of the user element.
-The package Makefile must also include "../../mk/bsd.pkg.install.mk" prior to
-the inclusion of bsd.pkg.mk. This will cause the users and groups to be
-created at pre-install time, and the admin will be prompted to remove them at
+The package Makefile must also set USE_PKGINSTALL to "YES" prior to the
+inclusion of bsd.pkg.mk. This will cause the users and groups to be created
+at pre-install time, and the admin will be prompted to remove them at
post-deinstall time. Automatic creation of the users and groups can be
toggled on and off by setting the environment variable PKG_CREATE_USERGROUP
prior to package installation.
@@ -2405,11 +2405,10 @@ of filenames; the first element of the pair specifies the file inside the
examples directory (registered by PLIST) and the second element specifies
the target file. This is done this way to allow binary packages to place
files in the right directory using INSTALL/DEINSTALL scripts which are
-created automatically. The package Makefile must also include
-"../../mk/bsd.pkg.install.mk" prior to the inclusion of bsd.pkg.mk to use
-these automatically generated scripts. The automatic copying of config
-files can be toggled by setting the environment variable PKG_CONFIG prior
-to package installation.
+created automatically. The package Makefile must also set USE_PKGINSTALL
+to "YES" prior to the inclusion of bsd.pkg.mk to use these automatically
+generated scripts. The automatic copying of config files can be toggled by
+setting the environment variable PKG_CONFIG prior to package installation.
Here is an example, taken from mail/mutt/Makefile:
@@ -2427,18 +2426,18 @@ automatic message when files are installed using this method.
If the purpose of the package is to provide a login shell, the variable
PKG_SHELL should contain the full pathname of the shell executable installed
-by this package. The package Makefile also must include
-"../../mk/bsd.pkg.install.mk" prior to the inclusion of bsd.pkg.mk to use the
-automatically generated INSTALL/DEINSTALL scripts.
+by this package. The package Makefile also must set USE_PKGINSTALL to "YES"
+prior to the inclusion of bsd.pkg.mk to use the automatically generated
+INSTALL/DEINSTALL scripts.
An example taken from shells/zsh:
+ USE_PKGINSTALL= YES
PKG_SHELL= ${PREFIX}/bin/zsh
- .include "../../mk/bsd.pkg.install.mk"
The shell is registered into /etc/shells file automatically in the
-post-install target by the INSTALL script generated by bsd.pkg.install.mk and
-removed in the deinstall target by the DEINSTALL script.
+post-install step by the auto-generated INSTALL script and removed in the
+deinstall step by the DEINSTALL script.
10.29 Packages providing locale catalogues
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index aaada47dad1..543d8c58fe0 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/10/30 03:09:25 rh Exp $
+# $NetBSD: Makefile,v 1.39 2003/01/28 22:03:02 jlam Exp $
DISTNAME= esound-0.2.29
CATEGORIES= audio
@@ -9,6 +9,7 @@ HOMEPAGE= http://www.tux.org/~ricdude/EsounD.html
COMMENT= the Enlightened sound daemon
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/esound.pc.in
@@ -23,5 +24,4 @@ CONF_FILES= ${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf
.include "../../audio/libaudiofile/buildlink2.mk"
.include "../../mk/ossaudio.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 94e9cce9d80..4340283c5f8 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/12/03 09:13:39 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:03:02 jlam Exp $
# FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
#
@@ -13,9 +13,10 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://radscan.com/nas.html
COMMENT= Network Audio System
-USE_BUILDLINK2= # defined
-USE_IMAKE= # defined
-USE_X11BASE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_IMAKE= yes
+USE_X11BASE= yes
PKG_SYSCONFSUBDIR= nas
@@ -45,5 +46,4 @@ PLIST_SRC+= ${PKGDIR}/PLIST.voxware
CONF_FILES= ${EGDIR}/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf
.endif
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 77ec5fe6eaf..6b58c734da8 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/01/10 20:20:53 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/01/28 22:03:03 jlam Exp $
DISTNAME= oss-${OSS_VERSION} # Overridden below
PKGNAME= oss-${OSS_VERSION}
@@ -29,8 +29,9 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
-USE_BUILDLINK2= # defined
-NO_CONFIGURE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+NO_CONFIGURE= yes
.if ${OPSYS} == "NetBSD"
MODSTAT= /usr/bin/modstat
@@ -103,5 +104,4 @@ do-install: chroot
${RM} -f ${WRKSRC}/etc/*.o3 ${WRKSRC}/etc/*.sb
${RM} -f ${WRKSRC}/*.core
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 988502308d9..b56014ab4ed 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2002/09/19 09:04:02 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2003/01/28 22:03:03 jlam Exp $
#
DISTNAME= rplay-3.3.2
@@ -11,6 +11,7 @@ HOMEPAGE= http://rplay.doit.org/
COMMENT= Network audio player
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -31,6 +32,5 @@ pre-configure:
.include "../../devel/readline/buildlink2.mk"
.include "../../devel/rx/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index 17ed6a40cca..7f9148edd57 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/12/22 12:22:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2003/01/28 22:03:04 jlam Exp $
# FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp
#
@@ -24,10 +24,11 @@ MAKE_FLAGS= MACHINE=netbsd CC=${CC} INSTALL="${INSTALL}" \
COMPRESSION_FILE=${PKG_SYSCONFDIR}/compression_methods \
COMPRESSION_FILE_EG=${EGDIR}/compression_methods
+USE_PKGINSTALL= yes
EGDIR= ${PREFIX}/share/examples/tracker
CONF_FILES= ${EGDIR}/compression_methods ${PKG_SYSCONFDIR}/compression_methods
-INFO_FILES= tracker.info
+INFO_FILES= tracker.info
pre-install:
cd ${WRKSRC}/Docs && \
@@ -41,5 +42,4 @@ post-install:
${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 7c3fa6f6e8a..86ca7d8dfc3 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/01/24 13:36:18 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2003/01/28 22:03:04 jlam Exp $
DISTNAME= xmcd-3.0.2
CATEGORIES= audio
@@ -14,9 +14,10 @@ PATCH_DIST_STRIP= -p1
WRKSRC= ${WRKDIR}/xmcd-3.0
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_NCURSES= # cursor_normal, cursor_invisible (in ncurses in term.h)
-USE_IMAKE= # defined
+USE_IMAKE= yes
MAKE_ENV+= BATCH_BINDIR=${PREFIX}/bin
MAKE_ENV+= BATCH_LIBDIR=${PREFIX}/lib/X11
MAKE_ENV+= BATCH_MANDIR=${PREFIX}/man/man1
@@ -53,5 +54,4 @@ post-install:
.include "../../graphics/xpm/buildlink2.mk"
.include "../../mk/motif.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index bb606c68f04..1cc31a6a223 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/12/22 17:05:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:03:05 jlam Exp $
# FreeBSD: ports/audio/xmp/Makefile,v 1.5 2000/04/08 21:24:59 mharo Exp
#
@@ -12,6 +12,7 @@ MAINTAINER= rxg@ms25.url.com.tw
HOMEPAGE= http://xmp.sourceforge.net/
COMMENT= Player for many different Amiga and PC module formats
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--disable-alsa \
--disable-oss \
@@ -28,5 +29,4 @@ CONF_FILES+= ${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp.conf
pre-install:
${INSTALL_DATA_DIR} ${EGDIR}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index 5c8ec42b6bf..b110b082647 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/01/09 11:24:37 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:03:05 jlam Exp $
DISTNAME= unixbench-4.1.0
PKGNAME= bytebench-4.1.0
@@ -9,6 +9,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= root@garbled.net
COMMENT= BYTE Magazine's Public Domain benchmark for UNIX
+USE_PKGINSTALL= yes
+
BENCHMARK_ENV+= BINDIR=${WRKSRC}/pgms
BENCHMARK_ENV+= SCRPDIR=${WRKSRC}/pgms
BENCHMARK_ENV+= RESULTDIR=${WRKSRC}/results
@@ -48,5 +50,4 @@ results:
@${MKDIR} /tmp/benches/`domainname`
-@${CP} ${WRKSRC}/bytebench.out /tmp/benches/`domainname`/bytebench.`uname`-`uname -m`-`uname -r`.`hostname`
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index ffea4a564a7..a302fa9c91c 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/12/23 19:57:51 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:05 jlam Exp $
# FreeBSD Id: Makefile,v 1.19 1998/10/31 18:05:31 jseger Exp
#
@@ -18,6 +18,7 @@ COMMENT= X11 interactive printed circuit board layout system
DEPENDS+= m4>=1.4:../../devel/m4
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_IMAKE= yes
PKG_SYSCONFSUBDIR= pcb
@@ -65,5 +66,4 @@ post-install:
${ECHO} "# list your local includes here" > ${EGDIR}/local.inc
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile
index c8b3173b907..5ca6fbad3df 100644
--- a/chat/bitchx/Makefile
+++ b/chat/bitchx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/12/23 14:09:53 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/28 22:03:06 jlam Exp $
DISTNAME= ircii-pana-1.0c18
PKGNAME= bitchx-1.0.3.18
@@ -14,6 +14,7 @@ HOMEPAGE= http://www.bitchx.org/
COMMENT= IRC client based on ircII
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ssl
@@ -51,5 +52,5 @@ post-install:
.include "../../devel/ncurses/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index 3c66dbce99e..bd2c9f9d75c 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/10/09 17:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:06 jlam Exp $
#
DISTNAME= gale-0.99a
@@ -10,6 +10,7 @@ HOMEPAGE= http://gale.org
COMMENT= secure instant messaging system
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_GNU_READLINE= # needs rl_named_function()
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/liboopltconfig
@@ -49,5 +50,5 @@ post-install:
.include "../../net/adns/buildlink2.mk"
.include "../../security/rsaref/buildlink2.mk"
.include "../../www/libwww/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile
index 277b69e8c68..cd48e459fd7 100644
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/01/12 17:56:05 veego Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:07 jlam Exp $
DISTNAME= ${IRSSI_DISTNAME}
PKGREVISION= 1
@@ -17,6 +17,7 @@ BUILD_DEFS+= USE_INET6
GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --with-terminfo \
--enable-ipv6 \
@@ -47,5 +48,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/irssi-config ${IRSSI_CONFIG}
.include "../../devel/glib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 13be9c9e344..32a63bf5eed 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/01/26 14:35:07 salo Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:03:07 jlam Exp $
DISTNAME= silc-client-0.9.11
CATEGORIES= chat security
@@ -13,10 +13,12 @@ MAINTAINER= salo@netbsd.org
HOMEPAGE= http://www.silcnet.org/
COMMENT= Client for the Secure Internet Live Conferencing (SILC) protocol
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
+
GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_GNU_ICONV= YES
-USE_BUILDLINK2= YES
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/irssi/libtool \
${WRKSRC}/lib/silcmath/mpi/libtool
@@ -80,5 +82,5 @@ PLIST_SRC+= ${PKGDIR}/PLIST
.include "../../converters/libiconv/buildlink2.mk"
.include "../../devel/glib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 88551c0afd9..6ae5ab89c0f 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/01/26 14:10:44 salo Exp $
+# $NetBSD: Makefile,v 1.21 2003/01/28 22:03:07 jlam Exp $
DISTNAME= silc-server-0.9.12
CATEGORIES= chat security
@@ -13,9 +13,11 @@ MAINTAINER= salo@netbsd.org
HOMEPAGE= http://www.silcnet.org/
COMMENT= Server for the Secure Internet Live Conferencing (SILC) protocol
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
+
GNU_CONFIGURE= YES
USE_GMAKE= YES
-USE_BUILDLINK2= YES
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/lib/silcmath/mpi/libtool
@@ -76,5 +78,4 @@ post-install:
> ${PREFIX}/share/examples/silcd/motd.txt.default
.include "../../devel/glib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index f1677339814..942390c5665 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/09/21 10:12:30 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:08 jlam Exp $
# FreeBSD Id: ports/comms/conserver-com/Makefile,v 1.1 2001/12/09 14:40:12 kur iyama Exp
DISTNAME= conserver-7.2.1
@@ -10,6 +10,7 @@ HOMEPAGE= http://www.conserver.com/
COMMENT= Application that allows multiple users to watch serial consoles
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -31,6 +32,4 @@ pre-install:
${INSTALL_DATA_DIR} ${EGDIR}
.include "../../security/tcp_wrappers/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 45516cde508..7cc7effecfc 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/12/25 13:18:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:08 jlam Exp $
DISTNAME= efax-gtk-1.0.1b.src
PKGNAME= efax-gtk-1.0.1b
@@ -16,6 +16,7 @@ DEPENDS+= efax>=0.9:../../comms/efax
WRKSRC= ${WRKDIR}/efax-gtk
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
CONFIGURE_ARGS+= --with-spooldir=/var/spool/efax
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -34,5 +35,5 @@ pre-install:
.include "../../devel/libsigc++/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
.include "../../x11/gtk--/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index 6daa8b65519..4cead14a2f5 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2002/11/14 23:55:33 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2003/01/28 22:03:09 jlam Exp $
#
DISTNAME= fidogate-4.4.5
@@ -9,8 +9,9 @@ MAINTAINER= tv@pobox.com
HOMEPAGE= http://www.fidogate.org/
COMMENT= FidoNet (FTN) <-> Internet mail and news gateway
-USE_BUILDLINK2= # defined
-USE_GMAKE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_GMAKE= yes
MAKE_ENV= DEBUG="${CFLAGS} -Werror"
BUILDLINK_SETENV.CC= CC="cc ${_STRIPFLAG_CC}"
@@ -63,5 +64,4 @@ post-install:
.include "../../lang/perl5/buildlink2.mk"
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 20a326b62ad..51641c3c287 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/09/19 09:04:06 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2003/01/28 22:03:09 jlam Exp $
#
DISTNAME= hylafax-4.1
@@ -19,6 +19,8 @@ DIST_SUBDIR= hylafax
CONFLICTS= mgetty-[0-9]*
+USE_PKGINSTALL= yes
+
FAXUSER?= uucp
FAXGROUP?= dialer
RCD_SCRIPTS= hylafax
@@ -36,5 +38,4 @@ post-install:
${CHMOD} 4555 ${SUID_EXES}
.include "../../mk/ghostscript.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 6f173cbb05e..49b7b6925f1 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/12/23 16:15:03 cjep Exp $
+# $NetBSD: Makefile,v 1.27 2003/01/28 22:03:10 jlam Exp $
# FreeBSD Id: Makefile,v 1.13 1998/01/03 10:58:40 obrien Exp
#
@@ -16,9 +16,10 @@ BUILD_USES_MSGFMT= yes
DEPENDS+= gkermit-[0-9]*:../../comms/gkermit
DEPENDS+= lrzsz-[0-9]*:../../comms/lrzsz
-USE_BUILDLINK2= # defined
-USE_GMAKE= # defined
-NO_CONFIGURE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_GMAKE= yes
+NO_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PKGNAME}/src
PKG_SYSCONFSUBDIR= minicom
@@ -41,5 +42,4 @@ pre-install:
.endif
.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index e1ee0fe76e9..b3a013186ba 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/10/26 18:45:28 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:03:10 jlam Exp $
DISTNAME= freetds-0.60
CATEGORIES= databases
@@ -10,6 +10,7 @@ HOMEPAGE= http://www.freetds.org/
COMMENT= LGPL'd implementation of Sybase's db-lib/ct-lib/ODBC libs
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -31,5 +32,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/locales.conf ${EGDIR}
.include "../../converters/libiconv/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index bec75d1951e..5a6db68fc08 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/01/24 04:05:22 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:03:10 jlam Exp $
#
DISTNAME= geneweb-4.09
@@ -11,6 +11,7 @@ COMMENT= GeneWeb is a comprehensive genealogy database application
DEPENDS+= ocaml>=3.04:../../lang/ocaml
+USE_PKGINSTALL= yes
USE_GMAKE= yes
RCD_SCRIPTS= geneweb
@@ -65,5 +66,4 @@ do-install:
${CHMOD} 600 ${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
${CHOWN} -R nobody.${ROOT_GROUP} ${PREFIX}/share/geneweb
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile
index 64a4b45b0bd..8ec0d16326c 100644
--- a/databases/gnome-mime-data/Makefile
+++ b/databases/gnome-mime-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/01/02 03:21:34 rh Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/28 22:03:11 jlam Exp $
#
DISTNAME= gnome-mime-data-2.0.1
@@ -16,6 +16,7 @@ BUILD_USES_MSGFMT= YES
CONFLICTS= gnome-vfs<=1.0.3
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_PERL5= build
GNU_CONFIGURE= YES
@@ -27,5 +28,5 @@ CONF_FILES= ${EGDIR}/gnome-vfs-mime-magic ${PKG_SYSCONFDIR}/gnome-vfs-mime-magi
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index 3801475eafc..3819548b3e2 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2002/12/26 18:56:05 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.5 2003/01/28 22:03:12 jlam Exp $
#
DISTNAME?= libgda-0.8.199
@@ -14,6 +14,7 @@ USE_X11= YES
USE_GMAKE= YES
USE_LIBTOOL= YES
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
@@ -32,4 +33,3 @@ CONF_FILES+= ${EGDIR}/config ${PKG_SYSCONFDIR}/config
.include "../../lang/python22/buildlink2.mk"
.include "../../devel/glib2/buildlink2.mk"
.include "../../devel/popt/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index b87d4930066..c6becc99f72 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/01/21 08:13:18 lukem Exp $
+# $NetBSD: Makefile,v 1.35 2003/01/28 22:03:12 jlam Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 3
@@ -10,6 +10,7 @@ COMMENT= MySQL, a free SQL database (server)
CONFIGURE_ARGS+= --with-libwrap
CONFIGURE_ARGS+= --without-berkeley-db
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_GMAKE= YES
@@ -66,5 +67,5 @@ post-install:
.include "../../databases/mysql-client/buildlink2.mk"
.include "../../security/tcp_wrappers/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 18906d136e7..929170517fc 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2003/01/19 09:26:33 skrll Exp $
+# $NetBSD: Makefile,v 1.51 2003/01/28 22:03:12 jlam Exp $
DISTNAME= openldap-2.0.27
PKGREVISION= 1
@@ -14,6 +14,7 @@ COMMENT= Lightweight directory access protocol server and client package
CONFLICTS+= ldapsdk-[0-9]*
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/build/ltconfig
@@ -107,5 +108,4 @@ CONFIGURE_ARGS+= --with-threads
PLIST_SRC= ${.CURDIR}/PLIST.slurpd ${.CURDIR}/PLIST
.endif
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 8e2a133eeda..d4c6295849f 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/01/20 22:39:27 lukem Exp $
+# $NetBSD: Makefile,v 1.29 2003/01/28 22:03:13 jlam Exp $
PKGNAME= postgresql-server-${BASE_VERS}
PKGREVISION= 1
@@ -11,6 +11,7 @@ NOT_FOR_PLATFORM= *-*-mips
.include "../postgresql/Makefile.common"
+USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
BUILD_DIRS= ${WRKSRC}/src/backend
BUILD_DIRS+= ${WRKSRC}/src/backend/utils/mb/conversion_procs
@@ -65,5 +66,4 @@ post-install:
`${SED} -e "s|^#.*||" ${FILESDIR}/man.server`
.include "../postgresql-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index 3c1ee8a0e3b..37e7f96d994 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/20 21:26:30 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:13 jlam Exp $
PKGNAME= unixodbc-${ODBC_BASE_VERS}
PKGREVISION= 1
@@ -8,6 +8,7 @@ CONFLICTS+= iodbc-[0-9]*
.include "../../databases/unixodbc/Makefile.common"
+USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --disable-gui
PLIST_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR}
@@ -30,5 +31,4 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/odbcinst.ini ${EGDIR}/odbcinst.ini
.include "../../devel/readline/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index ebc258f4097..5d9507ef86d 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/01/05 14:07:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:13 jlam Exp $
#
DISTNAME= bonobo-activation-2.1.1
@@ -16,6 +16,7 @@ USE_X11= YES
USE_GMAKE= YES
USE_LIBTOOL= YES
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_PERL5= build
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
@@ -38,5 +39,5 @@ post-install:
.include "../../devel/glib2/buildlink2.mk"
.include "../../textproc/libxml2/buildlink2.mk"
.include "../../net/ORBit2/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs2p4/Makefile b/devel/cvs2p4/Makefile
index 1156f83e260..b7edc899dce 100644
--- a/devel/cvs2p4/Makefile
+++ b/devel/cvs2p4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/11/22 21:13:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:14 jlam Exp $
#
DISTNAME= cvs2p4-2.3.3
@@ -16,8 +16,9 @@ DEPENDS+= p4d-[0-9]*:../../devel/p4d
DEPENDS+= rcs-[0-9]*:../../devel/rcs
.endif
-USE_PERL5= # defined
-NO_BUILD= # defined
+USE_PKGINSTALL= yes
+USE_PERL5= yes
+NO_BUILD= yes
DOCDIR= share/doc/${PKGBASE}
EGDIR= share/examples/${PKGBASE}
@@ -53,5 +54,4 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/${EGDIR}
${INSTALL_DATA} ${WRKSRC}/test/config ${PREFIX}/${EGDIR}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 6d892607c0d..1122f226d06 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/09/21 08:27:25 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:03:14 jlam Exp $
#
DISTNAME= cvsgraph-1.2.0
@@ -11,6 +11,7 @@ HOMEPAGE= http://www.akhphd.au.dk/~bertho/cvsgraph/
COMMENT= graphically represents CVS/RCS branches and file revisions
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_X11= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -39,6 +40,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/cvsgraph.conf ${EGDIR}
.include "../../graphics/gd/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/isect/Makefile b/devel/isect/Makefile
index fed4e9b09bf..5d0a291f0de 100644
--- a/devel/isect/Makefile
+++ b/devel/isect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/01/19 12:54:32 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/01/28 22:03:15 jlam Exp $
#
DISTNAME= isect-1.6.2
@@ -11,6 +11,7 @@ COMMENT= open source middleware daemon
GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
PTHREAD_OPTS+= require
@@ -32,5 +33,4 @@ post-install:
.include "../../www/libwww/buildlink2.mk"
.include "../../mk/pthread.buildlink2.mk"
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile
index 9a4f006e253..491d74d02c5 100644
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/01/07 13:36:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:15 jlam Exp $
#
DISTNAME= ${OPENCM_VERSION}-1-src
@@ -13,6 +13,7 @@ HOMEPAGE= http://www.opencm.org/
COMMENT= Secure, high-integrity replacement for CVS
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -32,5 +33,4 @@ WRKSRC= ${WRKDIR}/${OPENCM_VERSION}/base
.include "../../security/openssl/buildlink2.mk"
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index 90d65fdc573..fa08f66b308 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/09/19 09:04:09 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:15 jlam Exp $
#
DISTNAME= p4d
@@ -9,6 +9,8 @@ P4BINONLY= # defined
.include "../../devel/p4/Makefile.common"
+USE_PKGINSTALL= yes
+
FILES_SUBST+= P4USER=${P4USER:Q}
FILES_SUBST+= P4ROOT=${P4ROOT:Q}
FILES_SUBST+= P4PORT=${P4PORT:Q}
@@ -30,5 +32,4 @@ P4JOURNAL?= journal
do-install:
${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${PREFIX}/sbin
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index af97bf99744..cae6c053729 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/01/04 19:59:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:16 jlam Exp $
#
DISTNAME= pango-1.2.0
@@ -13,6 +13,7 @@ HOMEPAGE= http://www.pango.org
COMMENT= Library for layout and rendering of text
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_GMAKE= yes
USE_X11= yes
GNU_CONFIGURE= yes
@@ -41,5 +42,4 @@ CONFIGURE_ARGS+= --with-qt=no
.include "../../fonts/Xft2/buildlink2.mk"
.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 899c043d38d..208262bf5fe 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/12/08 01:30:23 salo Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/28 22:03:16 jlam Exp $
#
DISTNAME= pwlib_1.4.4
@@ -20,6 +20,7 @@ BUILD_DEPENDS= bison-[0-9]*:../../devel/bison
WRKSRC= ${WRKDIR}/pwlib
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
@@ -57,5 +58,4 @@ do-install:
done
.include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/rt-mysql/Makefile.common b/devel/rt-mysql/Makefile.common
index 71de9dd8aa3..9f699c569a1 100644
--- a/devel/rt-mysql/Makefile.common
+++ b/devel/rt-mysql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2002/09/19 21:40:45 atatat Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/01/28 22:03:16 jlam Exp $
DISTNAME= rt-2-0-13
CATEGORIES= devel
@@ -24,6 +24,8 @@ RT_DB_PASS?= changemeplease
RT_WEB_USER?= nobody
RT_WEB_GROUP?= nobody
+USE_PKGINSTALL= yes
+
PKGDIR= ${.CURDIR}/../../devel/rt-mysql
DISTINFO_FILE= ${PKGDIR}/distinfo
FILESDIR= ${PKGDIR}/files
@@ -122,5 +124,4 @@ pre-build:
${ECHO} '#define DATABASE_LIBRARY_PATH "${RT_DB_PATH}"' >> config.h; \
${ECHO} '#define RT_GROUP "${RT_GROUP}"' >> config.h )
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 8082e972835..cd6fa38e28f 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2003/01/13 19:06:27 kristerw Exp $
+# $NetBSD: Makefile,v 1.89 2003/01/28 22:03:17 jlam Exp $
#
DISTNAME= xmame-0.62.2
@@ -16,6 +16,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_X11BASE= YES
USE_GMAKE= YES
MAKEFILE= makefile.unix
@@ -106,5 +107,5 @@ do-install:
.include "../../audio/esound/buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 0851a37c952..9aa0d6eeff2 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/01/13 19:35:42 kristerw Exp $
+# $NetBSD: Makefile,v 1.31 2003/01/28 22:03:17 jlam Exp $
#
DISTNAME= xmame-0.62.2
@@ -16,6 +16,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_X11BASE= YES
USE_GMAKE= YES
MAKEFILE= makefile.unix
@@ -106,5 +107,5 @@ do-install:
.include "../../audio/esound/buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index fcb3109397b..271875315b0 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/01/21 14:25:31 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:17 jlam Exp $
#
DISTNAME= fcpackage.2_1
@@ -13,6 +13,7 @@ COMMENT= Library for configuring and customizing font access
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_GMAKE= YES
USE_X11= YES
@@ -41,5 +42,4 @@ post-install:
.include "../../graphics/freetype2/buildlink2.mk"
.include "../../textproc/expat/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ghostscript-cidfonts/Makefile b/fonts/ghostscript-cidfonts/Makefile
index bf0dd1ed287..ff736e9b1fd 100644
--- a/fonts/ghostscript-cidfonts/Makefile
+++ b/fonts/ghostscript-cidfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/13 22:35:01 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/28 22:03:18 jlam Exp $
DISTNAME= ghostscript-cidfonts-20000901
CATEGORIES= fonts
@@ -16,8 +16,9 @@ ADOBE_RESOURCEDIR= ${PREFIX}/share/Adobe/Resource
GS_RESOURCEDIR= ${PREFIX}/share/ghostscript/Resource
EXTRACT_ONLY= # empty
-NO_CONFIGURE= # defined
-NO_BUILD= # defined
+NO_CONFIGURE= yes
+NO_BUILD= yes
+USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
@@ -31,5 +32,4 @@ MAKE_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CIDFont
do-install: # nothing
.include "../../mk/ghostscript.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ghostscript-cmaps/Makefile b/fonts/ghostscript-cmaps/Makefile
index 34ac754dd69..1b570cf8d49 100644
--- a/fonts/ghostscript-cmaps/Makefile
+++ b/fonts/ghostscript-cmaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/13 22:49:44 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:03:18 jlam Exp $
DISTNAME= ghostscript-cmaps-20020913
CATEGORIES= fonts
@@ -16,8 +16,9 @@ ADOBE_RESOURCEDIR= ${PREFIX}/share/Adobe/Resource
GS_RESOURCEDIR= ${PREFIX}/share/ghostscript/Resource
EXTRACT_ONLY= # empty
-NO_CONFIGURE= # defined
-NO_BUILD= # defined
+NO_CONFIGURE= yes
+NO_BUILD= yes
+USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
@@ -31,5 +32,4 @@ MAKE_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CMap
do-install: # nothing
.include "../../mk/ghostscript.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/kochi-ttf/Makefile b/fonts/kochi-ttf/Makefile
index c5e38e1d67e..69ece9bbf67 100644
--- a/fonts/kochi-ttf/Makefile
+++ b/fonts/kochi-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/16 13:23:09 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:18 jlam Exp $
DISTNAME= kochi-gothic-20020503
PKGNAME= kochi-ttf-20020503
@@ -18,8 +18,9 @@ KOCHI_VERSION= 0.2.20020503
WRKSRC= ${WRKDIR}/kochi-gothic
-NO_BUILD= # Defined
-USE_X11BASE= # Defined
+NO_BUILD= yes
+USE_X11BASE= yes
+USE_PKGINSTALL= yes
INSTALL_TMPL= ${FILESDIR}/install
DEINSTALL_TMPL= ${FILESDIR}/deinstall
@@ -37,5 +38,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/fonts/kochi-mincho.ttf \
${PREFIX}/lib/X11/fonts/TrueType/kochi-mincho.ttf
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/monafonts/Makefile b/fonts/monafonts/Makefile
index e2d4ee85412..a4a56f4dbfb 100644
--- a/fonts/monafonts/Makefile
+++ b/fonts/monafonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/12/23 12:52:29 toshii Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:19 jlam Exp $
DISTNAME= monafont-2.22
PKGNAME= ${DISTNAME:S/font/fonts/}
@@ -10,8 +10,9 @@ MAINTAINER= uebayasi@soum.co.jp
HOMEPAGE= http://monafont.sourceforge.net/
COMMENT= Japanese fonts for "Mona" seen at 2ch.net
-USE_X11BASE= # Defined
-USE_PERL5= # Defined
+USE_X11BASE= yes
+USE_PKGINSTALL= yes
+USE_PERL5= yes
ALL_TARGET= bdf
MAKE_FLAGS+= SED_CMD=${SED:Q}
MAKE_FLAGS+= PERL_CMD=${PERL5:Q}
@@ -24,5 +25,4 @@ FILES_SUBST+= X11FONTSSUBDIR=local
post-extract:
${MKDIR} ${WRKSRC}/dist
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index f0c93605674..49fe0e455c5 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/09/19 14:47:34 tron Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:19 jlam Exp $
DISTNAME= t1lib-1.3.1
CATEGORIES= fonts devel graphics
@@ -9,6 +9,7 @@ MAINTAINER= packages@netbsd.org
COMMENT= library for generating bitmaps from Adobe Type 1 fonts
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
@@ -39,5 +40,4 @@ post-install:
${SED} ${FILES_SUBST_SED} \
${FILESDIR}/t1lib.config.sample > ${EGDIR}/t1lib.config.sample
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/koth/Makefile b/games/koth/Makefile
index e4dee5cfeb9..cdc81426efc 100644
--- a/games/koth/Makefile
+++ b/games/koth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/01/04 12:25:13 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/28 22:03:19 jlam Exp $
#
DISTNAME= koth-0.7.6
@@ -10,9 +10,10 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www-unix.oit.umass.edu/~tetron/koth/
COMMENT= The classic "shoot the other tank" artillery game, networked
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
CPPFLAGS+= -DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR:Q}\\\"\"
-USE_BUILDLINK2= YES
EGDIR= ${PREFIX}/share/examples/koth
CONF_FILES= ${EGDIR}/koth.cfg ${PKG_SYSCONFDIR}/koth.cfg
@@ -25,5 +26,5 @@ post-install:
.include "../../graphics/libggi/buildlink2.mk"
.include "../../graphics/libgii/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/games/sarien/Makefile b/games/sarien/Makefile
index 5558679fce8..6edad510a9c 100644
--- a/games/sarien/Makefile
+++ b/games/sarien/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/10 16:16:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/28 22:03:20 jlam Exp $
#
DISTNAME= sarien-0.7.0
@@ -11,6 +11,7 @@ COMMENT= Adventure Game Interpreter (AGI) for Sierra On-Line Titles
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_GMAKE= YES
CONFIGURE_ARGS= --with-sdl
@@ -27,5 +28,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/etc/sarien.cfg ${EGDIR}/sarien.conf
.include "../../devel/SDL/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index e2fbfd72d49..618c1c8f075 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/12/06 04:03:01 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:20 jlam Exp $
DISTNAME= xmris.4.04
PKGNAME= xmris-4.04
@@ -10,6 +10,7 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.cs.bris.ac.uk/~nathan/xmris/
COMMENT= Version of the Mr Do video arcade game for X
+USE_PKGINSTALL= yes
USE_IMAKE= yes
ALL_TARGET= initialize xmris xmred
NO_INSTALL_MANPAGES= yes
@@ -21,5 +22,4 @@ post-install:
${LN} -fs xmris.6 ${PREFIX}/man/man6/xmsit.6
${INSTALL_MAN} ${WRKSRC}/xmred.man ${PREFIX}/man/man6/xmred.6
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index bf4aea685e1..9aaa3f7a0ca 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/10/10 12:56:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:21 jlam Exp $
# FreeBSD: ports/games/xpat2/Makefile,v 1.11 2000/04/14 12:27:59 asami Exp
DISTNAME= xpat2-1.06
@@ -9,6 +9,7 @@ MAINTAINER= kuebart@mathematik.uni-ulm.de
COMMENT= X11 solitaire game with 14 variations
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_X11BASE= YES
# This package uses imake, but invokes it directly as part of the build
@@ -26,5 +27,4 @@ post-install:
${CHMOD} 2555 ${PREFIX}/bin/xpat2
.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index 81a146220a8..2df6df73bf1 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/10 12:52:08 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/28 22:03:21 jlam Exp $
#
DISTNAME= xsoldier-0.96
@@ -10,6 +10,7 @@ HOMEPAGE= http://www.surfline.ne.jp/hachi/xsoldier.html
COMMENT= Updated xgalaga type game with awesome graphics
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_IMAKE= YES
NO_INSTALL_MANPAGES= YES
@@ -23,5 +24,4 @@ post-patch:
${TOUCH} ${WRKSRC}/xsoldier.man
.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aview-x11/Makefile b/graphics/aview-x11/Makefile
index 2cb5ccc5920..e44cdc560b8 100644
--- a/graphics/aview-x11/Makefile
+++ b/graphics/aview-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/26 19:39:21 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:22 jlam Exp $
#
DISTNAME= aview-1.3.0rc1
@@ -16,10 +16,11 @@ CONFLICTS+= aview-[0-9]*
WRKSRC= ${WRKDIR}/aview-1.3.0
PLIST_SRC= ${WRKDIR}/PLIST
-GNU_CONFIGURE= # defined
-USE_LIBTOOL= # defined
-USE_BUILDLINK2= # defined
-USE_X11= # defined
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_X11= yes
.include "../../mk/bsd.prefs.mk"
@@ -50,5 +51,4 @@ post-install:
.include "../../graphics/aalib-x11/buildlink2.mk"
.include "../../graphics/netpbm/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index ed72110737d..56c1581bc7b 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/08/26 19:39:21 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:03:22 jlam Exp $
#
DISTNAME= aview-1.3.0rc1
@@ -16,9 +16,10 @@ CONFLICTS+= aview-x11-[0-9]*
WRKSRC= ${WRKDIR}/aview-1.3.0
PLIST_SRC= ${WRKDIR}/PLIST
-GNU_CONFIGURE= # defined
-USE_LIBTOOL= # defined
-USE_BUILDLINK2= # defined
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
.include "../../mk/bsd.prefs.mk"
@@ -49,5 +50,4 @@ post-install:
.include "../../graphics/aalib/buildlink2.mk"
.include "../../graphics/netpbm/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index c2e2fdeada4..1756fbbbe1b 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/01/02 14:20:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:23 jlam Exp $
DISTNAME= fnlib-0.5
PKGREVISION= 2
@@ -8,11 +8,12 @@ MASTER_SITES= ftp://ftp.enlightenment.org/pub/e/enlightenment/libs/
MAINTAINER= root@garbled.net
COMMENT= color font rendering library for X11R6
-USE_BUILDLINK2= # defined
-USE_X11BASE= # defined
-GNU_CONFIGURE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_X11BASE= yes
+GNU_CONFIGURE= yes
-USE_LIBTOOL= # defined
+USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}"
@@ -24,5 +25,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/fontinfo.README ${PREFIX}/share/doc/fnlib
.include "../../graphics/imlib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile
index f69430248e1..d3a71fc03f0 100644
--- a/graphics/gimp-base/Makefile
+++ b/graphics/gimp-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/01/04 23:04:14 cjep Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:23 jlam Exp $
DISTNAME= gimp-1.2.3
PKGNAME= gimp-base-1.2.3
@@ -18,6 +18,7 @@ CONFLICTS+= gimp<=1.2.3
BUILD_USES_MSGFMT= yes
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
USE_GMAKE= yes
@@ -81,5 +82,4 @@ PLIST_SUBST+= HELPBROWSER="@comment "
.include "../../x11/gtk/buildlink2.mk"
.endif
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index b106a0f50a9..b437e80ad1f 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2002/11/26 12:32:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.73 2003/01/28 22:03:24 jlam Exp $
#
DISTNAME= imlib-1.9.14
@@ -20,6 +20,7 @@ USE_GMAKE= yes
UNLIMIT_RESOURCES= datasize
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
CPPFLAGS+= -DENABLE_NLS
CONFIGURE_ENV+= ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
@@ -58,5 +59,4 @@ post-install:
.include "../../graphics/tiff/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 1bb6599f946..5f117cabe36 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/01/24 13:34:41 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2003/01/28 22:03:24 jlam Exp $
#
DISTNAME= libggi-2.0b2.1
@@ -10,13 +10,14 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.ggi-project.org/
COMMENT= General Graphics Interface library is a flexible drawing library
-USE_BUILDLINK2= # defined
-USE_X11= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_X11= yes
-USE_LIBTOOL= # defined
+USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= --with-x
CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}"
@@ -39,5 +40,4 @@ post-configure:
.include "../../devel/ncurses/buildlink2.mk"
.include "../../graphics/libgii/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgii/Makefile b/graphics/libgii/Makefile
index d7ff8b53e5f..cba4fadc394 100644
--- a/graphics/libgii/Makefile
+++ b/graphics/libgii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/01/02 23:15:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:24 jlam Exp $
#
DISTNAME= libgii-0.6
@@ -10,13 +10,14 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.ggi-project.org/
COMMENT= General Input Interface - API for all possible input sources
-USE_BUILDLINK2= # defined
-USE_X11= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_X11= yes
-USE_LIBTOOL= # defined
+USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-mutexes=int
CONFIGURE_ARGS+= --with-x
CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}"
@@ -25,5 +26,4 @@ PKG_SYSCONFSUBDIR= ggi
EGDIR= ${PREFIX}/share/examples/ggi
CONF_FILES= ${EGDIR}/libgii.conf ${PKG_SYSCONFDIR}/libgii.conf
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile
index 5f9b5e49de0..63eea973b07 100644
--- a/graphics/tcm/Makefile
+++ b/graphics/tcm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/01/01 22:02:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/28 22:03:25 jlam Exp $
DISTNAME= tcm-2.01.src
PKGNAME= tcm-2.01
@@ -13,6 +13,7 @@ COMMENT= TCM - Toolkit for Conceptual Modeling
WRKSRC= ${WRKDIR}/tcm-2.01/src
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_X11BASE= YES
# These two variables denote where the installed location of the libraries
@@ -92,7 +93,6 @@ do-install:
${PREFIX}/share/doc/html/tcm/wishlist/
.include "../../mk/motif.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
.if defined(MOTIF_TYPE) && (${MOTIF_TYPE} == "lesstif")
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index b24095bfe31..dd7cd2df114 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2002/12/25 14:25:27 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2003/01/28 22:03:25 jlam Exp $
DISTNAME= tiff-v3.5.7
PKGNAME= tiff-3.5.7
@@ -13,9 +13,9 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.libtiff.org/
COMMENT= Library and tools for reading and writing TIFF data files
-USE_BUILDLINK2= # defined
-USE_LIBTOOL= # defined
-HAS_CONFIGURE= # defined
+USE_BUILDLINK2= yes
+USE_LIBTOOL= yes
+HAS_CONFIGURE= yes
CONFIGURE_ARGS= --noninteractive --site=${FILESDIR} --prefix=${PREFIX}
.include "../../mk/bsd.prefs.mk"
@@ -51,10 +51,9 @@ pre-patch:
.include "../../graphics/jpeg/buildlink2.mk"
.if !empty(X11BASE:M*openwin)
-INSTALL_TMPL= ${.CURDIR}/INSTALL.OpenWindows
+USE_PKGINSTALL= yes
DEINSTALL_TMPL= ${INSTALL_TMPL}
-
-. include "../../mk/bsd.pkg.install.mk"
+INSTALL_TMPL= ${.CURDIR}/INSTALL.OpenWindows
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index a5e0951f9e6..a0e4f3f727c 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/01/01 19:24:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:26 jlam Exp $
#
DISTNAME= tuxpaint-2002.10.26
@@ -11,6 +11,7 @@ HOMEPAGE= http://www.newbreedsoftware.com/tuxpaint/
COMMENT= drawing program for small children
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_GMAKE= YES
MANCOMPRESSED= YES
@@ -23,5 +24,5 @@ CONF_FILES= ${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf
.include "../../devel/SDL/buildlink2.mk"
.include "../../devel/SDL_ttf/buildlink2.mk"
.include "../../graphics/SDL-image/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/ja-freewnn-server-bin/Makefile b/inputmethod/ja-freewnn-server-bin/Makefile
index 23e38d465be..79aaaa70e3e 100644
--- a/inputmethod/ja-freewnn-server-bin/Makefile
+++ b/inputmethod/ja-freewnn-server-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/13 13:35:01 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:26 jlam Exp $
#
PKGNAME= ja-FreeWnn-server-bin-1.10
@@ -18,6 +18,7 @@ DISTINFO_FILE= ${.CURDIR}/../ja-freewnn-lib/distinfo
PATCHDIR= ${.CURDIR}/../ja-freewnn-lib/patches
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
.include "../../mk/bsd.prefs.mk"
@@ -28,6 +29,5 @@ BUILD_DEFS+= FREEWNN_USER FREEWNN_GROUP
PKG_GROUPS= ${FREEWNN_GROUP}
PKG_USERS= ${FREEWNN_USER}:${FREEWNN_GROUP}::Freewnn\\ user
-.include "../../mk/bsd.pkg.install.mk"
.include "../ja-freewnn-lib/buildlink2.mk"
.include "../ja-freewnn-lib/Makefile.common"
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 44fb64d0d66..c5438879138 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2003/01/11 10:44:27 grant Exp $
+# $NetBSD: Makefile,v 1.53 2003/01/28 22:03:27 jlam Exp $
# Make sure that the version number in "Makefile.gcc" matches this.
DISTNAME= gcc-2.95.3
@@ -19,6 +19,7 @@ PATCHFILES= gcc-2.95.3-diff-2002-08-29.gz
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_GMAKE= YES
HAS_CONFIGURE= YES
@@ -104,7 +105,6 @@ post-install:
.endif
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
# Make bootstrap with compiler != gcc possible.
diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile
index 715b2f3ca55..174e5a22ff3 100644
--- a/lang/gcc3/Makefile
+++ b/lang/gcc3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/11 04:31:53 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:27 jlam Exp $
# Make sure that the version number in "Makefile.gcc" matches this.
DISTNAME= gcc-3.2.1
@@ -14,6 +14,7 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
CONFLICTS+= pgcc-[0-9]*
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_GMAKE= YES
HAS_CONFIGURE= YES
@@ -64,7 +65,6 @@ post-install:
>> ${PLIST_SRC}
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
# Make bootstrap with compiler != gcc possible.
diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
index 32f00b3ee08..92c6c61bc99 100644
--- a/mail/courier-auth/Makefile
+++ b/mail/courier-auth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/10/08 23:15:58 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:28 jlam Exp $
PKGNAME= courier-auth-${BASE_VERS}
PKGREVISION?= 1
@@ -9,6 +9,7 @@ CONFLICTS= courier-imap<=1.4.0
CONFLICTS+= courier-imap-ldap-*
USE_PERL5= yes
+USE_PKGINSTALL= yes
REPLACE_PERL= sysconftool
.include "../../mail/courier-auth/Makefile.authdaemond"
@@ -37,5 +38,4 @@ post-install:
${RM} -f ${PKG_SYSCONFDIR}/$${file}; \
done
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-authldap/Makefile b/mail/courier-authldap/Makefile
index e08aab18fa9..3cb2f1bc440 100644
--- a/mail/courier-authldap/Makefile
+++ b/mail/courier-authldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/10/08 23:15:59 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:28 jlam Exp $
PKGNAME= courier-authldap-${BASE_VERS}
PKGREVISION?= # empty
@@ -10,6 +10,7 @@ DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth
.include "../../mail/courier-auth/Makefile.authdaemond"
+USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --with-authldap
GEN_FILES= authldaprc
@@ -28,5 +29,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/authlib/authldaprc ${EGDIR}/authldaprc.dist
.include "../../databases/openldap/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-authmysql/Makefile b/mail/courier-authmysql/Makefile
index b64914ebbfc..7e3383b3feb 100644
--- a/mail/courier-authmysql/Makefile
+++ b/mail/courier-authmysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/08 23:15:59 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:29 jlam Exp $
PKGNAME= courier-authmysql-${BASE_VERS}
PKGREVISION?= # empty
@@ -8,6 +8,7 @@ DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth
.include "../../mail/courier-auth/Makefile.authdaemond"
+USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --with-authmysql
LDFLAGS+= ${BUILDLINK_LDFLAGS.mysql-client}
@@ -29,5 +30,4 @@ do-install:
${PREFIX}/share/doc/html/courier
.include "../../databases/mysql-client/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-authpgsql/Makefile b/mail/courier-authpgsql/Makefile
index bd053be1010..7360e550f92 100644
--- a/mail/courier-authpgsql/Makefile
+++ b/mail/courier-authpgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/01/05 20:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:29 jlam Exp $
PKGNAME= courier-authpgsql-${BASE_VERS}
PKGREVISION= 1
@@ -8,6 +8,7 @@ DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth
.include "../../mail/courier-auth/Makefile.authdaemond"
+USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --with-authpgsql
CONFIGURE_ARGS+= --with-pgsql-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
CONFIGURE_ARGS+= --with-pgsql-libs=${BUILDLINK_PREFIX.postgresql-lib}/lib
@@ -37,5 +38,4 @@ do-install:
${PREFIX}/share/doc/html/courier
.include "../../databases/postgresql-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index b68c3121a52..f34b0e768c7 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/10/08 23:16:00 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/01/28 22:03:29 jlam Exp $
DISTNAME= courier-imap-1.4.2
PKGREVISION= 1
@@ -8,6 +8,7 @@ HOMEPAGE= http://www.inter7.com/courierimap/
DEPENDS+= courier-auth>=0.37.1:../../mail/courier-auth
DEPENDS+= courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
+USE_PKGINSTALL= yes
USE_PERL5= yes
REPLACE_PERL= sysconftool
@@ -68,5 +69,4 @@ post-install:
cd ${WRKSRC}; ${INSTALL_DATA} imap/imapd.pam imap/pop3d.pam ${EGDIR}
.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index 6eb505eb4d0..42376bb0ae6 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/11/15 00:04:08 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:30 jlam Exp $
PKGNAME= courier-maildirmake-${BASE_VERS}
PKGREVISION?= 1
@@ -6,6 +6,7 @@ COMMENT= Courier Maildir utilities
PERL5_REQD= 5.6.0
USE_PERL5= build
+USE_PKGINSTALL= yes
REPLACE_PERL= sysconftool
@@ -40,5 +41,4 @@ post-install:
${DOCDIR}/README.sharedfolders
.include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 27c26b3b404..abd9cefe18e 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2002/12/06 12:53:51 chris Exp $
+# $NetBSD: Makefile,v 1.38 2003/01/28 22:03:30 jlam Exp $
DISTNAME= cyrus-imapd-2.0.17
SVR4_PKGNAME= cimap
@@ -11,6 +11,7 @@ HOMEPAGE= http://asg.web.cmu.edu/cyrus/imapd/
COMMENT= Cyrus IMAP server
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
PERL5_CONFIGURE= NO
AUTOCONF_REQD= 2.13
@@ -115,6 +116,6 @@ post-install:
.include "../../security/cyrus-sasl/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
.include "../../security/tcp_wrappers/buildlink2.mk"
+
.include "../../mk/autoconf.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 85632ab92ce..f97c1baaca5 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/12/08 00:39:42 chris Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:31 jlam Exp $
DISTNAME= cyrus-imapd-2.1.11
SVR4_PKGNAME= cimap
@@ -11,6 +11,7 @@ HOMEPAGE= http://asg.web.cmu.edu/cyrus/imapd/
COMMENT= Cyrus IMAP server
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
PERL5_CONFIGURE= NO
AUTOCONF_REQD= 2.13
@@ -128,6 +129,6 @@ post-install:
.include "../../security/cyrus-sasl2/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
.include "../../security/tcp_wrappers/buildlink2.mk"
+
.include "../../mk/autoconf.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index 98c8ba7ef0f..8b8cbeabdf4 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/11/15 01:39:28 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:03:32 jlam Exp $
#
DISTNAME= demime-0.99d.1
@@ -20,6 +20,7 @@ DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
DIST_SUBDIR= ${PKGNAME}
NO_BUILD= YES
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
POD2MAN?= ${BUILDLINK_PREFIX.perl}/bin/pod2man
@@ -42,5 +43,4 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/demime.1 ${PREFIX}/man/man1/demime.1
.include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index 2224d1bd1db..8e973112cc4 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/12/24 09:04:12 kim Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/28 22:03:32 jlam Exp $
# FreeBSD: Makefile,v 1.42 1997/12/24 01:21:07 alex Exp
#
@@ -16,6 +16,7 @@ COMMENT= ELM Mail User Agent with ME extensions
CONFLICTS= elm-[0-9]*
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
HAS_CONFIGURE= YES
CONFIGURE_SCRIPT= ksh ./Configure
CONFIGURE_ENV= PREFIX="${PREFIX}" RUN_AS_BATCH=yes
@@ -43,5 +44,4 @@ post-configure:
${TOUCH} ${WRKSRC}/*/Makefile
.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 72bfe7e4a8f..abeb2dbff58 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/02/01 22:44:27 bouyer Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:33 jlam Exp $
DISTNAME= imp-3.0
CATEGORIES= mail www
@@ -21,6 +21,7 @@ MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
.include "../../mk/bsd.prefs.mk"
+USE_PKGINSTALL= yes
PKG_SYSCONFSUBDIR?= httpd
CONF_FILES= ${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
@@ -66,5 +67,4 @@ do-install:
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${IMPDIR}
${CHMOD} -R a-w ${IMPDIR}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index ebb961bb5f1..a0cadff48f6 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/09/21 23:46:53 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:34 jlam Exp $
DISTNAME= mailman-2.0.12
CATEGORIES= mail www
@@ -11,6 +11,7 @@ COMMENT= the GNU Mailing List Manager
.include "../../mk/bsd.prefs.mk"
+USE_PKGINSTALL= yes
PKG_SYSCONFSUBDIR?= httpd
MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
MESSAGE_SUBST+= DOCDIR=${DOCDIR}
@@ -146,5 +147,4 @@ do-install:
${CHMOD} -R g-w ${EXECDIR}
.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 6ca3288762e..c1c0b4c90bc 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/30 09:50:24 markd Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:34 jlam Exp $
DISTNAME= mimedefang-2.24
CATEGORIES= mail
@@ -18,6 +18,7 @@ DEPENDS+= p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools
DEPENDS+= spamassassin>=2.31:../../mail/spamassassin
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_PERL5= YES
GNU_CONFIGURE= YES
PKG_SYSCONFSUBDIR?= mimedefang
@@ -71,5 +72,4 @@ do-install:
.include "../../mail/libmilter/buildlink2.mk"
.include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index cffec6538d9..376ba4ba912 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2002/12/03 21:21:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.91 2003/01/28 22:03:34 jlam Exp $
DISTNAME= mutt-1.4i
PKGNAME= ${DISTNAME:C/i$//}
@@ -13,12 +13,13 @@ MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.mutt.org/
COMMENT= text-based MIME mail client with PGP support
-BUILD_USES_MSGFMT= # defined
+BUILD_USES_MSGFMT= yes
-USE_BUILDLINK2= # defined
-USE_GMAKE= # defined
-GNU_CONFIGURE= # defined
-USE_PKGLOCALEDIR= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
--with-docdir=${PREFIX}/share/doc/mutt \
--without-included-gettext \
@@ -34,7 +35,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/i$$//}
CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
.else
. if ${MUTT_USE_NCURSES} == YES
-USE_NCURSES= # defined
+USE_NCURSES= yes
. endif
. include "../../devel/ncurses/buildlink2.mk"
CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses}
@@ -77,5 +78,4 @@ post-install:
.include "../../converters/libiconv/buildlink2.mk"
.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index aa34ccf482d..e6d1c5faeb5 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/19 18:10:32 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:35 jlam Exp $
DISTNAME= nail-10.4
CATEGORIES= mail
@@ -9,6 +9,7 @@ HOMEPAGE= http://omnibus.ruf.uni-freiburg.de/~gritter/
COMMENT= BSD mail utility with MIME extensions
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rcfile=${PKG_SYSCONFDIR}/nail.rc
@@ -22,5 +23,4 @@ do-install:
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/nail.rc ${EGDIR}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 231e40514c0..6ca807d5fd8 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/21 15:43:00 heinz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:35 jlam Exp $
DISTNAME= nullmailer-1.00RC5
CATEGORIES= mail
@@ -8,6 +8,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://untroubled.org/nullmailer/
COMMENT= Simple relay-only mail transport agent
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} --localstatedir=/var
@@ -39,5 +40,4 @@ post-install:
cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS COPYING ChangeLog \
HOWTO NEWS README TODO ${PREFIX}/share/doc/nullmailer
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index f088c6bc18e..c0349e2c702 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/11/07 03:48:00 dillo Exp $
+# $NetBSD: Makefile,v 1.25 2003/01/28 22:03:36 jlam Exp $
#
DISTNAME= popa3d-0.5.9
@@ -19,6 +19,7 @@ PKG_GROUPS= ${POPA3D_GROUP}
PKG_USERS= ${POPA3D_USER}:${POPA3D_GROUP}
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
RCD_SCRIPTS= popa3d
@@ -40,5 +41,4 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/empty
.include "../../security/tcp_wrappers/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 6839d10d0dc..f22a22507cf 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2003/01/26 13:20:08 taca Exp $
+# $NetBSD: Makefile,v 1.78 2003/01/28 22:03:36 jlam Exp $
DISTNAME= postfix-2.0.3
CATEGORIES= mail
@@ -13,6 +13,7 @@ DIST_SUBDIR= postfix
POSTFIX_SPOOL= /var/spool/postfix
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
.include "../../mk/bsd.prefs.mk"
@@ -171,5 +172,4 @@ post-install:
${TEST} -f /etc/postfix/master.cf || \
${INSTALL_DATA} ${PREFIX}/share/postfix/master.cf /etc/postfix
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 4280bfcbeb9..91564464176 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/04 21:54:31 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:37 jlam Exp $
#
DISTNAME= prayer-1.0.5
@@ -12,6 +12,7 @@ COMMENT= Small, fast, web mail interface
PKG_GROUPS= prayer
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_GMAKE= YES
USE_PERL5= build
@@ -21,5 +22,4 @@ USE_PERL5= build
.include "../../mail/imap-uw/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail-users/Makefile b/mail/qmail-users/Makefile
index 48eaae318fa..cc26f107332 100644
--- a/mail/qmail-users/Makefile
+++ b/mail/qmail-users/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/01/28 17:51:11 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:37 jlam Exp $
#
DISTNAME= qmail-users-1.0
@@ -22,10 +22,10 @@ PKG_USERS+= qmails:qmail::qmails:${QMAILDIR}
NO_BUILD= YES
NO_CHECKSUM= YES
+USE_PKGINSTALL= YES
WRKSRC= ${WRKDIR}
do-install: # empty
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 3865574aa46..ae785863ad4 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/09/19 09:04:12 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/01/28 22:03:38 jlam Exp $
#
DISTNAME= qmail-1.03
@@ -26,6 +26,7 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_PACKAGE= "needs work to function properly as a binary package"
+USE_PKGINSTALL= yes
OWN_DIRS+= ${QMAILDIR}
FILES_SUBST+= QMAILDIR=${QMAILDIR}
@@ -54,5 +55,4 @@ post-install:
cd ${QMAILDIR}/alias && \
${TOUCH} .qmail-postmaster .qmail-mailer-daemon .qmail-root
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 09057913307..4c5ac05228d 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/11/23 17:01:20 taca Exp $
+# $NetBSD: Makefile,v 1.36 2003/01/28 22:03:38 jlam Exp $
#
DISTNAME= qpopper${VERSION}
@@ -17,7 +17,8 @@ COMMENT= Qualcomm's POP server for Eudora
.include "Makefile.common"
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
PKG_USERS?= ${QPOPPER_USER}
@@ -35,6 +36,4 @@ post-install:
${PREFIX}/share/examples
.include "../../security/openssl/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index cd6b87d1c1c..2d2c18c35aa 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2002/10/03 10:09:03 markd Exp $
+# $NetBSD: Makefile,v 1.55 2003/01/28 22:03:39 jlam Exp $
.include "../../mail/sendmail/Makefile.common"
@@ -89,10 +89,10 @@ post-install:
${MV} -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || ${TRUE}
.endif
+USE_PKGINSTALL= yes
PKG_GROUPS= smmsp
PKG_USERS= smmsp:smmsp::Sendmail\\ Message\\ Submission\\ Program
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
# has to be below include for bsd.pkg.mk, else substition fails
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 73b681e1396..57702c44365 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/11/06 21:51:26 heinz Exp $
+# $NetBSD: Makefile,v 1.15 2003/01/28 22:03:39 jlam Exp $
DISTNAME= Mail-SpamAssassin-2.43
PKGNAME= spamassassin-2.43
@@ -20,6 +20,7 @@ DEPENDS+= p5-MIME-Base64>=2.11:../../converters/p5-MIME-Base64
BUILDLINK_DEPENDS.perl= perl>=5.6.0
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
CONFLICTS= p5-Mail-SpamAssassin-[1-9]*
@@ -116,5 +117,4 @@ post-install:
${CHGRP} ${SHAREGRP} ${RULESDIR}/*
.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index c57a179f694..81bb481b448 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/12/03 06:37:15 martti Exp $
+# $NetBSD: Makefile,v 1.30 2003/01/28 22:03:40 jlam Exp $
DISTNAME= squirrelmail-1.2.10
CATEGORIES= mail www
@@ -17,8 +17,9 @@ DEPENDS+= php-gettext>=4.0.6:../../devel/php4-gettext
DEPENDS+= php-session>=4.0.6:../../devel/php4-session
DEPENDS+= php-pcre>=4.0.6:../../devel/php4-pcre
-USE_BUILDLINK2= # defined
-NO_BUILD= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+NO_BUILD= yes
REPLACE_PERL= config/conf.pl config/ri_once.pl
.include "../../mk/bsd.prefs.mk"
@@ -68,5 +69,4 @@ do-install:
${CHMOD} -R a-w ${SMDIR}
.include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 00a553b563d..e3874793725 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/10/08 23:16:01 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:40 jlam Exp $
DISTNAME= sqwebmail-3.3.1
CATEGORIES= www
@@ -9,6 +9,7 @@ DEPENDS+= courier-auth>=0.37.1nb1:../../mail/courier-auth
DEPENDS+= courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
USE_PERL5= yes
+USE_PKGINSTALL= yes
REPLACE_PERL= sysconftool
.include "../../mail/courier-auth/Makefile.common"
@@ -87,5 +88,4 @@ post-install:
cd ${WRKSRC}/sqwebmail; ${INSTALL_DATA} BUGS.html SECURITY.html \
${HTMLDIR}/sqwebmail
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index a50cedeaa96..0e86fb8f7ce 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/12/30 18:45:57 chris Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:03:41 jlam Exp $
DISTNAME= sylpheed-0.8.8claws
PKGNAME= sylpheed-claws-0.8.8
@@ -16,6 +16,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS= sylpheed-[0-9]*
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_X11BASE= yes
USE_GMAKE= yes
@@ -65,5 +66,4 @@ post-install:
.include "../../security/openssl/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 79dfeb2c114..9893843e28c 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/01/19 23:08:19 chris Exp $
+# $NetBSD: Makefile,v 1.32 2003/01/28 22:03:41 jlam Exp $
DISTNAME= sylpheed-0.8.9
CATEGORIES= mail news x11
@@ -14,6 +14,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS= sylpheed-claws-[0-9]*
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_X11BASE= yes
USE_GMAKE= yes
@@ -61,5 +62,4 @@ post-install:
.include "../../security/openssl/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 8043ad39cd8..9827dbe327e 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/01/28 09:40:15 uebayasi Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:03:42 jlam Exp $
#
DISTNAME= sympa-3.4.2
@@ -23,8 +23,9 @@ DEPENDS+= p5-DBD-mysql>=2.0407:../../databases/p5-DBD-mysql
DEPENDS+= p5-DBD-postgresql>=0.90:../../databases/p5-DBD-postgresql
DEPENDS+= p5-perl-ldap>=0.10:../../databases/p5-perl-ldap
-USE_BUILDLINK2= YES
-GNU_CONFIGURE= YES
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-piddir=/var/run
PERL5_REQD= 5.005
@@ -37,7 +38,6 @@ post-install:
${CHMOD} ug-s ${PREFIX}/bin/wwsympa.fcgi
.include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
PREFIX= ${LOCALBASE}/sympa
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index 395bd567e96..fe65cdb11d4 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/01/19 13:04:48 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/28 22:03:42 jlam Exp $
DISTNAME= teapop-0.3.5
CATEGORIES= mail
@@ -10,6 +10,7 @@ HOMEPAGE= http://www.toontown.org/teapop/
COMMENT= Yet another RFC1939 compliant POP3 server
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-flock
@@ -46,5 +47,4 @@ post-install:
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/etc/teapop.passwd ${EGDIR}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index c8a8bcdc4ed..5f23f1205c0 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2002/12/24 17:50:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2003/01/28 22:03:43 jlam Exp $
#
DISTNAME= pspp-0.3.0
@@ -20,6 +20,7 @@ COMMENT= Program for statistical analysis of sampled data
BUILD_USES_MSGFMT= yes
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -Dunix=1
CONFIGURE_ARGS= --sysconfdir="${PKG_SYSCONFDIR}"
@@ -33,5 +34,4 @@ CONF_FILES+= ${EGDIR}/ps-prologue ${PKG_SYSCONFDIR}/ps-prologue
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/udunits/Makefile b/math/udunits/Makefile
index cb5d8d00388..7114d508e20 100644
--- a/math/udunits/Makefile
+++ b/math/udunits/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/12/24 18:56:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:43 jlam Exp $
DISTNAME= udunits
PKGNAME= udunits-1.11.7
@@ -15,6 +15,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/src
DIST_SUBDIR= ${PKGNAME_NOREV}
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -Df2cFortran -Dunix
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/UDUNITS/.packlist
@@ -27,5 +28,4 @@ post-install:
${RM} -rf ${WRKSRC}/perl/blib/lib
.include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index d36ed608e95..2bd343228d6 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/01/20 10:03:54 skrll Exp $
+# $NetBSD: Makefile,v 1.15 2003/01/28 22:03:44 jlam Exp $
DISTNAME= kdeutils-3.0.5a
COMMENT= Utilities for the KDE integrated X11 desktop
@@ -6,6 +6,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop
.include "../../x11/kde3/Makefile.kde3"
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
# Ensure we export symbols in the linked shared object.
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
@@ -31,5 +32,4 @@ FOO_MAIN_FILES= \
.include "../../x11/kde3/buildlink2.mk"
.include "../../x11/kdebase3/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/libutf/Makefile b/misc/libutf/Makefile
index c6084a1e540..bc21ceb1619 100644
--- a/misc/libutf/Makefile
+++ b/misc/libutf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/12/23 08:03:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/28 22:03:44 jlam Exp $
#
DISTNAME= libutf-2.10
@@ -10,8 +10,9 @@ MAINTAINER= agc@netbsd.org
HOMEPAGE= http://www.westley.demon.co.uk/software.html
COMMENT= UTF-8 character set support library, including regular expressions
-GNU_CONFIGURE= # defined
-USE_LIBTOOL= # defined
+USE_PKGINSTALL= yes
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
ALL_TARGET= tst
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -19,5 +20,4 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/libutf
CONF_FILES= ${EGDIR}/langcoll.utf ${PKG_SYSCONFDIR}/langcoll.utf
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/qterm/Makefile b/misc/qterm/Makefile
index 482612fab70..d6f2226c0d8 100644
--- a/misc/qterm/Makefile
+++ b/misc/qterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/12/22 22:26:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:44 jlam Exp $
#
DISTNAME= qterm-ac-1.0
@@ -11,6 +11,7 @@ MAINTAINER= agc@netbsd.org
HOMEPAGE= http://www.westley.demon.co.uk/software.html
COMMENT= utility to recognise terminal type automatically
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -18,5 +19,4 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/qterm
CONF_FILES= ${EGDIR}/qtermtab ${PKG_SYSCONFDIR}/qtermtab
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index c71928e7e4f..1968349751b 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/12/28 08:48:09 tron Exp $
+# $NetBSD: Makefile,v 1.39 2003/01/28 22:03:45 jlam Exp $
DISTNAME= rpm-2.5.4
CATEGORIES= misc
@@ -13,6 +13,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS+= rpm2cpio<1.0nb1
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -35,5 +36,4 @@ pre-install:
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/zlib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 2bb147d7f38..da5fb03aa9b 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2002/12/25 16:59:58 grant Exp $
+# $NetBSD: Makefile,v 1.41 2003/01/28 22:03:46 jlam Exp $
DISTNAME= screen-3.9.13
CATEGORIES= misc
@@ -9,7 +9,8 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.gnu.org/software/screen/screen.html
COMMENT= Multi-screen window manager
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
INFO_FILES= screen.info
PLIST_SUBST= DISTNAME=${DISTNAME}
TEXINFO_OVERRIDE= YES
@@ -38,5 +39,4 @@ post-install:
.endif
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 7abb1228f48..fe9828fbbb4 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1132 2003/01/21 22:48:57 grant Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1133 2003/01/28 22:03:46 jlam Exp $
#
# This file is in the public domain.
#
@@ -941,6 +941,10 @@ NO_BUILDLINK= # defined
. include "../../mk/buildlink2/bsd.buildlink2.mk"
.endif
+.if defined(USE_PKGINSTALL) && !empty(USE_PKGINSTALL:M[yY][eE][sS])
+. include "../../mk/bsd.pkg.install.mk"
+.endif
+
.MAIN: all
# Use aliases, so that all versions of English are acceptable
diff --git a/net/arla/Makefile b/net/arla/Makefile
index 85a453a9903..555cacb9d29 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/01/14 12:00:08 wennmach Exp $
+# $NetBSD: Makefile,v 1.31 2003/01/28 22:03:48 jlam Exp $
DISTNAME= arla-0.35.12pre1
#PKGREVISION=
@@ -15,9 +15,10 @@ CONFLICTS+= rx-[0-9]*
OSVERSION_SPECIFIC= yes
INFO_FILES= arla.info
-USE_BUILDLINK2= # defined
-USE_X11= # defined
-GNU_CONFIGURE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_X11= yes
+GNU_CONFIGURE= yes
.if exists(/usr/lib/libroken.a)
CONFIGURE_ARGS+= --with-krb4-lib=/usr/lib
@@ -66,5 +67,4 @@ post-install:
${INSTALL_DATA} ${FILESDIR}/fstab ${EGDIR}
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index b93cf224ef8..cfc6dee0e9b 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,5 +1,5 @@
#
-# $NetBSD: Makefile,v 1.17 2002/12/07 21:35:10 cjep Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:48 jlam Exp $
#
# FreeBSD Id: Makefile,v 1.12 1999/06/28 21:25:07 billf Exp
#
@@ -21,6 +21,8 @@ BIND_VERSION= 8.3.4
DIST_SUBDIR= bind/${BIND_VERSION}
EXTRACT_ONLY= ${DISTNAME}-src.tar.gz ${DISTNAME}-doc.tar.gz
+USE_PKGINSTALL= yes
+
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Linux"
@@ -47,5 +49,4 @@ post-install:
(cd ${WRKDIR}/doc/html/; tar Bpcf - .) | (cd ${PREFIX}/share/doc/bind8; tar Bpxf -)
${INSTALL_SCRIPT} ${WRKDIR}/named.sh ${PREFIX}/etc/rc.d/named
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/bpalogin/Makefile b/net/bpalogin/Makefile
index 7f12e3f188a..70da9482d72 100644
--- a/net/bpalogin/Makefile
+++ b/net/bpalogin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/11/21 10:02:56 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:03:49 jlam Exp $
#
DISTNAME= bpalogin-2.0.1-src
@@ -15,6 +15,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
ALL_TARGET= bpalogin
+USE_PKGINSTALL= yes
CONF_FILES+= ${PREFIX}/share/examples/bpalogin/bpalogin.conf \
${PKG_SYSCONFDIR}/bpalogin.conf
RCD_SCRIPTS= bpalogin
@@ -25,5 +26,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/bpalogin.conf \
${PREFIX}/share/examples/bpalogin
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index fc784763bda..755cc720ac6 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/10/25 17:59:54 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:03:49 jlam Exp $
DISTNAME= chrony-1.17
CATEGORIES= net
@@ -9,6 +9,7 @@ HOMEPAGE= http://chrony.sunsite.dk/index.php
COMMENT= Daemon for maintaining the accuracy of computer clocks
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --prefix=${PREFIX}
@@ -32,5 +33,4 @@ post-install:
.include "../../devel/readline/buildlink2.mk"
.include "../../devel/ncurses/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index 184fb7a2e0b..4cc837cab12 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/09/18 21:15:13 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2003/01/28 22:03:49 jlam Exp $
PKGNAME= coda-client-${DIST_VERS}
COMMENT= client programs for a replicated high-performance network file system
@@ -8,6 +8,7 @@ COMMENT= client programs for a replicated high-performance network file system
ALL_TARGET= coda
INSTALL_TARGET= client-install
+USE_PKGINSTALL= yes
CONF_FILES+= ${EGDIR}/sidekick.intr.ex ${PKG_SYSCONFDIR}/sidekick.intr
CONF_FILES+= ${EGDIR}/venus.conf.ex ${PKG_SYSCONFDIR}/venus.conf
@@ -24,5 +25,4 @@ post-install:
-e "s|venus-au\.8|au.8|"`
${LN} -sf venus-au.8 ${PREFIX}/man/man8/au.8
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 427a68ce29d..9c1ade83e60 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2002/09/18 21:15:14 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2003/01/28 22:03:50 jlam Exp $
PKGNAME= coda-server-${DIST_VERS}
COMMENT= server programs for a replicated high-performance network file system
@@ -8,6 +8,7 @@ COMMENT= server programs for a replicated high-performance network file system
ALL_TARGET= coda
INSTALL_TARGET= server-install
+USE_PKGINSTALL= yes
CONF_FILES+= ${EGDIR}/server.conf.ex ${PKG_SYSCONFDIR}/server.conf
post-install:
@@ -19,5 +20,4 @@ post-install:
${SED} -e "s|^|usr/|" \
-e "s|vice-au\.8|au.8|"`
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index 7a77235170c..4115fc9ae06 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/09/19 09:04:15 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/28 22:03:50 jlam Exp $
DISTNAME= ddclient-3.6.2
CATEGORIES= net
@@ -9,6 +9,7 @@ HOMEPAGE= http://burry.ca:4141/ddclient/
COMMENT= Client to update dynamic DNS entries
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
DOCDIR= ${PREFIX}/share/doc/ddclient
EGDIR= ${PREFIX}/share/examples/ddclient
@@ -40,6 +41,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/sample-* ${EGDIR}
.include "../../lang/perl5/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index c20112d8c55..01726e2e46d 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/23 07:07:02 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:50 jlam Exp $
#
DISTNAME= dhid-4.0.1
@@ -11,6 +11,7 @@ COMMENT= Dynamic Host Information System client daemon
DEPENDS+= gmp-[0-9]*:../../devel/gmp
+USE_PKGINSTALL= yes
RCD_SCRIPTS= dhid
do-install:
@@ -23,5 +24,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/dhid
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dhid
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ipa/Makefile b/net/ipa/Makefile
index d7f117ae4b4..3afd26b3a28 100644
--- a/net/ipa/Makefile
+++ b/net/ipa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/01/09 17:38:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/28 22:03:51 jlam Exp $
DISTNAME= ipa-1.3
CATEGORIES= net sysutils
@@ -18,7 +18,8 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_PACKAGE= ${RESTRICTED}
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
ALL_TARGET= NetBSD
CFLAGS+= -DCFGFILE=\\\"${PKG_SYSCONFDIR}/ipa.conf\\\"
@@ -31,5 +32,4 @@ RCD_SCRIPTS= ipa
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ipa
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 4a7076c9822..ca0bf0cf92d 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/01/10 07:43:31 cjep Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:51 jlam Exp $
DISTNAME= samba-${SAMBA_BASE_VERSION}-ja-${SAMBA_JA_VERSION}
PKGNAME= ja-samba-${SAMBA_BASE_VERSION}.${SAMBA_JA_VERSION}
@@ -16,11 +16,12 @@ SAMBA_BASE_VERSION= 2.2.4
SAMBA_JA_VERSION= 1.0
CONFLICTS+= samba-[0-9]*
-GNU_CONFIGURE= # defined
-USE_LIBTOOL= # defined
+GNU_CONFIGURE= YES
+USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline
@@ -147,5 +148,4 @@ post-install:
.include "../../devel/readline/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 286591ba93e..6c722bc9de2 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/01/10 07:43:57 cjep Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:03:52 jlam Exp $
#
DISTNAME= jwhois-3.2.0
@@ -9,9 +9,10 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/jwhois/
COMMENT= Configurable WHOIS client
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --localstatedir=/var/db
CONFIGURE_ARGS+= --with-cache
@@ -26,7 +27,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/example/jwhois.conf ${PREFIX}/share/examples
.include "../../devel/gettext-lib/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index 04040b5aaee..28c4da2f4e9 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/13 13:33:57 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:52 jlam Exp $
DISTNAME= LambdaMOO-1.8.1
PKGNAME= lambdamoo-1.8.1
@@ -18,6 +18,7 @@ LAMBDAMOO_USER?= lambdamoo
LAMBDAMOO_GROUP?= lambdamoo
LAMBDAMOO_HOME?= ${PREFIX}/share/${LAMBDAMOO_USER}
+USE_PKGINSTALL= yes
PKG_GROUPS= ${LAMBDAMOO_GROUP}
PKG_USERS= ${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP}
_PKG_USER_HOME= ${LAMBDAMOO_HOME}
@@ -50,5 +51,4 @@ post-install:
${CHOWN} -R ${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP} ${LAMBDAMOO_HOME}
${CHMOD} u+w ${LAMBDAMOO_HOME}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 8e5ebba163b..a80fe472787 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/08/25 21:50:01 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/01/28 22:03:52 jlam Exp $
DISTNAME= lftp-2.5.2
CATEGORIES= net
@@ -14,6 +14,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-ssl=${SSLBASE} \
--sysconfdir=${PKG_SYSCONFDIR}
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
@@ -35,5 +36,4 @@ post-install:
.include "../../devel/readline/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 1975410a5b0..f5e5269b27a 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/24 09:34:07 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:03:53 jlam Exp $
DISTNAME= net-snmp-5.0.6
CATEGORIES= net
@@ -21,15 +21,16 @@ NET_SNMP_LOGFILE?= /var/log/snmpd.log
NET_SNMP_PERSISTENTDIR?= /var/net-snmp
NET_SNMP_MIBDIRS?= \$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs
-USE_BUILDLINK2= # defined
-USE_LIBTOOL= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.if (${OPSYS} == "NetBSD")
CFLAGS+= -Dnetbsd1
.endif
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared
.if defined(USE_INET6) && (${USE_INET6} == "YES")
CONFIGURE_ARGS+= --enable-ipv6
@@ -95,5 +96,4 @@ post-install:
.include "../../security/openssl/buildlink2.mk"
.include "../../security/tcp_wrappers/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index a21c27eda96..5d5eb8f028e 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/09/30 09:25:22 abs Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/28 22:03:53 jlam Exp $
DISTNAME= netatalk-1.5.5
CATEGORIES= net print
@@ -10,6 +10,7 @@ HOMEPAGE= http://sourceforge.net/projects/netatalk/
COMMENT= Netatalk appletalk file and print services
GNU_CONFIGURE= YES
+USE_PKGINSTALL= YES
USE_GMAKE= YES
USE_PERL5= YES
USE_LIBTOOL= YES
@@ -39,5 +40,4 @@ pre-install:
${PREFIX}/share/examples/netatalk/
.endfor
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/netsaint-base/Makefile b/net/netsaint-base/Makefile
index 2c7ec9edac8..e51a14f3c11 100644
--- a/net/netsaint-base/Makefile
+++ b/net/netsaint-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/08/25 21:50:06 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/28 22:03:54 jlam Exp $
#
DISTNAME= netsaint-0.0.7
@@ -10,7 +10,8 @@ MAINTAINER= murray@river-styx.org
HOMEPAGE= http://www.netsaint.org/
COMMENT= network monitor
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
.include "../../net/netsaint-base/Makefile.common"
@@ -34,6 +35,4 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/sblogo.gif ${PREFIX}/share/netsaint/images
.include "../../graphics/gd/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 42225b0c6e8..c7614b8d950 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/12/23 15:05:34 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:03:54 jlam Exp $
#
DISTNAME= openh323_1.10.4
@@ -20,6 +20,7 @@ WRKSRC= ${WRKDIR}/openh323
MAKE_ENV+= PWLIBDIR=${PREFIX} OPENH323DIR=${WRKSRC}
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
ALL_TARGET= opt
@@ -46,5 +47,4 @@ do-install:
.include "../../devel/pwlib/buildlink2.mk"
.include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 8190c895d1f..cc045c89e9e 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/12/19 20:33:21 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:54 jlam Exp $
DISTNAME= openslp-1.0.10
CATEGORIES= net
@@ -9,6 +9,7 @@ HOMEPAGE= http://www.openslp.org/
COMMENT= Open-source implementation of the Service Location Protocol
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --localstatedir=/var
@@ -42,5 +43,4 @@ post-install:
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR} ${HTMLDIR}
${CHMOD} -R a+rx,a-w ${DOCDIR} ${HTMLDIR}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/pureftpd/Makefile b/net/pureftpd/Makefile
index ead2b1c98e7..568afc07e6b 100644
--- a/net/pureftpd/Makefile
+++ b/net/pureftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/01/16 09:14:51 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/28 22:03:55 jlam Exp $
#
DISTNAME= pure-ftpd-1.0.12
@@ -10,6 +10,7 @@ MAINTAINER= dawszy@arhea.net
HOMEPAGE= http://www.pureftpd.org/
COMMENT= FTP daemon with optional SQL support
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-sysquotas \
@@ -26,5 +27,4 @@ BUILD_DEFS+= PURE_FTPD_USE_MYSQL
RCD_SCRIPTS= pure_ftpd
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 0c6d9d33a09..9be73d9ff5f 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/01/16 09:27:59 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/01/28 22:03:55 jlam Exp $
DISTNAME= rp-pppoe-3.5
CATEGORIES= net
@@ -11,6 +11,7 @@ COMMENT= Roaring Penguin's PPP over Ethernet client
CONFLICTS+= mouse_pppoe<20000912nb1
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PPPD=${PPPD}
@@ -24,5 +25,4 @@ post-install:
${INSTALL_DATA} pppoe.conf pppoe-server-options \
${PREFIX}/share/examples/rp-pppoe
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 007e2248786..7d1bfd1e383 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2002/11/21 08:09:07 martti Exp $
+# $NetBSD: Makefile,v 1.93 2003/01/28 22:03:55 jlam Exp $
.include "Makefile.common"
@@ -6,7 +6,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.samba.org/
COMMENT= SMB/CIFS protocol server suite for UNIX
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline
CONFIGURE_ARGS+= --with-readline
@@ -90,5 +91,4 @@ post-install:
.include "../../devel/readline/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index 9a3b05e9a2a..23f41de292f 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/19 09:04:18 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:56 jlam Exp $
DISTNAME= samba-2.0.10
WRKSRC= ${WRKDIR}/${DISTNAME}/source
@@ -11,9 +11,10 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.samba.org/
COMMENT= SMB/CIFS protocol server suite for UNIX
-BUILD_USES_MSGFMT= # defined
-GNU_CONFIGURE= # defined
-USE_BUILDLINK2= # defined
+BUILD_USES_MSGFMT= yes
+GNU_CONFIGURE= yes
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
.include "../../mk/bsd.prefs.mk"
@@ -91,5 +92,4 @@ post-install:
.include "../../devel/readline/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 0fa3376e526..42031188e97 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/10/02 13:27:11 grant Exp $
+# $NetBSD: Makefile,v 1.26 2003/01/28 22:03:56 jlam Exp $
# FreeBSD Id: Makefile,v 1.14 1997/08/28 06:49:06 obrien Exp
#
@@ -29,6 +29,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
# --with-passwd
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libconffile=${PREFIX}/etc/libsocks5.conf \
--with-srvconffile=${PREFIX}/etc/socks5.conf \
@@ -44,5 +45,4 @@ post-install:
${LN} -sf libsocks5_sh.so.0.0 ${PREFIX}/lib/libsocks5_sh.so.0
${LN} -sf libsocks5_sh.so.0.0 ${PREFIX}/lib/libsocks5_sh.so
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile
index 1981eb247fd..8848a15143b 100644
--- a/net/speedtouch/Makefile
+++ b/net/speedtouch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/09/19 09:04:19 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:56 jlam Exp $
#
DISTNAME= speedtouch-1.1
@@ -13,6 +13,7 @@ COMMENT= Alcatel SpeedTouch USB ADSL modem driver
DEPENDS+= userppp-001107:../../net/userppp
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
RCD_SCRIPTS= adsl
@@ -20,5 +21,4 @@ RCD_SCRIPTS= adsl
post-install:
${INSTALL_DATA} ${WRKDIR}/mgmt/mgmt.o ${PREFIX}/libdata/alcaudsl.sys
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/tspc/Makefile b/net/tspc/Makefile
index 6fd0794f6dd..e11be87a7eb 100644
--- a/net/tspc/Makefile
+++ b/net/tspc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/22 18:14:51 grant Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/28 22:03:57 jlam Exp $
#
DISTNAME= freenet6-0.9.6
@@ -11,6 +11,7 @@ MAINTAINER= grant@netbsd.org
HOMEPAGE= http://www.freenet6.net/
COMMENT= freenet6 IPv6 tunnel server protocol client
+USE_PKGINSTALL= yes
NO_CONFIGURE= yes
INTERACTIVE_STAGE= fetch
ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* SunOS-5.[8-9]-*
@@ -63,5 +64,4 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/template/${template} ${PREFIX}/share/tspc/template
.endfor
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/userppp/Makefile b/net/userppp/Makefile
index 19de1a15dec..1fd09784e6b 100644
--- a/net/userppp/Makefile
+++ b/net/userppp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/08/12 12:14:40 agc Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/28 22:03:57 jlam Exp $
DISTNAME= ppp-001107.src
PKGNAME= userppp-001107
@@ -27,7 +27,7 @@ post-patch:
USERPPP_GROUP?= network
BUILD_DEFS+= USERPPP_GROUP
+USE_PKGINSTALL= yes
PKG_GROUPS= ${USERPPP_GROUP}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 201c31e7eeb..e0adacf2388 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/08/25 21:50:18 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/01/28 22:03:57 jlam Exp $
DISTNAME= vtun-2.5
CATEGORIES= net
@@ -9,6 +9,7 @@ HOMEPAGE= http://vtun.sourceforge.net/
COMMENT= Virtual Tunnels over TCP/IP networks with traffic shaping
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -52,5 +53,4 @@ do-install:
.include "../../devel/zlib/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/wget/Makefile b/net/wget/Makefile
index 815d9b613ad..cec0f3546db 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2002/12/17 15:57:31 tron Exp $
+# $NetBSD: Makefile,v 1.57 2003/01/28 22:03:57 jlam Exp $
DISTNAME= wget-1.8.2
CATEGORIES= net
@@ -12,6 +12,7 @@ USE_PERL5= build
BUILD_USES_MSGFMT= YES
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -35,7 +36,5 @@ CONFIGURE_ARGS+=--with-ssl=${SSLBASE}
CONFIGURE_ARGS+=--with-ssl=${SSLBASE}
.include "../../devel/gettext-lib/buildlink2.mk"
-
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile
index 63fae7f0177..c8813f4ca96 100644
--- a/net/ytalk/Makefile
+++ b/net/ytalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/12/22 19:39:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:58 jlam Exp $
DISTNAME= ytalk-3.1.1
PKGREVISION= 1
@@ -11,11 +11,11 @@ COMMENT= Multi-user replacement for UNIX talk
GNU_CONFIGURE= yes
USE_X11= yes
+USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/ytalk
CONF_FILES= ${EGDIR}/ytalkrc ${PKG_SYSCONFDIR}/ytalkrc
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 9b1ffdf135e..b8369564039 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2002/10/13 07:57:43 tron Exp $
+# $NetBSD: Makefile,v 1.40 2003/01/28 22:03:58 jlam Exp $
DISTNAME= inn-2.3.3
CATEGORIES= news
@@ -22,6 +22,7 @@ BUILD_DEFS+= INN_DATA_DIR
FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR}
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
GNU_CONFIGURE_PREFIX= ${PREFIX}/inn
CONFIGURE_ARGS+= --enable-setgid-inews \
@@ -111,5 +112,4 @@ post-install:
done
.include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/news/nntpclnt/Makefile b/news/nntpclnt/Makefile
index 56947048ea0..52686f09660 100644
--- a/news/nntpclnt/Makefile
+++ b/news/nntpclnt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/09/18 21:16:24 tron Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:59 jlam Exp $
DISTNAME= nntpclnt-1.6.1
PKGREVISION= 3
@@ -17,6 +17,7 @@ NO_BIN_ON_CDROM=${RESTRICTED}
ALL_TARGET= inews
PKG_GROUPS= news
+USE_PKGINSTALL= yes
.include "../../mk/bsd.prefs.mk"
@@ -38,6 +39,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/nntpclnt.3 ${PREFIX}/man/man3/
${INSTALL_DATA_DIR} ${PREFIX}/etc/nntp
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
-
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 6c3144faff2..ddb7bb08ea3 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/01/10 07:45:23 cjep Exp $
+# $NetBSD: Makefile,v 1.40 2003/01/28 22:03:59 jlam Exp $
DISTNAME= a2ps-4.13b
PKGNAME= a2ps-4.13.0.2
@@ -22,6 +22,7 @@ USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/auxdir/ltconfig
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV+= LPR=lpr
@@ -41,5 +42,4 @@ pre-build:
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 393ceeea46e..3750b739bad 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/11/26 11:26:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:59 jlam Exp $
#
DISTNAME= apsfilter-7.2.2
@@ -22,6 +22,7 @@ WRKSRC= ${WRKDIR}/apsfilter
HAS_CONFIGURE= YES
USE_BZIP2= YES
+USE_PKGINSTALL= YES
CONFIGURE_ARGS+=--prefix=${LOCALBASE}
CONFIGURE_ARGS+=--with-shell=${SH}
@@ -47,5 +48,4 @@ post-patch:
# > ${DEINSTALL_FILE}
.include "../../mk/ghostscript.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 33b76fc3f10..68fda42f1d7 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/01/11 10:02:03 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/28 22:04:00 jlam Exp $
DISTNAME= auctex-11.13
CATEGORIES= print
@@ -10,7 +10,8 @@ COMMENT= Enhanced LaTeX mode for Emacs
DEPENDS+= teTeX-[0-9]*:../../print/teTeX
-USE_GMAKE= #defined
+USE_GMAKE= yes
+USE_PKGINSTALL= yes
TEX_PREFIX_DEFAULT= ${LOCALBASE}
EVAL_PREFIX+= TEX_PREFIX=teTeX
@@ -59,5 +60,4 @@ do-install:
.include "../../mk/emacs.mk"
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 5764848b583..f856e575bad 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2003/01/23 23:05:10 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2003/01/28 22:04:00 jlam Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -26,11 +26,12 @@ COMMENT= Common UNIX Printing System
CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
-USE_BUILDLINK2= # defined
-USE_PKGLOCALEDIR= # defined
-USE_GMAKE= # defined
-USE_LIBTOOL= # defined
-GNU_CONFIGURE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_PKGLOCALEDIR= yes
+USE_GMAKE= yes
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
UNLIMIT_RESOURCES= datasize memorysize
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
CONFIGURE_ARGS+= --localstatedir=/var
@@ -131,5 +132,4 @@ post-install:
.include "../../security/openssl/buildlink2.mk"
.include "../../mk/autoconf.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
index a33853ab8fd..4042e7477f5 100644
--- a/print/ghostscript-esp/Makefile.common
+++ b/print/ghostscript-esp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2002/10/24 20:08:22 bouyer Exp $
+# $NetBSD: Makefile.common,v 1.4 2003/01/28 22:04:01 jlam Exp $
DISTNAME= espgs-${GS_VERS}-source
BASEGS_VERS= 7.05
@@ -22,9 +22,10 @@ CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]*
DEPENDS+= ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
-USE_BUILDLINK2= # defined
-USE_GMAKE= # defined
-GNU_CONFIGURE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ijs
CONFIGURE_ARGS+= --with-gimp-print
CONFIGURE_ARGS+= --without-omni
@@ -93,7 +94,6 @@ post-install:
.include "../../print/cups/buildlink2.mk"
.include "../../print/gimp-print-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32"
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index 3509cc5704b..9ad5d9ced9b 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/01/19 08:45:38 salo Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:04:01 jlam Exp $
#
DISTNAME= pnm2ppa-1.04
@@ -10,6 +10,7 @@ MAINTAINER= kei@netbsd.org
HOMEPAGE= http://pnm2ppa.sourceforge.net/
COMMENT= filter to convert PNM file to PPA used by some HP DJ printer
+USE_PKGINSTALL= yes
CONF_FILES+= ${PREFIX}/share/examples/pnm2ppa/pnm2ppa.conf.default \
${PKG_SYSCONFDIR}/pnm2ppa.conf
@@ -30,5 +31,4 @@ post-install:
${INSTALL_DATA} docs/en/CALIBRATION.txt docs/en/COLOR.txt \
${PREFIX}/share/doc/pnm2ppa
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index af3ec3fd17f..e4162076704 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/11/26 10:13:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:04:01 jlam Exp $
# FreeBSD Id: Makefile,v 1.15 1998/01/08 18:52:13 fenner Exp
#
@@ -16,6 +16,7 @@ DEPENDS+= papersize-[0-9]*:../../print/papersize
WRKSRC= ${WRKDIR}/psutils
USE_PERL5= yes
+USE_PKGINSTALL= yes
.include "../../mk/bsd.prefs.mk"
@@ -57,5 +58,4 @@ post-install:
low=`${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'`; \
${ECHO} "PAPERSIZE=$$low" > ${EGDIR}/psutils.cfg;
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile
index dd8edf0b68c..88a33d38839 100644
--- a/print/teTeX-bin/Makefile
+++ b/print/teTeX-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/11/19 02:47:19 mrg Exp $
+# $NetBSD: Makefile,v 1.39 2003/01/28 22:04:02 jlam Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
#
@@ -24,6 +24,7 @@ ALL_TARGET= all
INSTALL_TARGET= install strip
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_GMAKE= yes
USE_X11= yes
CFLAGS+= -Dunix
@@ -80,5 +81,4 @@ post-install:
.include "../../www/libwww/buildlink2.mk"
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index ab1a677990d..721b7fe829d 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/12/31 02:31:53 uebayasi Exp $
+# $NetBSD: Makefile,v 1.16 2003/01/28 22:04:03 jlam Exp $
#
DISTNAME= xpdf-2.01
@@ -20,6 +20,7 @@ DEPENDS+= ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts
CONFLICTS= xpdf-crypto-[0-9]*
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_X11BASE= YES
GNU_CONFIGURE= YES
@@ -43,7 +44,6 @@ CONF_FILES= ${EGDIR}/xpdfrc ${PKG_SYSCONFDIR}/xpdfrc
.include "../../graphics/xpm/buildlink2.mk"
.include "../../mk/motif.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
.if !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel)
diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index 199e4b0389a..59ca046b3a9 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/12/23 21:23:56 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:04:03 jlam Exp $
#
DISTNAME= Linux-${PKGNAME}
@@ -12,6 +12,7 @@ HOMEPAGE= http://www.kernel.org/pub/linux/libs/pam/
COMMENT= Pluggable Authentication Modules
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_GMAKE= yes
USE_DB185= yes
@@ -55,5 +56,4 @@ post-install:
.include "../../databases/db/buildlink2.mk"
.include "../../security/libcrack/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 417ed99ef88..bb008470eb5 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2002/12/16 10:55:03 martti Exp $
+# $NetBSD: Makefile,v 1.38 2003/01/28 22:04:04 jlam Exp $
DISTNAME= cyrus-sasl-1.5.27
SVR4_PKGNAME= csasl
@@ -12,6 +12,7 @@ HOMEPAGE= http://asg.web.cmu.edu/sasl/
COMMENT= Simple Authentication and Security Layer
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_LIBTOOL= YES
@@ -85,6 +86,4 @@ post-install:
cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
.include "../../security/openssl/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 2e91254a548..b4d48e69d7a 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/12/11 23:48:58 chris Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/28 22:04:04 jlam Exp $
DISTNAME= cyrus-sasl-2.1.10
SVR4_PKGNAME= csasl
@@ -11,6 +11,7 @@ HOMEPAGE= http://asg.web.cmu.edu/sasl/
COMMENT= Simple Authentication and Security Layer
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig
@@ -97,5 +98,4 @@ post-install:
cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index 096376f3be6..1dcbeec7ae7 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/12/07 02:39:03 schmonz Exp $
+# $NetBSD: Makefile,v 1.25 2003/01/28 22:04:05 jlam Exp $
#
DISTNAME= isakmpd-20021118
@@ -15,6 +15,7 @@ PKG_FAIL_REASON+= "${PKGNAME} requires ipsec-ready ${OPSYS}"
ALL_TARGET= depend all
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
WRKSRC= ${WRKDIR}/isakmpd
@@ -41,5 +42,4 @@ post-install:
${INSTALL_SCRIPT} ${WRKDIR}/isakmpd.sh ${PREFIX}/etc/rc.d/isakmpd
.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/mirrordir/Makefile b/security/mirrordir/Makefile
index 7a91ba85904..f952db943de 100644
--- a/security/mirrordir/Makefile
+++ b/security/mirrordir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/12/19 14:44:07 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/28 22:04:05 jlam Exp $
#
DISTNAME= mirrordir-0.10.49
@@ -9,6 +9,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://mirrordir.sourceforge.net/
COMMENT= directory mirroring tool
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
@@ -17,5 +18,4 @@ EGDIR= ${PREFIX}/share/examples/mirrordir
CONF_FILES= ${EGDIR}/secure-mcservusers ${PKG_SYSCONFDIR}/secure-mcservusers
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 908e1267854..60b8b6fa183 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2003/01/23 00:00:17 seb Exp $
+# $NetBSD: Makefile,v 1.94 2003/01/28 22:04:06 jlam Exp $
DISTNAME= openssh-3.5p1
PKGNAME= openssh-3.5.0.1
@@ -47,6 +47,7 @@ PLIST_SUBST+= MANDIR=${MANDIR}
PLIST_SUBST+= RCD_SCRIPTS_EGDIR=${RCD_SCRIPTS_EGDIR}
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --mandir=${PREFIX}/${MANDIR}
@@ -143,5 +144,4 @@ post-install:
.include "../../security/openssl/buildlink2.mk"
.include "../../security/tcp_wrappers/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index b6d3999662a..9e53d5c7b3c 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2003/01/23 02:23:21 grant Exp $
+# $NetBSD: Makefile,v 1.65 2003/01/28 22:04:07 jlam Exp $
DISTNAME= openssl-0.9.6g
SVR4_PKGNAME= ossl
@@ -20,6 +20,7 @@ CRYPTO= YES
LICENCE= fee-based-commercial-use
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
CONFIGURE_SCRIPT= config
CONFIGURE_ARGS= shared --openssldir=${PKG_SYSCONFDIR} --prefix=${PREFIX}
CONFIGURE_ENV= CC="${CC}" PERL="${PERL5}"
@@ -87,5 +88,4 @@ CONFIGURE_SCRIPT= Configure
CONFIGURE_ARGS+= solaris-${SPARC_TARGET_ARCH}-${CC:C|.*/||}
.endif
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 51aa2afc0c1..1b74d40e53b 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/19 09:04:25 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:04:07 jlam Exp $
DISTNAME= pks-0.9.4
CATEGORIES= security www
@@ -16,6 +16,7 @@ HOMEPAGE= http://www.mit.edu/people/marc/pks/
COMMENT= PGP Public Key Server
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/pks
CONFIGURE_ARGS+= --localstatedir=/var/pks
@@ -32,6 +33,4 @@ RCD_SCRIPTS= pksd
OWN_DIRS= /var/pks /var/pks/db /var/pks/incoming
.include "../../databases/db/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 9b892caec60..382c996662d 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/01/12 15:15:51 seb Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:04:08 jlam Exp $
#
DISTNAME= ssh-3.2.2
@@ -13,6 +13,7 @@ COMMENT= Secure Shell client and server for V.2 SSH protocol
CONFLICTS= openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]*
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_X11= YES
GNU_CONFIGURE= YES
@@ -80,5 +81,4 @@ post-install:
.endfor
.include "../../security/tcp_wrappers/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 56c55c9366b..44b3cc357aa 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2002/12/25 12:26:46 grant Exp $
+# $NetBSD: Makefile,v 1.53 2003/01/28 22:04:08 jlam Exp $
#
DISTNAME= sudo-1.6.6
@@ -14,8 +14,9 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.courtesan.com/sudo/
COMMENT= Allow others to run commands as root
-USE_BUILDLINK2= # defined
-GNU_CONFIGURE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
@@ -49,5 +50,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/sudoers ${EGDIR}/sudoers
${INSTALL_DATA} ${WRKSRC}/sample.sudoers ${EGDIR}/sudoers.sample
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 401a962d3ab..571a46bda82 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/09/18 21:15:18 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/01/28 22:04:08 jlam Exp $
DISTNAME= vlnx416e
PKGNAME= uvscan-4.16.0
@@ -31,6 +31,7 @@ DATDIR= ${PREFIX}/share/uvscan
UVSCANDIR= ${PREFIX}/libexec/uvscan
DATFILES= clean.dat internet.dat names.dat scan.dat readme.txt
+USE_PKGINSTALL= yes
FILES_SUBST+= UVSCANDIR=${UVSCANDIR:Q}
FILES_SUBST+= DATFILES=${DATFILES:Q}
@@ -74,5 +75,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \
done
-.include "../../mk/bsd.pkg.install.mk"
.include "../../emulators/suse_linux/Makefile.application"
diff --git a/security/winbind/Makefile b/security/winbind/Makefile
index 017cee8f250..6088030c45e 100644
--- a/security/winbind/Makefile
+++ b/security/winbind/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2002/10/09 21:52:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:04:09 jlam Exp $
PKGNAME= winbind-${SAMBA_DIST_VERS}
CATEGORIES= security
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
.include "../../net/samba/Makefile.common"
@@ -38,5 +39,4 @@ do-install:
.include "../../security/PAM/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/xdm-krb4/Makefile b/security/xdm-krb4/Makefile
index aa0f1b476cc..67e9f14df6a 100644
--- a/security/xdm-krb4/Makefile
+++ b/security/xdm-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/09/26 23:59:00 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:04:09 jlam Exp $
#
DISTNAME= xdm-krb4-3.3.6.3
@@ -8,8 +8,9 @@ MASTER_SITES= ftp://gutemine.geo.Uni-Koeln.DE/pub/xdm-krb4/
MAINTAINER= wennmach@netbsd.org
COMMENT= Kerberos IV and AFS aware xdm
-USE_BUILDLINK2= # defined
-USE_IMAKE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_IMAKE= yes
.if exists(/usr/lib/libroken.a)
KRB4_INCLUDE= -I/usr/include/kerberosIV
@@ -41,5 +42,4 @@ post-patch:
pre-install:
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/ast-ksh/Makefile b/shells/ast-ksh/Makefile
index c045487fc17..9dce1d62781 100644
--- a/shells/ast-ksh/Makefile
+++ b/shells/ast-ksh/Makefile
@@ -1,5 +1,5 @@
# $OpenBSD: Makefile,v 1.5 2001/11/21 01:17:43 naddy Exp $
-# $NetBSD: Makefile,v 1.5 2003/01/08 07:04:13 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:04:10 jlam Exp $
DISTNAME= ast-ksh-${ASTKSH_VERSION}
PKGNAME= ast-ksh-${ASTKSH_VERSION:S/-//g}
@@ -23,6 +23,7 @@ ONLY_FOR_PLATFORM= NetBSD-*
ASTKSH_VERSION= 2002-12-21
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
WRKSRC= ${WRKDIR}
MAKE_FLAGS= CC="${CC}" CCFLAGS="${CFLAGS}"
@@ -55,5 +56,4 @@ do-test:
# @cd ${WRKSRC}; \
# ${SETENV} SHELL=${PDKSH} ${PDKSH} ./bin/package test
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index a9b5bcc6be8..71d0a381a46 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2002/12/22 19:04:08 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2003/01/28 22:04:10 jlam Exp $
#
DISTNAME= bash-2.05b
@@ -11,8 +11,9 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/bash/bash.html
COMMENT= The GNU Bourne Again Shell
-USE_BUILDLINK2= # defined
-GNU_CONFIGURE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+GNU_CONFIGURE= yes
MAKE_ENV+= INSTALL_SCRIPT='${INSTALL_SCRIPT}'
PKG_SHELL= ${PREFIX}/bin/bash
@@ -30,5 +31,4 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${PREFIX}/man/man1
.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/es/Makefile b/shells/es/Makefile
index 3b5f439e88c..aa578a12dac 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/11/17 09:02:00 salo Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/28 22:04:10 jlam Exp $
# FreeBSD Id: Makefile,v 1.4 1996/11/18 11:39:46 asami Exp
#
@@ -13,7 +13,7 @@ COMMENT= Extensible shell, derived from plan9's rc
MANCOMPRESSED= yes
+USE_PKGINSTALL= yes
PKG_SHELL= ${PREFIX}/bin/es
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 2ead43facf1..86ad37dab54 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/11/17 09:02:00 salo Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:04:11 jlam Exp $
DISTNAME= esh-0.8
CATEGORIES= shells
@@ -10,6 +10,7 @@ COMMENT= Unix shell with Lisp-like syntax
WRKSRC= ${WRKDIR}/esh
INFO_FILES= esh.info
+USE_PKGINSTALL= yes
PKG_SHELL= ${PREFIX}/bin/esh
do-install:
@@ -26,5 +27,4 @@ do-install:
${PREFIX}/share/doc/esh/
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index 58075ebe5de..ac0d4524585 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/11/17 09:02:01 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:11 jlam Exp $
# FreeBSD Id: ports/shells/osh/Makefile,v 1.3 2002/01/29 11:58:43 knu Exp
DISTNAME= osh-020214
@@ -10,7 +10,7 @@ COMMENT= Implementation of the UNIX 6th Edition shell
MAKEFILE= makefile
+USE_PKGINSTALL= yes
PKG_SHELL= ${PREFIX}/bin/osh
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index 1dcc0938e67..0d6ac09c08c 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/11/28 07:42:05 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:12 jlam Exp $
#
DISTNAME= pdksh-5.2.14
@@ -16,9 +16,9 @@ USE_BUILDLINK2= no
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=pd
+USE_PKGINSTALL= yes
PKG_SHELL= ${PREFIX}/bin/pdksh
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
LDFLAGS= # empty
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index 95de4cf25db..9567a026eda 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/11/17 09:02:01 salo Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/28 22:04:12 jlam Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:38 obrien Exp
#
@@ -13,7 +13,7 @@ COMMENT= Unix incarnation of the plan9 shell
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-history
+USE_PKGINSTALL= yes
PKG_SHELL= ${PREFIX}/bin/rc
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index 1b3c0b318ed..60261a6044a 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/01/19 09:12:06 salo Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/28 22:04:12 jlam Exp $
# FreeBSD Id: Makefile,v 1.4 1997/07/15 15:00:30 cracauer Exp
#
@@ -16,6 +16,7 @@ GNU_CONFIGURE= yes
ALL_TARGET= enough
+USE_PKGINSTALL= yes
PKG_SHELL= ${PREFIX}/bin/scsh
post-configure:
@@ -28,5 +29,4 @@ post-install:
${RM} -f ${PREFIX}/share/doc/scsh
${LN} -fs ${PREFIX}/lib/scsh/doc ${PREFIX}/share/doc/scsh
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index a79422cdcb8..a62f786ea13 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2002/11/17 09:02:01 salo Exp $
+# $NetBSD: Makefile,v 1.41 2003/01/28 22:04:13 jlam Exp $
#
DISTNAME= tcsh-6.12.00
@@ -13,6 +13,7 @@ HOMEPAGE= http://www.tcsh.org/
COMMENT= Extended C-shell with many useful features
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
ALL_TARGET= all catalogs
INSTALL_TARGET= install install.man
@@ -75,5 +76,4 @@ post-install:
done; \
done
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 66096deb700..8201e5e42cc 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2002/11/17 09:02:02 salo Exp $
+# $NetBSD: Makefile,v 1.37 2003/01/28 22:04:13 jlam Exp $
DISTNAME= zsh-4.0.6
CATEGORIES= shells
@@ -14,6 +14,7 @@ HOMEPAGE= http://sunsite.dk/zsh/
COMMENT= The Z shell
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
INFO_FILES= zsh.info
TEXINFO_OVERRIDE= yes
@@ -43,5 +44,4 @@ post-install:
${PREFIX}/share/doc/zsh
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh3/Makefile b/shells/zsh3/Makefile
index c7e07046ec4..186e2fc7beb 100644
--- a/shells/zsh3/Makefile
+++ b/shells/zsh3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/12/23 13:03:39 seb Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:04:14 jlam Exp $
DISTNAME= zsh-3.0.8
CATEGORIES= shells
@@ -16,6 +16,7 @@ GNU_CONFIGURE= yes
INFO_FILES= zsh.info
TEXINFO_OVERRIDE= YES
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
.include "../../mk/bsd.prefs.mk"
@@ -25,6 +26,5 @@ LDFLAGS+= -static
PKG_SHELL= ${PREFIX}/bin/zsh
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 2f92955e696..2ac8aa5e753 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/08/25 21:50:53 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2003/01/28 22:04:14 jlam Exp $
# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
#
@@ -13,6 +13,7 @@ HOMEPAGE= http://www.amanda.org/
COMMENT= Libraries and binaries used by both the client and server parts of amanda
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
.include "../../mk/bsd.prefs.mk"
.include "../../sysutils/amanda-common/Makefile.common"
@@ -39,5 +40,4 @@ PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\\ user::${SH}
OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700
OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0700
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-dev-common/Makefile b/sysutils/amanda-dev-common/Makefile
index a5b565a6926..4cc0c16f03f 100644
--- a/sysutils/amanda-dev-common/Makefile
+++ b/sysutils/amanda-dev-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/08/25 21:50:54 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:15 jlam Exp $
# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
#
@@ -8,6 +8,7 @@ SVR4_PKGNAME= amaco
COMMENT= Libraries and binaries used by both the client and server parts of amanda
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
.include "../../mk/bsd.prefs.mk"
.include "../../sysutils/amanda-dev-common/Makefile.common"
@@ -34,5 +35,4 @@ PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\\ user::${SH}
OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700
OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0700
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 37065017a74..916d442bd75 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/12/23 16:31:29 cjep Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/28 22:04:15 jlam Exp $
DISTNAME= apcupsd-3.8.5
CATEGORIES= sysutils
@@ -10,10 +10,11 @@ COMMENT= UPS power management for APCC Products
BUILD_USES_MSGFMT= yes
-USE_BUILDLINK2= # defined
-USE_GMAKE= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_GMAKE= yes
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= yes
PKG_SYSCONFSUBDIR= apcupsd
@@ -106,6 +107,4 @@ post-install:
.endfor
.include "../../devel/gettext-lib/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gentoo/Makefile b/sysutils/gentoo/Makefile
index 5b98ce86255..f186006e77a 100644
--- a/sysutils/gentoo/Makefile
+++ b/sysutils/gentoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/12/07 10:12:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/28 22:04:15 jlam Exp $
#
DISTNAME= gentoo-0.11.34
@@ -11,10 +11,11 @@ COMMENT= Two-pane filemanager using GTK+, 100% GUI configurable
BUILD_USES_MSGFMT= YES
-GNU_CONFIGURE= YES
-USE_BUILDLINK2= YES
+GNU_CONFIGURE= YES
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
-USE_X11= YES
+USE_X11= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -24,5 +25,5 @@ CONF_FILES+= ${EGDIR}/gentoogtkrc ${PKG_SYSCONFDIR}/gentoogtkrc
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/libirman/Makefile b/sysutils/libirman/Makefile
index 0bef5b864ab..785715358a3 100644
--- a/sysutils/libirman/Makefile
+++ b/sysutils/libirman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/09/26 02:03:58 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/28 22:04:18 jlam Exp $
#
DISTNAME= libirman-0.4.1b
@@ -11,7 +11,8 @@ MAINTAINER= abs@netbsd.org
HOMEPAGE= http://www.evation.com/libirman/libirman.html
COMMENT= Programming library for Irman - infrared control
-GNU_CONFIGURE= YES
+USE_PKGINSTALL= YES
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples
@@ -35,5 +36,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/libirman.README \
${PREFIX}/share/doc/libirman.README
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-base/Makefile b/sysutils/rox-base/Makefile
index 408d47d0504..932cb54a188 100644
--- a/sysutils/rox-base/Makefile
+++ b/sysutils/rox-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/05 10:01:00 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:04:18 jlam Exp $
#
DISTNAME= rox-base-1.0.2
@@ -14,6 +14,7 @@ COMMENT= Shared ROX resources
DIST_SUBDIR= rox
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
NO_CONFIGURE= yes
NO_BUILD= yes
@@ -28,5 +29,4 @@ do-install:
${CP} -Rf ${WRKSRC}/Choices ${PREFIX}/share/rox
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/rox
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sysbuild/Makefile b/sysutils/sysbuild/Makefile
index 231924508ce..54f760290bd 100644
--- a/sysutils/sysbuild/Makefile
+++ b/sysutils/sysbuild/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/01/08 17:45:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:04:18 jlam Exp $
#
DISTNAME= sysbuild-1.9
@@ -35,6 +35,7 @@ FILES_SUBST+= SYSBUILD_SRCGROUP=${SYSBUILD_SRCGROUP}
FILES_SUBST+= EGDIR=${EGDIR}
MESSAGE_SUBST+= SYSBUILD_USER=${SYSBUILD_USER}
+USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
@@ -66,5 +67,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/crontab ${EGDIR}/crontab
${INSTALL_DATA} ${WRKSRC}/profile ${EGDIR}/profile
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index c652566c1b6..61e6b1d956e 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2002/12/17 12:03:01 lukem Exp $
+# $NetBSD: Makefile,v 1.23 2003/01/28 22:04:19 jlam Exp $
DISTNAME= nut-1.2.1
PKGREVISION= 1
@@ -16,6 +16,7 @@ ALL_TARGET= cgi
INSTALL_TARGET= install-cgi
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \
@@ -38,5 +39,4 @@ CONF_FILES+= ${NUT_EGDIR}/upsstats.html.sample \
${NUT_CONFDIR}/upsstats.html
.include "../../graphics/gd/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 5f7cb4822bb..f9e524d83b2 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/12/31 22:47:05 lukem Exp $
+# $NetBSD: Makefile,v 1.27 2003/01/28 22:04:19 jlam Exp $
#
DISTNAME= nut-1.2.1
@@ -12,6 +12,7 @@ HOMEPAGE= http://www.exploits.org/nut/
COMMENT= Network UPS Tools
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \
--with-user=${NUT_USER} \
@@ -71,5 +72,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables
${INSTALL_DATA} ${WRKSRC}/docs/drivers/*.txt ${NUT_DOCDIR}/drivers
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index bb7f51643ae..ca347c7682b 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/01/23 16:12:43 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/28 22:04:20 jlam Exp $
DISTNAME= xcdroast-0.98alpha13
PKGNAME= xcdroast-0.98a13
@@ -14,9 +14,10 @@ DEPENDS+= cdrecord-xcdroast-0.98a13.*:../cdrecord-xcdroast
.include "../../mk/bsd.prefs.mk"
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
.if ${_OPSYS_HAS_OSSAUDIO} == "yes"
@@ -43,5 +44,5 @@ post-install:
# gdk-pixbuf implies gtk, glib, gettext-lib
.include "../../graphics/gdk-pixbuf/buildlink2.mk"
.include "../../mk/ossaudio.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/chasen-base/Makefile b/textproc/chasen-base/Makefile
index b5250bd2de8..1aced81aedf 100644
--- a/textproc/chasen-base/Makefile
+++ b/textproc/chasen-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/08/25 21:51:12 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:20 jlam Exp $
#
DISTNAME= chasen-${CHASEN_VERSION}
@@ -14,13 +14,13 @@ MAINTAINER= tech-pkg-ja@jp.netbsd.org
HOMEPAGE= http://chasen.aist-nara.ac.jp/
COMMENT= ChaSen, Japanese Morphological Analysis System
-GNU_CONFIGURE= # defined
-USE_LIBTOOL= # defined
-USE_BUILDLINK2= # defined
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
OWN_DIRS= ${CHASEN_DICDIR}
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../chasen/Makefile.common"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ipadic/Makefile b/textproc/ipadic/Makefile
index d8eff7deaf6..3fab037cc80 100644
--- a/textproc/ipadic/Makefile
+++ b/textproc/ipadic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/25 13:20:13 taca Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:21 jlam Exp $
#
DISTNAME= ipadic-2.4.4
@@ -12,7 +12,8 @@ COMMENT= Japanese Morphological Dictionary for ChaSen
DEPENDS= chasen-base>=2.2.5:../../textproc/chasen-base
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= yes
+USE_PKGINSTALL= yes
CONF_FILES= ${CHASEN_DICDIR}/ipadic/chasenrc.example \
${CHASEN_CONFDIR}/chasenrc
@@ -21,6 +22,5 @@ post-install:
${CHASEN_DICDIR}/ipadic/chasenrc.example
.include "../../textproc/chasen/Makefile.common"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile
index ea1b933f9ad..0c7baecfccd 100644
--- a/textproc/ndtpd/Makefile
+++ b/textproc/ndtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/10/05 03:10:19 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:04:21 jlam Exp $
DISTNAME= ndtpd-3.1.1
PKGREVISION= 1
@@ -12,9 +12,10 @@ MAINTAINER= uebayasi@soum.co.jp
HOMEPAGE= http://www.sra.co.jp/people/m-kasahr/ndtpd/
COMMENT= Server for accessing CD-ROM books with NDTP
-USE_BUILDLINK2= # Defined
-USE_LIBTOOL= # Defined
-GNU_CONFIGURE= # Defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--localstatedir=${NDTPD_RUNDIR}
CONFIGURE_ARGS+=--with-logdir=${NDTPD_LOGDIR}
CONFIGURE_ARGS+=--with-eb
@@ -42,5 +43,4 @@ post-install:
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../textproc/eb/buildlink2.mk"
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index 2064667a93c..5eb749154cf 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/01/11 21:08:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:22 jlam Exp $
#
DISTNAME= xmlcatmgr-0.1
@@ -11,6 +11,7 @@ HOMEPAGE= http://www.sourceforge.net/projects/xmlcatmgr/
COMMENT= XML catalog manager
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
MAKEFILE= Makefile.boot
MAKE_ENV+= BT_PREFIX="${PREFIX}"
@@ -38,5 +39,4 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/catalog.sgml ${PREFIX}/share/sgml/catalog
${INSTALL_DATA} ${WRKDIR}/catalog.xml ${PREFIX}/share/xml/catalog
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index d0216076c25..d80d2424921 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/12/22 21:33:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:04:22 jlam Exp $
#
DISTNAME= ion-20010523
@@ -11,6 +11,7 @@ HOMEPAGE= http://www.students.tut.fi/~tuomov/ion/
COMMENT= keyboard friendly tiling window manager
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_X11BASE= YES
USE_GMAKE= YES
@@ -29,5 +30,4 @@ CONF_FILES+= ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
# PKG_SYSCONFSUBDIR we are currently using.
MAKE_ENV= PKG_SYSCONFBASE="${PKG_SYSCONFBASE}"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index b5c11b3e9a3..21c1594dee4 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:36 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:04:23 jlam Exp $
#
DISTNAME= pwm-1.0
@@ -10,6 +10,7 @@ HOMEPAGE= http://www.students.tut.fi/~tuomov/pwm/
COMMENT= Window manager that frames multiple client windows in a single frame
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_X11= YES
USE_GMAKE= YES
MAKE_ENV+= SYSCONFDIR="${PKG_SYSCONFDIR}"
@@ -30,5 +31,4 @@ SUPPORT_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
post-install:
${RM} -f ${EGDIR}/sample.conf
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 29d3f4e79b6..ca803a47386 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/01/08 19:56:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2003/01/28 22:04:24 jlam Exp $
VERS= 0.80.2
DISTNAME= WindowMaker-${VERS}
@@ -16,6 +16,7 @@ COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone
BUILD_USES_MSGFMT= YES
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_X11BASE= YES
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
@@ -90,7 +91,6 @@ post-install:
.include "../../graphics/tiff/buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
# "egcs" has an optimizer problem on "arm32".
diff --git a/www/analog/Makefile b/www/analog/Makefile
index aced0546e8d..88c3d11fa7b 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/01/11 15:23:43 tron Exp $
+# $NetBSD: Makefile,v 1.38 2003/01/28 22:04:25 jlam Exp $
DISTNAME= analog-5.31
CATEGORIES= www
@@ -16,6 +16,7 @@ MAKE_ENV+= PREFIX=${PREFIX} SYSCONFDIR=${PKG_SYSCONFDIR}
WRKDISTDIR= ${WRKDIR}/${DISTNAME}
WRKSRC= ${WRKDISTDIR}/src
+USE_PKGINSTALL= yes
EGDIR= ${PREFIX}/share/examples
CONF_FILES= ${EGDIR}/analog.cfg ${PKG_SYSCONFDIR}/analog.cfg
@@ -31,5 +32,4 @@ do-install:
${INSTALL_DATA} -m 644 ${WRKDISTDIR}/analog.cfg \
${PREFIX}/share/examples/analog.cfg
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile
index 9a8a1f0ed81..12b1ef0e3b9 100644
--- a/www/ap-ruby/Makefile
+++ b/www/ap-ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/25 12:58:27 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/28 22:04:25 jlam Exp $
#
DISTNAME= mod_ruby-${VERSION}
@@ -11,6 +11,7 @@ HOMEPAGE= http://www.modruby.net/
COMMENT= Apache module that embeds Ruby interpreter within
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
DIST_SUBDIR= ruby
USE_RUBY= YES
RUBY_REQD= 1.6
@@ -47,5 +48,5 @@ post-install:
.include "../../lang/ruby-base/buildlink2.mk"
.include "../../textproc/ruby-eruby/buildlink2.mk"
.include "../../www/apache/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 4eac9b11ff1..267a6b4b985 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2002/11/19 23:03:53 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2003/01/28 22:04:26 jlam Exp $
DISTNAME= mod_ssl-2.8.12-1.3.27
PKGNAME= ap-ssl-2.8.12
@@ -17,6 +17,7 @@ CONFLICTS= apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]*
BUILDLINK_DEPENDS.apache= apache>=1.3.27nb1
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
APACHE_MODULE= YES
GNU_CONFIGURE= YES
@@ -100,5 +101,4 @@ post-install:
.include "../../security/openssl/buildlink2.mk"
.include "../../www/apache/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 24b0dc28069..05e3ea8c45f 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2003/01/27 11:10:27 abs Exp $
+# $NetBSD: Makefile,v 1.120 2003/01/28 22:04:26 jlam Exp $
#
# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
# code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -37,6 +37,7 @@ CONFLICTS= apache-*ssl-[0-9]* apache6-[0-9]*
EXTRACT_ONLY= ${DISTFILES:N*.gif}
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc"
CONFIGURE_ARGS+= --enable-module=most \
@@ -207,5 +208,4 @@ post-install:
.include "../../devel/libmm/buildlink2.mk"
.include "../../textproc/expat/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index a971039f8ac..56ddcec2da6 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/01/28 14:21:56 martti Exp $
+# $NetBSD: Makefile,v 1.19 2003/01/28 22:04:27 jlam Exp $
DISTNAME= httpd-${APACHE_VERSION}
PKGNAME= apache-${APACHE_VERSION}
@@ -20,6 +20,7 @@ CONFLICTS+= apr-[0-9]* # devel/apr-devel package
BUILD_DEFS+= USE_INET6
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_GMAKE= YES
USE_LIBTOOL= YES
@@ -155,5 +156,4 @@ post-install:
.include "../../lang/perl5/buildlink2.mk"
.include "../../textproc/expat/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index c613e5dc7b4..61c235e69a6 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2002/12/22 13:04:40 grant Exp $
+# $NetBSD: Makefile,v 1.67 2003/01/28 22:04:27 jlam Exp $
#
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6-enable patch.
@@ -30,6 +30,7 @@ CONFLICTS= apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]*
EXTRACT_ONLY= ${DISTFILES:N*.gif:N*.diff.gz}
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc"
CONFIGURE_ARGS+= --enable-module=most \
@@ -181,5 +182,4 @@ post-install:
.include "../../devel/libmm/buildlink2.mk"
.include "../../textproc/expat/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile
index f4f7a879cf6..b9e1b546cf5 100644
--- a/www/apc-gui/Makefile
+++ b/www/apc-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:50 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:04:28 jlam Exp $
DISTNAME= apc_gui-1.0.3
PKGNAME= ${DISTNAME:S/_/-/}
@@ -14,6 +14,7 @@ DEPENDS+= php-apc>=1.1.0.1:../../www/php4-apc
DEPENDS+= php-gd>=4.0.1:../../graphics/php4-gd
NO_BUILD= YES
+USE_PKGINSTALL= YES
PKG_SYSCONFSUBDIR?= httpd
APC_GUI_DIR= ${PREFIX}/share/${PKGBASE}
@@ -37,5 +38,4 @@ do-install:
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${APC_GUI_DIR}
${CHMOD} -R a-w ${APC_GUI_DIR}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index a072decef7f..117b95e1498 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,5 +1,5 @@
#
-# $NetBSD: Makefile,v 1.15 2002/09/29 12:46:41 martti Exp $
+# $NetBSD: Makefile,v 1.16 2003/01/28 22:04:28 jlam Exp $
#
DISTNAME= cvsweb-2.0.6
@@ -11,6 +11,7 @@ HOMEPAGE= http://www.freebsd.org/projects/cvsweb.html
COMMENT= Web interface for browsing a CVS repository
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
PKG_SYSCONFSUBDIR?= httpd
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
@@ -57,6 +58,4 @@ do-install:
.endfor
.include "../../lang/perl5/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index bb96f3720a4..64bdee90ce1 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/11/26 15:07:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/28 22:04:28 jlam Exp $
#
DISTNAME= dillo-0.6.6
@@ -11,6 +11,7 @@ HOMEPAGE= http://dillo.cipsga.org.br/
COMMENT= Very small and fast graphical web-browser
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_X11= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -28,5 +29,4 @@ post-install:
.include "../../graphics/png/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 2acb965e357..4ccf1bc4482 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/03/06 18:51:17 jdarrow Exp $
+# $NetBSD: Makefile,v 1.21 2003/01/28 22:04:29 jlam Exp $
DISTNAME= horde-2.0
CATEGORIES= www
@@ -24,6 +24,7 @@ MESSAGE_SUBST+= HORDEDIR=${HORDEDIR}
PKG_SYSCONFSUBDIR?= httpd
+USE_PKGINSTALL= yes
CONF_FILES= ${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
CONF_FILES+= ${HORDEDIR}/config/horde.php.dist ${HORDEDIR}/config/horde.php
SUPPORT_FILES+= ${HORDEDIR}/config/html.php.dist ${HORDEDIR}/config/html.php
@@ -62,5 +63,4 @@ do-install:
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${HORDEDIR}
${CHMOD} -R a-w ${HORDEDIR}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/iasp/Makefile b/www/iasp/Makefile
index 78df06cc70c..2dbf3920c05 100644
--- a/www/iasp/Makefile
+++ b/www/iasp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/01/02 06:40:32 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:29 jlam Exp $
.include "../iasp/Makefile.common"
@@ -26,6 +26,7 @@ FILES_SUBST+= IASP_GROUP=${IASP_GROUP}
PKG_USERS= ${IASP_USER}:${IASP_GROUP}
PKG_GROUPS= ${IASP_GROUP}
+USE_PKGINSTALL= yes
OWN_DIRS= ${IASP_DESTDIR}
OWN_DIRS_PERMS= ${IASP_DESTDIR}/logs ${IASP_USER} ${IASP_GROUP} 0750
CONFDIR= ${IASP_DESTDIR}/properties
@@ -61,5 +62,4 @@ do-install:
cd ${WRKDIR}; ${CP} -R ${IASP_DIR} ${IASP_DESTDIR:H}
.include "../../mk/java-vm.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index c8414545ac8..92cca949548 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2002/12/28 22:34:13 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2003/01/28 22:04:29 jlam Exp $
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}-src
PKGNAME= ${DISTNAME:S/-src$//}
@@ -16,7 +16,7 @@ DEPENDS+= jakarta-ant>=1.4.1:../../devel/jakarta-ant
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= yes
MAKEFILE= build.xml
ALL_TARGET= main
INSTALL_TARGET= dist
@@ -24,6 +24,7 @@ INSTALL_TARGET= dist
SAMPLECONFDIR= ${PREFIX}/tomcat/conf
PKG_SYSCONFDIR.jakarta-tomcat= ${SAMPLECONFDIR}
+USE_PKGINSTALL= yes
OWN_DIRS= ${PREFIX}/tomcat
MAKE_DIRS= ${PREFIX}/tomcat/conf
MAKE_DIRS= ${PREFIX}/tomcat/logs
@@ -52,7 +53,6 @@ post-install:
${RM} ${PREFIX}/tomcat/webapps/examples.war
.include "../../mk/java-vm.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
MAKE_PROGRAM= ${LOCALBASE}/bin/ant
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 70f228ce485..0dd64c2f5f9 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/27 19:54:29 seb Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:30 jlam Exp $
#
DISTNAME= Apache-Gallery-0.4.1
@@ -19,6 +19,7 @@ DEPENDS+= p5-Inline-[0-9]*:../../devel/p5-Inline
DEPENDS+= p5-libapreq-[0-9]*:../../www/p5-libapreq
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_X11= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Apache/Gallery/.packlist
@@ -84,5 +85,5 @@ post-install:
.include "../../graphics/imlib2/buildlink2.mk"
.include "../../www/ap-perl/buildlink2.mk"
.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/www/php3/Makefile b/www/php3/Makefile
index a50a4e52de6..07024e53517 100644
--- a/www/php3/Makefile
+++ b/www/php3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/10/23 06:09:41 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2003/01/28 22:04:30 jlam Exp $
PKGNAME= php-${BASE_VERS}
PKGREVISION?= 2
@@ -20,6 +20,7 @@ CGIDIR= ${PREFIX}/libexec/cgi-bin
EGDIR= ${PREFIX}/share/examples/php3
DATADIR= ${PREFIX}/share/php3
+USE_PKGINSTALL= yes
OWN_DIRS= ${PREFIX}/${PHP_EXTENSION_DIR}
CONF_FILES= ${EGDIR}/php3.ini.example ${PKG_SYSCONFDIR}/php3.ini
@@ -39,5 +40,4 @@ do-install:
cd ${WRKSRC}/examples; ${INSTALL_DATA} README* *.php3 ${EGDIR}
${INSTALL_DATA} ${WRKDIR}/php3.ini.example ${EGDIR}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 3c7da7cdb70..6ab60f41be9 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/01/08 01:52:43 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2003/01/28 22:04:31 jlam Exp $
PKGNAME= php-${PHP_BASE_VERS}
CATEGORIES+= lang
@@ -7,6 +7,7 @@ COMMENT= HTML-embedded scripting language
CONFLICTS+= ap-php-4.0.3pl1
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "Makefile.php"
@@ -41,5 +42,4 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/php
${INSTALL_DATA} ${WRKSRC}/php.gif ${PREFIX}/share/php
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/squid/Makefile b/www/squid/Makefile
index d1195e2f021..8150a2c4cb5 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2002/12/02 03:09:01 grant Exp $
+# $NetBSD: Makefile,v 1.75 2003/01/28 22:04:31 jlam Exp $
DISTNAME= squid-2.5.STABLE1
PKGNAME= squid-2.5.1
@@ -46,8 +46,9 @@ PKG_SYSCONFSUBDIR?= squid
.include "../../mk/bsd.prefs.mk"
-GNU_CONFIGURE= # defined
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
--localstatedir=/var/squid \
${SQUID_CONFIGURE_ARGS}
@@ -118,6 +119,4 @@ post-install:
) >>${PLIST_SRC}
.include "../../security/openssl/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 0c9fb9edacc..9666b0a4dd8 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/08/25 21:52:22 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:04:32 jlam Exp $
#
DISTNAME= surfraw-1.0.7
@@ -12,6 +12,7 @@ COMMENT= Shell Users' Revolutionary Front Rage Against the Web
CONFLICTS+= surfaw-[0-9]*
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -31,5 +32,4 @@ post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index f8b77252dd7..8ecd44d96a7 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/09/19 09:04:34 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:04:32 jlam Exp $
DISTNAME= thttpd-2.23beta1
PKGNAME= thttpd-2.23.0.1
@@ -17,6 +17,7 @@ GNU_CONFIGURE= # defined
# Note: this pkg auto-detects IPv6 without regarding USE_INET6.
BUILD_DEFS+= USE_INET6
+USE_PKGINSTALL= yes
EGDIR= ${PREFIX}/share/examples
CONF_FILES= ${EGDIR}/thttpd.conf ${PKG_SYSCONFDIR}/thttpd.conf
RCD_SCRIPTS= thttpd
@@ -44,5 +45,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/thttpd
${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/thttpd
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 94687e85b9c..b50adcd9448 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/08/25 21:52:25 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:04:33 jlam Exp $
#
DISTNAME= webalizer-2.01-09-src
@@ -17,6 +17,7 @@ COMMENT= Web server log file analysis program
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_X11= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}
@@ -34,6 +35,4 @@ post-build:
done
.include "../../graphics/gd/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 61620f2fc79..80e67b9f11d 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2003/01/10 17:26:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2003/01/28 22:04:34 jlam Exp $
DISTNAME= gdm-2.2.0
PKGREVISION= 2
@@ -14,6 +14,7 @@ COMMENT= Gnome Display Manager - a re-implementation of the xdm program
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_X11BASE= YES
@@ -115,5 +116,5 @@ post-install:
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/libglade/buildlink2.mk"
.include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 16970f05c7f..118014123cb 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/01/04 20:01:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:04:34 jlam Exp $
#
DISTNAME= gtk+-2.2.0
@@ -16,6 +16,7 @@ COMMENT= Gimp toolkit. Libraries for building X11 user interfaces
BUILD_USES_MSGFMT= yes
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
USE_GMAKE= yes
@@ -58,5 +59,4 @@ post-install:
.include "../../graphics/png/buildlink2.mk"
.include "../../graphics/tiff/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 31e52048846..071f180b4d2 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/01/20 10:04:02 skrll Exp $
+# $NetBSD: Makefile,v 1.16 2003/01/28 22:04:35 jlam Exp $
DISTNAME= kdebase-3.0.5a
PKGREVISION= 2
@@ -12,6 +12,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
CONFIGURE_ARGS+= --with-ldap="${BUILDLINK_PREFIX.openldap}"
@@ -138,5 +139,4 @@ post-install:
.include "../../x11/kde3/buildlink2.mk"
.include "../../x11/kdelibs3/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 1556fd01c3e..668e9a8caf2 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/10/08 13:22:20 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/28 22:04:36 jlam Exp $
DISTNAME= kterm-6.2.0
CATEGORIES= x11
@@ -13,6 +13,7 @@ MAINTAINER= sakamoto@netbsd.org
COMMENT= Multi-lingual terminal emulator for X
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
USE_IMAKE= YES
_SETUID_ROOT= ${ROOT_USER} ${ROOT_GROUP} 4711
@@ -42,5 +43,4 @@ post-patch:
.endif
.include "../../mk/xaw.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index b26c970554c..c4a1ca51b01 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/25 18:40:39 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:04:36 jlam Exp $
# FreeBSD: /c/ncvs/ports/x11-toolkits/open-motif/Makefile,v 1.18 2000/10/09 01:40:02 asami Exp
# OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp
@@ -24,8 +24,9 @@ CONFLICTS+= lesstif-[0-9]*
DIST_SUBDIR= openmotif
WRKSRC= ${WRKDIR}/motif
-USE_X11BASE= # defined
-USE_BUILDLINK2= # defined
+USE_X11BASE= yes
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
ALL_TARGET= World
DEINSTALL_TMPL= ${.CURDIR}/DEINSTALL
@@ -105,5 +106,4 @@ post-install:
${INSTALL_MAN} $${file} ${PREFIX}/man/$${file}; \
done
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index c0d4bdc7ec3..a973008303c 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/29 12:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:04:36 jlam Exp $
#
DISTNAME= xfstt_1.3
@@ -14,6 +14,7 @@ COMMENT= TrueType font server for X11
CXXFLAGS+= -fomit-frame-pointer -ffast-math
MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
+USE_PKGINSTALL= YES
USE_X11BASE= YES
USE_GMAKE= YES
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
@@ -41,5 +42,4 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TrueType
${ECHO} belongs to xfstt pkg >${PREFIX}/lib/X11/fonts/TrueType/.keepme
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"