diff options
| author | wiz <wiz@pkgsrc.org> | 2001-01-29 11:34:21 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2001-01-29 11:34:21 +0000 |
| commit | b979f7222ad9bade13f010cd27e5bc6afab1681c (patch) | |
| tree | 86f14acd24842161759a420487862022044c2b4b | |
| parent | 6a13219ca89e5dae86f27159ff86006058c06859 (diff) | |
| download | pkgsrc-b979f7222ad9bade13f010cd27e5bc6afab1681c.tar.gz | |
Add automatic ${VARIABLE} handling for MESSAGE files.
Convert most MESSAGE files to new syntax (${VARIABLE} gets replaced,
not @VARIABLE@, nor @@VARIABLE@@).
By default, substitutions are done for LOCALBASE, PKGNAME, PREFIX,
X11BASE, X11PREFIX; additional patterns can be added via MESSAGE_SUBST.
Clean up some packages while I'm there; add RCS tags to most MESSAGEs.
Remove some uninteresting MESSAGEs.
142 files changed, 618 insertions, 670 deletions
diff --git a/audio/realplayer/Makefile b/audio/realplayer/Makefile index d15e7c5c753..79214e88a9d 100644 --- a/audio/realplayer/Makefile +++ b/audio/realplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/12/25 09:35:58 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2001/01/29 11:34:22 wiz Exp $ DISTNAME= rp8_linux20_libc6_i386_cs1 PKGNAME= realplayer-8 @@ -35,12 +35,12 @@ NO_CONFIGURE= # defined SCRIPTS_ENV+= CAT="${CAT}" SCRIPTS_ENV+= CHMOD="${CHMOD}" SCRIPTS_ENV+= RP_INSTALLER="${RP_INSTALLER}" -MESSAGE_FILE= ${WRKDIR}/MESSAGE DOWNLOAD= http://proforma.real.com/real/player/unix/unix.html RP_INSTALLER= ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} REALPLAYER_HOME= ${PREFIX}/lib/RealPlayer8 NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins +MESSAGE_SUBST+= REALPLAYER_HOME=${REALPLAYER_HOME} do-fetch: @if [ ! -f ${RP_INSTALLER} ]; then \ @@ -67,8 +67,6 @@ do-build: pre-install: ${FIND} ${WRKSRC} \ \( -name "*.orig" -o -name "*.old" \) -exec ${RM} {} \; - ${SED} -e "s,@REALPLAYER_HOME@,${REALPLAYER_HOME},g" \ - < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} do-install: ${INSTALL_SCRIPT} ${WRKDIR}/realplay.sh ${PREFIX}/bin/realplay diff --git a/audio/realplayer/pkg/MESSAGE b/audio/realplayer/pkg/MESSAGE index 9bb272e5bbc..4def017c1fb 100644 --- a/audio/realplayer/pkg/MESSAGE +++ b/audio/realplayer/pkg/MESSAGE @@ -1,13 +1,13 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2000/12/25 09:35:59 jlam Exp $ +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:22 wiz Exp $ Please be sure to read the licensing terms in - @REALPLAYER_HOME@/LICENSE + ${REALPLAYER_HOME}/LICENSE prior to using RealPlayer. Users may run: - @REALPLAYER_HOME@/mimeinstall.sh + ${REALPLAYER_HOME}/mimeinstall.sh to install the RealPlayer MIME types into their .mime.types and .mailcap files and to install a RealPlayer icon and MIME types into their KDE or diff --git a/comms/snooper/Makefile b/comms/snooper/Makefile index 9286a4deea9..bd63f5118db 100644 --- a/comms/snooper/Makefile +++ b/comms/snooper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/09/26 03:16:45 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2001/01/29 11:34:22 wiz Exp $ # FreeBSD Id: Makefile,v 1.3 1998/08/13 09:20:41 itojun Exp $ DISTNAME= snooper-19991202 @@ -10,12 +10,6 @@ MAINTAINER= itojun@itojun.org WRKSRC= ${WRKDIR}/snooper/build GNU_CONFIGURE= yes -MESSAGE_SRC= ${PKGDIR}/MESSAGE -MESSAGE_FILE= ${WRKDIR}/.MESSAGE - -pre-install: - @${SED} -e 's|$${PREFIX}|${PREFIX}|' ${MESSAGE_SRC} > ${MESSAGE_FILE} - pre-build: cd ${WRKSRC} ; ${MAKE} depend diff --git a/comms/snooper/pkg/MESSAGE b/comms/snooper/pkg/MESSAGE deleted file mode 100644 index cdd974b8617..00000000000 --- a/comms/snooper/pkg/MESSAGE +++ /dev/null @@ -1,2 +0,0 @@ -snooper has been installed. -Documents can be found at: ${PREFIX}/share/doc/snooper diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile index 24d44ad4ef9..42bd0f5bf28 100644 --- a/databases/postgresql/Makefile +++ b/databases/postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2000/12/11 20:18:56 jlam Exp $ +# $NetBSD: Makefile,v 1.59 2001/01/29 11:34:23 wiz Exp $ # FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp # @@ -20,7 +20,7 @@ NOT_FOR_PLATFORM= *-*-alpha *-*-mips PGUSER?= pgsql PGGROUP?= ingres -MESSAGE_FILE= ${FILESDIR}/post-install-notes +MESSAGE= ${FILESDIR}/post-install-notes DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL PGHOME= ${PREFIX}/${PGUSER} diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index 79e82165c02..93721919487 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/11/27 16:00:19 tron Exp $ +# $NetBSD: Makefile,v 1.9 2001/01/29 11:34:23 wiz Exp $ # DISTNAME= GConf-0.11 @@ -13,8 +13,6 @@ DEPENDS+= oaf-*:../../devel/oaf DEPENDS+= guile>=1.3.4:../../lang/guile BUILD_DEPENDS+= msgfmt:../../devel/gettext -MESSAGE_FILE= ${WRKDIR}/MESSAGE - GNU_CONFIGURE= YES USE_X11BASE= YES USE_LIBINTL= YES @@ -25,8 +23,6 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11PREFIX}/include" PLIST_SUBST+= LOCALBASE=${LOCALBASE} post-install: - ${SED} -e 's#@@X11PREFIX@@#${X11PREFIX}#g' < ${PKGDIR}/MESSAGE \ - > ${MESSAGE_FILE} ${TEST} ${PREFIX} = ${LOCALBASE} || \ ${LN} -fs ${PREFIX}/share/aclocal/gconf-1.m4 \ ${LOCALBASE}/share/aclocal/gconf-1.m4 diff --git a/devel/GConf/pkg/MESSAGE b/devel/GConf/pkg/MESSAGE index 3a9ae6e35b4..c9f038d11e7 100644 --- a/devel/GConf/pkg/MESSAGE +++ b/devel/GConf/pkg/MESSAGE @@ -1,9 +1,9 @@ -$NetBSD: MESSAGE,v 1.1.1.1 2000/08/30 06:19:08 rh Exp $ - ========================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:23 wiz Exp $ + GConf has now been installed on your system. If this is your first install of GConf, you may need to move - @@X11PREFIX@@/etc/gconf/1/path.example to @@X11PREFIX@@/etc/gconf/1/path + ${X11PREFIX}/etc/gconf/1/path.example to ${X11PREFIX}/etc/gconf/1/path so that the default configuration is sane. ========================================================================== diff --git a/editors/jed/Makefile b/editors/jed/Makefile index 7d3ecaa9381..30f2a88842d 100644 --- a/editors/jed/Makefile +++ b/editors/jed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/09/03 10:04:38 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2001/01/29 11:34:24 wiz Exp $ # DISTNAME= jed0.98-7 @@ -17,9 +17,4 @@ CONFIGURE_ARGS+= --without-X WRKSRC= ${WRKDIR}/jed -MESSAGE_FILE= ${WRKDIR}/MESSAGE - -pre-install: - ${SED} -e "s_@PREFIX@_${PREFIX}_" ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - .include "../../mk/bsd.pkg.mk" diff --git a/editors/jed/pkg/MESSAGE b/editors/jed/pkg/MESSAGE index fc58e64dd6c..d0108ad76a7 100644 --- a/editors/jed/pkg/MESSAGE +++ b/editors/jed/pkg/MESSAGE @@ -1,4 +1,6 @@ -$NetBSD: MESSAGE,v 1.2 2000/09/03 10:04:39 wiz Exp $ +====================================================================== +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:24 wiz Exp $ -You might want to have a look at @PREFIX@/share/jed/lib/* and install a -file defaults.sl for site defaults there. +You might want to have a look at ${PREFIX}/share/jed/lib/* and +install a file defaults.sl for site defaults there. +====================================================================== diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index d72045fcc95..ec55e1d564a 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/01/04 22:51:53 simonb Exp $ +# $NetBSD: Makefile,v 1.11 2001/01/29 11:34:25 wiz Exp $ DISTNAME= bochs-2000_0325a PKGNAME= bochs-2000.03.25a @@ -13,19 +13,17 @@ USE_GMAKE= yes #CONFIGURE_ARGS= --enable-debugger --enable-disasm USE_X11= yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE BOCHS_MAINDIR= ${PREFIX}/share/bochs BOCHS_BIOSDIR= ${BOCHS_MAINDIR}/bios BOCHS_FONTDIR= ${BOCHS_MAINDIR}/xfonts BOCHS_DOCDIR= ${PREFIX}/share/doc/html/bochs +MESSAGE_SUBST+= BOCHS_MAINDIR=${BOCHS_MAINDIR} \ + BOCHS_FONTDIR=${BOCHS_FONTDIR} \ + BOCHS_DOCDIR=${BOCHS_DOCDIR} post-configure: ${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' \ < ${WRKSRC}/.bochsrc > ${WRKSRC}/bochsrc - ${SED} -e 's,@BOCHS_MAINDIR@,${BOCHS_MAINDIR},g' \ - -e 's,@BOCHS_FONTDIR@,${BOCHS_FONTDIR},g' \ - -e 's,@BOCHS_DOCDIR@,${BOCHS_DOCDIR},g' \ - < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} do-install: ${INSTALL_DATA_DIR} ${BOCHS_BIOSDIR} diff --git a/emulators/bochs/pkg/MESSAGE b/emulators/bochs/pkg/MESSAGE index e1dcf730906..2d0263e054d 100644 --- a/emulators/bochs/pkg/MESSAGE +++ b/emulators/bochs/pkg/MESSAGE @@ -1,13 +1,18 @@ -You need to copy the @BOCHS_MAINDIR@/bochsrc file to your home +====================================================================== +$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:25 wiz Exp $ + +You need to copy the ${BOCHS_MAINDIR}/bochsrc file to your home directory and name it .bochsrc. Then edit it to your tastes -defining the hard drives, and floppies as needed. You also need -to @BOCHS_FONTDIR@ to your X font path and to enable it -before running bochs. e.g. +defining the hard drives and floppies as needed. You also need +to ${BOCHS_FONTDIR} to your X font path and to enable it +before running bochs, e.g. - $ xset fp+ @BOCHS_FONTDIR@ + $ xset fp+ ${BOCHS_FONTDIR} $ xset fp rehash Documentation is available on the website, and a copy of that -website is in @BOCHS_DOCDIR@. The file install.html +website is in ${BOCHS_DOCDIR}. The file install.html will assist you in creating a HD "file". (A raw disk partition can -be used as well) +be used as well.) + +====================================================================== diff --git a/emulators/plex86/Makefile b/emulators/plex86/Makefile index 15118924b8f..ce32cba8e41 100644 --- a/emulators/plex86/Makefile +++ b/emulators/plex86/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/01/07 17:07:13 tron Exp $ +# $NetBSD: Makefile,v 1.18 2001/01/29 11:34:25 wiz Exp $ DISTNAME= plex86-20010106 PKGNAME= ${DISTNAME:S/-/-0./} @@ -22,8 +22,6 @@ RESTRICTED= CPU-specific binary code NO_BIN_ON_CDROM=${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} -MESSAGE_FILE= ${WRKSRC}/.MESSAGE - BSDSRCDIR?= /nonexistent # to override <bsd.own.mk>, MUST be # set this way BEFORE bsd.prefs.mk .include "../../mk/bsd.prefs.mk" @@ -48,7 +46,6 @@ post-build: do-install: do-install-dirs do-install-binaries do-install-bios \ do-install-font do-install-conf - ${SED} -e 's,@PREFIX@,${PREFIX},g' <${PKGDIR}/MESSAGE >${MESSAGE_FILE} do-install-dirs: ${INSTALL_DATA_DIR} ${PREFIX}/lkm \ diff --git a/emulators/plex86/pkg/MESSAGE b/emulators/plex86/pkg/MESSAGE index ad74889a1fe..2bd980ca207 100644 --- a/emulators/plex86/pkg/MESSAGE +++ b/emulators/plex86/pkg/MESSAGE @@ -1,4 +1,5 @@ =========================================================================== +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:26 wiz Exp $ NOTE: Because plex86 contains a kernel module, it must be run with a kernel built from the same sources as the plex86 binaries. If you are @@ -9,7 +10,7 @@ updated sources. (Be sure to disable the LKM while doing this!) In order to enable loading of the plex86 kernel module at boot time, edit /etc/lkm.conf and add the following line: -@PREFIX@/lkm/plex86.o - - @PREFIX@/lib/plex86/netbsd_post.sh - AFTERMOUNT +${PREFIX}/lkm/plex86.o - - ${PREFIX}/lib/plex86/netbsd_post.sh - AFTERMOUNT The module will be loaded after reboot, and the netbsd_post.sh script will automatically create the needed /dev/plex86 device. diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile index 917747db94f..bff97c1cabf 100644 --- a/emulators/xbeeb/Makefile +++ b/emulators/xbeeb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/09/03 10:01:41 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:26 wiz Exp $ # DISTNAME= xbeeb-0.3.6 @@ -11,11 +11,11 @@ HOMEPAGE= http://www.netcomuk.co.uk/~james/BBCMicro/Xbeeb/index.html USE_IMAKE= yes WRKSRC= ${WRKDIR}/xbeeb -PLIST_SRC= ${WRKDIR}/PLIST -MESSAGE_FILE= ${WRKDIR}/MESSAGE MAN_PAGE= ${WRKDIR}/xbeeb.1 XBEEBROOT= share/xbeeb +MESSAGE_SUBST+= XBEEBROOT=${XBEEBROOT} +PLIST_SUBST+= XBEEBROOT=${XBEEBROOT} # xbeeb build starts in the source directory do-configure: @@ -25,10 +25,10 @@ post-patch: (cd ${WRKSRC}/src && \ ${MV} Config.h Config.h.dist && \ ${SED} 's+^\(#define[ ]*XBEEBROOT[ ]*\)[^ ].*$$+\1"${PREFIX}/${XBEEBROOT}/"+' Config.h.dist > Config.h) - ${SED} 's+#XBEEBROOT#+${XBEEBROOT}+g' ${PKGDIR}/PLIST > ${PLIST_SRC} +testt: ${SED} -e 's+@XBEEBROOT@+${XBEEBROOT}+g' \ -e 's+@PREFIX@+${PREFIX}+g' \ - ${PKGDIR}/xbeeb.1 > ${MAN_PAGE} + ${FILESDIR}/xbeeb.1 > ${MAN_PAGE} do-build: (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xbeeb) @@ -37,15 +37,6 @@ do-build: do \ bdftopcf $$i -o `basename $$i .bdf`.pcf ; \ done) - ${ECHO} > ${MESSAGE_FILE} "You must copy the BBC \"BASIC2\" ROM image to" - ${ECHO} >> ${MESSAGE_FILE} "" - ${ECHO} >> ${MESSAGE_FILE} " ${PREFIX}/${XBEEBROOT}/roms/BASIC2.rom" - ${ECHO} >> ${MESSAGE_FILE} "" - ${ECHO} >> ${MESSAGE_FILE} "and the BBC \"OS1.2\" ROM image to" - ${ECHO} >> ${MESSAGE_FILE} "" - ${ECHO} >> ${MESSAGE_FILE} " ${PREFIX}/${XBEEBROOT}/roms/OS1.2.rom" - ${ECHO} >> ${MESSAGE_FILE} "" - ${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE.post >>${MESSAGE_FILE} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xbeeb ${PREFIX}/bin/xbeeb diff --git a/emulators/xbeeb/pkg/xbeeb.1 b/emulators/xbeeb/files/xbeeb.1 index dee8decefd0..b38fd4317a6 100644 --- a/emulators/xbeeb/pkg/xbeeb.1 +++ b/emulators/xbeeb/files/xbeeb.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: xbeeb.1,v 1.2 2000/06/05 18:12:57 skrll Exp $ +.\" $NetBSD: xbeeb.1,v 1.1 2001/01/29 11:34:26 wiz Exp $ .\" .Dd May 27, 2000 .Dt XBEEB 1 diff --git a/emulators/xbeeb/pkg/MESSAGE.post b/emulators/xbeeb/pkg/MESSAGE index 432b5b0a01c..f82f2f36ee4 100644 --- a/emulators/xbeeb/pkg/MESSAGE.post +++ b/emulators/xbeeb/pkg/MESSAGE @@ -1,7 +1,18 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:26 wiz Exp $ + +You must copy the BBC "BASIC2" ROM image to + + ${PREFIX}/${XBEEBROOT}/roms/BASIC2.rom + +and the BBC "OS1.2" ROM image to + + ${PREFIX}/${XBEEBROOT}/roms/OS1.2.rom + You also need to ensure that your X session can access the fonts needed. This can be done with: - $ xset fp+ @PREFIX@/lib/X11/fonts/xbeeb + $ xset fp+ ${PREFIX}/lib/X11/fonts/xbeeb To make the effect permanent for future X sessions, you can do this by editing certain files in your X installation. @@ -19,9 +30,11 @@ intlfonts install directory to the xfs/config file in the comma separated list of directories given for the "catalogue" setting. For example: - catalogue = @PREFIX@/lib/X11/fonts/misc/, - @PREFIX@/lib/X11/fonts/Speedo/, - @PREFIX@/lib/X11/fonts/Type1/, - @PREFIX@/lib/X11/fonts/100dpi/, - @PREFIX@/lib/X11/fonts/75dpi/, - @PREFIX@/lib/X11/fonts/xbeeb/ + catalogue = ${PREFIX}/lib/X11/fonts/misc/, + ${PREFIX}/lib/X11/fonts/Speedo/, + ${PREFIX}/lib/X11/fonts/Type1/, + ${PREFIX}/lib/X11/fonts/100dpi/, + ${PREFIX}/lib/X11/fonts/75dpi/, + ${PREFIX}/lib/X11/fonts/xbeeb/ + +====================================================================== diff --git a/emulators/xbeeb/pkg/PLIST b/emulators/xbeeb/pkg/PLIST index 9e97326ccf4..36c91f53f83 100644 --- a/emulators/xbeeb/pkg/PLIST +++ b/emulators/xbeeb/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2000/06/01 20:47:02 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2001/01/29 11:34:26 wiz Exp $ bin/xbeeb lib/X11/fonts/xbeeb/ttext-grc-ldh.pcf lib/X11/fonts/xbeeb/ttext-std-udh.pcf @@ -10,23 +10,23 @@ lib/X11/fonts/xbeeb/ttext-grc.pcf lib/X11/fonts/xbeeb/ttext-grc-udh.pcf lib/X11/fonts/xbeeb/ttext-std.pcf lib/X11/fonts/xbeeb/fonts.dir -#XBEEBROOT#/roms/xdfs0.70.rom -#XBEEBROOT#/docs/64doc -#XBEEBROOT#/docs/Configuration -#XBEEBROOT#/docs/DataXfer -#XBEEBROOT#/docs/DiskEmulation -#XBEEBROOT#/docs/Help -#XBEEBROOT#/docs/Installation -#XBEEBROOT#/docs/Keyboard -#XBEEBROOT#/docs/KnownBugs -#XBEEBROOT#/docs/MailingLists -#XBEEBROOT#/docs/Options -#XBEEBROOT#/docs/RomPatches -#XBEEBROOT#/docs/SnapshotFormat -#XBEEBROOT#/docs/Thanks -#XBEEBROOT#/docs/WWWSites -#XBEEBROOT#/docs/WorkingSoftware +${XBEEBROOT}/roms/xdfs0.70.rom +${XBEEBROOT}/docs/64doc +${XBEEBROOT}/docs/Configuration +${XBEEBROOT}/docs/DataXfer +${XBEEBROOT}/docs/DiskEmulation +${XBEEBROOT}/docs/Help +${XBEEBROOT}/docs/Installation +${XBEEBROOT}/docs/Keyboard +${XBEEBROOT}/docs/KnownBugs +${XBEEBROOT}/docs/MailingLists +${XBEEBROOT}/docs/Options +${XBEEBROOT}/docs/RomPatches +${XBEEBROOT}/docs/SnapshotFormat +${XBEEBROOT}/docs/Thanks +${XBEEBROOT}/docs/WWWSites +${XBEEBROOT}/docs/WorkingSoftware @dirrm lib/X11/fonts/xbeeb -@dirrm #XBEEBROOT#/docs -@dirrm #XBEEBROOT#/roms -@dirrm #XBEEBROOT# +@dirrm ${XBEEBROOT}/docs +@dirrm ${XBEEBROOT}/roms +@dirrm ${XBEEBROOT} diff --git a/fonts/intlfonts/Makefile b/fonts/intlfonts/Makefile index 097f5deb03d..cc4d23f4ac7 100644 --- a/fonts/intlfonts/Makefile +++ b/fonts/intlfonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/06/28 21:50:24 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/01/29 11:34:27 wiz Exp $ DISTNAME= intlfonts-1.2 CATEGORIES= fonts x11 @@ -33,7 +33,6 @@ MISC_FILES= README.split DIST_SUBDIR= ${PKGNAME} EXTRACT_ONLY= ${FONT_SETS:S/$/${EXTRACT_SUFX}/} -MESSAGE_FILE= ${WRKSRC}/MESSAGE USE_X11BASE= yes GNU_CONFIGURE= yes @@ -56,7 +55,4 @@ post-extract: ${CP} ${_DISTDIR}/${FILE} ${WRKSRC} .endfor -do-build: - ${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE >${MESSAGE_FILE} - .include "../../mk/bsd.pkg.mk" diff --git a/fonts/intlfonts/pkg/MESSAGE b/fonts/intlfonts/pkg/MESSAGE index 697ab57c864..3f1d8dbd1d8 100644 --- a/fonts/intlfonts/pkg/MESSAGE +++ b/fonts/intlfonts/pkg/MESSAGE @@ -1,7 +1,10 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:27 wiz Exp $ + You can tell one existing X session on the installed host to use the new "intlfonts" fonts with: - $ xset +fp @PREFIX@/lib/X11/fonts/intlfonts + $ xset +fp ${PREFIX}/lib/X11/fonts/intlfonts To make the effect permanent for future X sessions, you will have to edit certain files in yout X installation. @@ -19,9 +22,11 @@ intlfonts install directory to the xfs/config file in the comma separated list of directories given for the "catalogue" setting. For example: - catalogue = @PREFIX@/lib/X11/fonts/misc/, - @PREFIX@/lib/X11/fonts/Speedo/, - @PREFIX@/lib/X11/fonts/Type1/, - @PREFIX@/lib/X11/fonts/100dpi/, - @PREFIX@/lib/X11/fonts/75dpi/, - @PREFIX@/lib/X11/fonts/intlfonts/ + catalogue = ${PREFIX}/lib/X11/fonts/misc/, + ${PREFIX}/lib/X11/fonts/Speedo/, + ${PREFIX}/lib/X11/fonts/Type1/, + ${PREFIX}/lib/X11/fonts/100dpi/, + ${PREFIX}/lib/X11/fonts/75dpi/, + ${PREFIX}/lib/X11/fonts/intlfonts/ + +====================================================================== diff --git a/fonts/jmk-fonts/Makefile b/fonts/jmk-fonts/Makefile index 1662a5f126e..3a7f380e66c 100644 --- a/fonts/jmk-fonts/Makefile +++ b/fonts/jmk-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/05/27 14:52:07 agc Exp $ +# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:27 wiz Exp $ # DISTNAME= jmk-x11-fonts-3.0 @@ -10,10 +10,5 @@ MAINTAINER= jwise@netbsd.org HOMEPAGE= http://www.ntrnet.net/~jmknoble/fonts/ USE_IMAKE= yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE - -post-build: - ${SED} -e 's,@PREFIX@,${PREFIX},g' \ - < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE .include "../../mk/bsd.pkg.mk" diff --git a/fonts/jmk-fonts/pkg/MESSAGE b/fonts/jmk-fonts/pkg/MESSAGE index ac021eae565..136d27e44b9 100644 --- a/fonts/jmk-fonts/pkg/MESSAGE +++ b/fonts/jmk-fonts/pkg/MESSAGE @@ -1,10 +1,15 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:27 wiz Exp $ + To use the fonts you have just installed, add the line: - FontPath @PREFIX@/lib/X11/fonts/jmk + FontPath ${PREFIX}/lib/X11/fonts/jmk to your X window configuration file, or run the following command: - xset +fp @PREFIX@/lib/X11/fonts/jmk + xset +fp ${PREFIX}/lib/X11/fonts/jmk xset fp rehash + +====================================================================== diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile index e68cdc60a84..103147fb2fa 100644 --- a/games/rollemup/Makefile +++ b/games/rollemup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2000/09/08 13:34:23 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2001/01/29 11:34:27 wiz Exp $ # DISTNAME= Rollemup @@ -26,10 +26,9 @@ NO_SRC_ON_CDROM=${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_FTP= ${RESTRICTED} -MESSAGE_FILE= ${WRKDIR}/MESSAGE - PLIST_SRC= ${WRKDIR}/PLIST.src GAMES_DIR= share/games +MESSAGE_SUBST+= GAMES_DIR=${GAMES_DIR} ONLY_FOR_PLATFORM= *-*-i386 @@ -45,9 +44,6 @@ do-build: @${SED} -e 's|$${PREFIX}|${PREFIX}|g' \ -e 's|$${GAMES_DIR}|${GAMES_DIR}|g' \ ${FILESDIR}/rollemup.sh > ${WRKDIR}/rollemup - @${SED} -e 's|$${PREFIX}|${PREFIX}|g' \ - -e 's|$${GAMES_DIR}|${GAMES_DIR}|g' \ - ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} @${SED} -e 's|$${PREFIX}|${PREFIX}|g' ${FILESDIR}/README.Rollemup \ > ${WRKDIR}/README.Rollemup diff --git a/games/rollemup/pkg/MESSAGE b/games/rollemup/pkg/MESSAGE index 65ecff2cdaf..df505ce37c8 100644 --- a/games/rollemup/pkg/MESSAGE +++ b/games/rollemup/pkg/MESSAGE @@ -1 +1,6 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:28 wiz Exp $ + Please read ${PREFIX}/${GAMES_DIR}/Rollemup/README.Rollemup + +====================================================================== diff --git a/japanese/man/Makefile b/japanese/man/Makefile index 47287034cb0..ad1c192a282 100644 --- a/japanese/man/Makefile +++ b/japanese/man/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/02/15 09:26:21 agc Exp $ +# $NetBSD: Makefile,v 1.7 2001/01/29 11:34:28 wiz Exp $ DISTNAME= NetBSD1.3I-jman-19990531 PKGNAME= ja-man-19990531 @@ -17,9 +17,6 @@ MAKE_ENV+= JAMANDIR=${JAMANDIR} PLIST_SRC= ${WRKDIR}/PLIST -MESSAGE_SRC= ${PKGDIR}/MESSAGE -MESSAGE_FILE= ${WRKDIR}/.MESSAGE - MANCOMPRESSED_IF_MANZ= yes .include "../../mk/bsd.prefs.mk" @@ -47,7 +44,6 @@ do-build: MKCATPAGES?= yes pre-install: - @${SED} -e 's|$${PREFIX}|${PREFIX}|' ${MESSAGE_SRC} > ${MESSAGE_FILE} .if ${MKCATPAGES} == no @${SED} -e '/\/cat[1-9]\//d' ${PKGDIR}/PLIST > ${PLIST_SRC} .if exists(${PKGDIR}/PLIST.${MACHINE}) diff --git a/japanese/man/pkg/MESSAGE b/japanese/man/pkg/MESSAGE index 961c6ed6afa..4f09a7e9fff 100644 --- a/japanese/man/pkg/MESSAGE +++ b/japanese/man/pkg/MESSAGE @@ -1 +1,6 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:28 wiz Exp $ + Please read ${PREFIX}/share/doc/jman/README. + +====================================================================== diff --git a/japanese/skkfep/Makefile b/japanese/skkfep/Makefile index b487593fe63..77a9f5e706c 100644 --- a/japanese/skkfep/Makefile +++ b/japanese/skkfep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/11/09 05:14:27 itohy Exp $ +# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:28 wiz Exp $ DISTNAME= skkfep0.86c PKGNAME= skkfep-0.86c @@ -16,12 +16,10 @@ MAKE_ENV= MAKE_FLAGS='EXECBASE=${LOCALBASE} CC=${CC}' DESCR_SRC= ${WRKDIR}/DESCR INSTALL_FILE= ${WRKDIR}/INSTALL -MESSAGE_FILE= ${WRKDIR}/MESSAGE post-build: ${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/DESCR >${DESCR_SRC} ${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/INSTALL >${INSTALL_FILE} - ${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/MESSAGE >${MESSAGE_FILE} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/skkfep ${PREFIX}/bin/skkfep diff --git a/japanese/skkfep/pkg/MESSAGE b/japanese/skkfep/pkg/MESSAGE index 16f6a2db563..bddfd7695e2 100644 --- a/japanese/skkfep/pkg/MESSAGE +++ b/japanese/skkfep/pkg/MESSAGE @@ -1,4 +1,9 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:28 wiz Exp $ + To use skkfep, the dictionary server (skkserv) is almost required. Use "skkserv" pkg, or, if you have another machine -running skkserv, put the hostname in @PKGBASE@/etc/skk.conf +running skkserv, put the hostname in ${LOCALBASE}/etc/skk.conf file, and skkfep will connect to the host. + +====================================================================== diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile index ddf8697778e..82fa7c62a07 100644 --- a/japanese/skkinput/Makefile +++ b/japanese/skkinput/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/11/09 05:14:27 itohy Exp $ +# $NetBSD: Makefile,v 1.4 2001/01/29 11:34:28 wiz Exp $ DISTNAME= skkinput-2.03 CATEGORIES= japanese @@ -17,12 +17,10 @@ PLIST_SUBST= PKGBASE=${LOCALBASE} DESCR_SRC= ${WRKDIR}/DESCR INSTALL_FILE= ${WRKDIR}/INSTALL -MESSAGE_FILE= ${WRKDIR}/MESSAGE post-build: ${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/DESCR >${DESCR_SRC} ${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/INSTALL >${INSTALL_FILE} - ${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/MESSAGE >${MESSAGE_FILE} post-install: ${INSTALL_MAN} ${WRKSRC}/skkinput.man ${PREFIX}/man/ja_JP.EUC/man1/skkinput.1 diff --git a/japanese/skkinput/pkg/MESSAGE b/japanese/skkinput/pkg/MESSAGE index 868dfc7e6e4..553c395fcfc 100644 --- a/japanese/skkinput/pkg/MESSAGE +++ b/japanese/skkinput/pkg/MESSAGE @@ -1,4 +1,9 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:29 wiz Exp $ + To use skkinput, the dictionary server (skkserv) is almost required. Use "skkserv" pkg, or, if you have another machine -running skkserv, put the hostname in @PKGBASE@/etc/skk.conf +running skkserv, put the hostname in ${LOCALBASE}/etc/skk.conf file, and skkinput will connect to the host. + +====================================================================== diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile index ac64ca6535e..ce922cecf0c 100644 --- a/japanese/skkserv/Makefile +++ b/japanese/skkserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/01/26 05:21:45 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:29 wiz Exp $ DISTNAME= skk9.6 PKGNAME= skkserv-3.9.4nb1 @@ -19,7 +19,6 @@ DIST_SUBDIR= skk GNU_CONFIGURE= YES INSTALL_FILE= ${WRKDIR}/INSTALL -MESSAGE_FILE= ${WRKDIR}/MESSAGE .include "../../mk/bsd.prefs.mk" @@ -43,7 +42,6 @@ post-build: ${SED} -e 's#@PREFIX@#${PREFIX}#g' <${FILESDIR}/skkserv.sh \ >${WRKDIR}/skkserv.sh ${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/INSTALL >${INSTALL_FILE} - ${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE >${MESSAGE_FILE} : : Merging dictionaries.... : diff --git a/japanese/skkserv/pkg/MESSAGE b/japanese/skkserv/pkg/MESSAGE index 00734702a59..3f24478abd5 100644 --- a/japanese/skkserv/pkg/MESSAGE +++ b/japanese/skkserv/pkg/MESSAGE @@ -1 +1,6 @@ -Please add "@PREFIX@/etc/rc.d/skkserv.sh" to "/etc/rc.local". +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:29 wiz Exp $ + +Please add ${PREFIX}/etc/rc.d/skkserv to /etc/rc.local. + +====================================================================== diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 537d0d9e9ea..cc42237d973 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/01/13 00:34:55 tron Exp $ +# $NetBSD: Makefile,v 1.12 2001/01/29 11:34:29 wiz Exp $ DISTNAME= gcc-2.95.2 CATEGORIES= lang @@ -29,6 +29,7 @@ CONFIGURE_ARGS= --host=${MACHINE_GCC_PLATFORM} \ CONFIGURE_SCRIPT= ${SRCDIR}/configure GCC_VERSION= ${PKGNAME:C/.*-//} +MESSAGE_SUBST+= MAKE=${MAKE} PLIST_SUBST+= GCC_VERSION=${GCC_VERSION} \ MACHINE_GCC_PLATFORM=${MACHINE_GCC_PLATFORM} SRCDIR= ${WRKDIR}/${PKGNAME} @@ -39,14 +40,13 @@ WRKSRC= ${WRKDIR}/objdir .if (${OPSYS} != SunOS) CONFIGURE_ARGS+= --with-gnu-as --with-gnu-ld GCC_PREFIX= ${LOCALBASE}/${PKGNAME} -MESSAGE_FILE= ${WRKDIR}/MESSAGE .else .if (${CC} != gcc) ALL_TARGET= bootstrap .endif GCC_PREFIX= ${LOCALBASE} PLIST_SRC= ${PKGDIR}/PLIST.SunOS -MESSAGE_FILE= ${PKGDIR}/MESSAGE.SunOS +MESSAGE= ${PKGDIR}/MESSAGE.SunOS .endif post-extract: @@ -57,7 +57,7 @@ post-patch: .if (${OPSYS} != SunOS) post-build: - for FILE in ${FILESDIR}/gcc.mk ${PKGDIR}/MESSAGE; do \ + for FILE in ${FILESDIR}/gcc.mk do \ ${SED} -e 's#@@MAKE@@#${MAKE}#g' \ -e 's#@@PKGNAME@@#${PKGNAME}#g' \ -e 's#@@PREFIX@@#${PREFIX}#g' \ diff --git a/lang/gcc/pkg/MESSAGE b/lang/gcc/pkg/MESSAGE index c30c15c9a09..e6ffcf58cc9 100644 --- a/lang/gcc/pkg/MESSAGE +++ b/lang/gcc/pkg/MESSAGE @@ -1,3 +1,8 @@ -To use "@@PKGNAME@@" invoke "@@MAKE@@" like this: +====================================================================== +$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:29 wiz Exp $ -@@MAKE@@ MAKECONF=@@PREFIX@@/etc/@@PKGNAME@@.mk [...] +To use ${PKGNAME} invoke "${MAKE}" like this: + +${MAKE} MAKECONF=${PREFIX}/etc/${PKGNAME}.mk [...] + +====================================================================== diff --git a/lang/gcc/pkg/MESSAGE.SunOS b/lang/gcc/pkg/MESSAGE.SunOS index 52df517a2ed..93be4ad57ac 100644 --- a/lang/gcc/pkg/MESSAGE.SunOS +++ b/lang/gcc/pkg/MESSAGE.SunOS @@ -1,2 +1,7 @@ +====================================================================== +$NetBSD: MESSAGE.SunOS,v 1.2 2001/01/29 11:34:29 wiz Exp $ + To avoid conflicts with e.g. Sun WorkShop the GNU C compiler can only be invoked as "gcc" but not as "cc". + +====================================================================== diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile index b727cc6eb29..42f1c4fdbaa 100644 --- a/lang/jdk/Makefile +++ b/lang/jdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2000/11/18 00:40:50 tv Exp $ +# $NetBSD: Makefile,v 1.20 2001/01/29 11:34:30 wiz Exp $ # .include "../../mk/bsd.prefs.mk" @@ -15,9 +15,11 @@ HOMEPAGE= http://www.quick.com.au/java/ CONFLICTS= blackdown-j* sun-j* .include "../../mk/bsd.prefs.mk" + .if !defined(JDK_HOME) JDK_HOME:= ${LOCALBASE}/java .endif +MESSAGE_SUBST+= JDK_HOME=${JDK_HOME} .if ${OBJECT_FMT} == "ELF" DISTNAME= jdk${VERSION}-rc1-elf @@ -34,7 +36,6 @@ CHECK_SHLIBS= no NO_BUILD= yes # since we change PREFIX: NO_MTREE= yes -MESSAGE_FILE= ${WRKDIR}/.MESSAGE ONLY_FOR_PLATFORM= NetBSD-*-i386 RESTRICTED= "No redistribution of the Java(tm) Development Kit" @@ -60,9 +61,6 @@ do-install: ${RM} -f ${WRKSRC}/*.orig ${MKDIR} ${JDK_HOME} cd ${WRKSRC} ; ${GTAR} pcf - . | ( cd ${JDK_HOME} ; ${GTAR} pvxf - ) - ${SED} \ - -e 's|@JDK_HOME@|${JDK_HOME}|g' \ - <${PKGDIR}/MESSAGE >${MESSAGE_FILE} .include "../../mk/bsd.pkg.mk" diff --git a/lang/jdk/pkg/MESSAGE b/lang/jdk/pkg/MESSAGE index 388248f5acc..49b9fb04ec5 100644 --- a/lang/jdk/pkg/MESSAGE +++ b/lang/jdk/pkg/MESSAGE @@ -1,8 +1,13 @@ -You may want to read @JDK_HOME@/README for details about running +====================================================================== +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:30 wiz Exp $ + +You may want to read ${JDK_HOME}/README for details about running this jdk. In a nutshell you may want to set the following in your shell environment: - CLASSPATH to @JDK_HOME@/lib/classes.zip:. - JAVA_HOME to @JDK_HOME@ + CLASSPATH to ${JDK_HOME}/lib/classes.zip:. + JAVA_HOME to ${JDK_HOME} + +and add ${JDK_HOME}/bin to your ${PATH}. -and add @JDK_HOME@/bin to your ${PATH}. +====================================================================== diff --git a/mail/exim/Makefile b/mail/exim/Makefile index cebbd32bb4e..be4cc7feedd 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/01/26 05:21:45 hubertf Exp $ +# $NetBSD: Makefile,v 1.19 2001/01/29 11:34:30 wiz Exp $ DISTNAME= exim-3.20 CATEGORIES= mail net @@ -11,12 +11,10 @@ MAINTAINER= ad@netbsd.org HOMEPAGE= http://www.exim.org/ USE_PERL5= yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE pre-patch: ${MKDIR} ${WRKSRC}/Local ${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.netbsd - ${SED} "s,@PREFIX@,${PREFIX}," < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} pre-configure: ${SED} -e 's:@PREFIX@:${PREFIX}:' \ diff --git a/mail/exim/pkg/MESSAGE b/mail/exim/pkg/MESSAGE index be074818c04..0400ae5c020 100644 --- a/mail/exim/pkg/MESSAGE +++ b/mail/exim/pkg/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2000/08/30 11:21:02 ad Exp $ +$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:30 wiz Exp $ To use exim, you will need to perform the following steps manually; it is inappropriate for this package to make the changes for you. @@ -7,13 +7,13 @@ inappropriate for this package to make the changes for you. 1. Add a `mail' user: mail:*:8:6::0:0:Mail subsystem:/var/mail:/sbin/nologin 2. Set the correct ownership and permissions on the exim log directory: chown mail:mail /var/log/exim && chmod 750 /var/log/exim -3. Read the documentation. Edit @PREFIX@/etc/exim/configure to taste. Note +3. Read the documentation. Edit ${PREFIX}/etc/exim/configure to taste. Note that depending on the version of NetBSD, the `aliases' file may be in /etc/mail and not /etc, as it was previously. 4. Back-up /etc/mailer.conf to /etc/mailer.conf.sendmail. - Copy @PREFIX@/etc/exim/mailer.conf.exim to /etc/mailer.conf. + Copy ${PREFIX}/etc/exim/mailer.conf.exim to /etc/mailer.conf. 5. Set sendmail=NO in /etc/rc.conf. Add the folllowing to /etc/rc.local: - echo -n ' exim'; @PREFIX@/etc/rc.d/exim.sh + echo -n ' exim'; ${PREFIX}/etc/rc.d/exim 6. Configuring log rotation is dependant on personal taste and the version of NetBSD in use. See weekly.conf(5), newsyslog(8), exicyclog and eximstats. diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index 3f08ab69957..33d027f9cf4 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/01/13 18:39:44 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2001/01/29 11:34:30 wiz Exp $ DISTNAME= imap-2000a PKGNAME= imap-uw-2000a @@ -11,8 +11,6 @@ HOMEPAGE= http://www.washington.edu/imap/ USE_LIBTOOL= # defined -MESSAGE_FILE= ${WRKDIR}/MESSAGE - INST_PROG= ${LIBTOOL} ${INSTALL_PROGRAM} INST_LIB= ${LIBTOOL} ${INSTALL_DATA} INC_DIR= ${PREFIX}/include/c-client @@ -41,10 +39,6 @@ post-build: ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ < ${WRKSRC}/src/ipopd/ipopd.8c > ${WRKDIR}/ipopd.8 -pre-install: - ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ - < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - do-install: ${INST_LIB} ${WRKSRC}/c-client/libimapuw.la ${PREFIX}/lib ${INST_PROG} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec diff --git a/mail/imap-uw/pkg/MESSAGE b/mail/imap-uw/pkg/MESSAGE index 41e0f16a23c..428c87095c6 100644 --- a/mail/imap-uw/pkg/MESSAGE +++ b/mail/imap-uw/pkg/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.6 2000/12/17 18:25:44 jlam Exp $ +$NetBSD: MESSAGE,v 1.7 2001/01/29 11:34:31 wiz Exp $ Add the following to /etc/services: @@ -12,12 +12,13 @@ Add the following to /etc/services: Add the following to /etc/inetd.conf: - imap stream tcp nowait root @PREFIX@/libexec/imapd imapd - imaps stream tcp nowait root @PREFIX@/libexec/imapd imapd - pop2 stream tcp nowait root @PREFIX@/libexec/ipop2d ipop2d - pop3 stream tcp nowait root @PREFIX@/libexec/ipop3d ipop3d - pop3s stream tcp nowait root @PREFIX@/libexec/ipop3d ipop3d + imap stream tcp nowait root ${PREFIX}/libexec/imapd imapd + imaps stream tcp nowait root ${PREFIX}/libexec/imapd imapd + pop2 stream tcp nowait root ${PREFIX}/libexec/ipop2d ipop2d + pop3 stream tcp nowait root ${PREFIX}/libexec/ipop3d ipop3d + pop3s stream tcp nowait root ${PREFIX}/libexec/ipop3d ipop3d To put the changes into effect, reboot the machine or "kill -HUP" your inetd. + =========================================================================== diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile index 713834e86d5..ec278a47977 100644 --- a/mail/majordomo/Makefile +++ b/mail/majordomo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/12/28 10:34:03 rh Exp $ +# $NetBSD: Makefile,v 1.10 2001/01/29 11:34:31 wiz Exp $ DISTNAME= majordomo-1.94.4 CATEGORIES= mail @@ -26,7 +26,6 @@ NO_BIN_ON_CDROM= ${NO_BIN_ON_FTP} ALL_TARGET= wrapper INSTALL_TARGET= install install-wrapper -MESSAGE_FILE= ${WRKDIR}/MESSAGE INSTALL_FILE= ${WRKDIR}/INSTALL DEINSTALL_FILE= ${WRKDIR}/DEINSTALL MAKEFILE= Makefile.netbsd @@ -36,8 +35,11 @@ MAJORDOMO_HOMEDIR?= /home MAJORDOMO_USER?= majordom MAJORDOMO_GROUP?= majordom -PLIST_SUBST= HOME=${MAJORDOMO_HOMEDIR} \ +PLIST_SUBST= HOME=${MAJORDOMO_HOMEDIR} \ MAJORDOMO_USER=${MAJORDOMO_USER} +MESSAGE_SUBST+= HOME=${MAJORDOMO_HOMEDIR} \ + MAJORDOMO_USER=${MAJORDOMO_USER} \ + MAJORDOMO_GROUP=${MAJORDOMO_GROUP} DOCDIR= ${PREFIX}/share/doc/majordomo DOCFILES= Changelog FUTURE INSTALL LICENSE NEWLIST README @@ -128,12 +130,6 @@ do-configure: < ${FILESDIR}/aliases.majordomo > ${WRKSRC}/aliases.majordomo pre-install: - @${SED} \ - -e 's:@PREFIX@:${PREFIX}:g' \ - -e 's:@HOME@:${MAJORDOMO_HOMEDIR}:g' \ - -e 's:@MAJORDOMO_USER@:${MAJORDOMO_USER}:g' \ - -e 's:@MAJORDOMO_GROUP@:${MAJORDOMO_GROUP}:g' \ - < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} # for safety's sake, if the user/group got deleted since configuration @${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL @@ -146,7 +142,7 @@ post-install: .for file in ${DOCDOCFILES} @${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${DOCDIR}/${file} .endfor - @${INSTALL_DATA} ${MESSAGE_FILE} ${DOCDIR}/post-install-notes + @${INSTALL_DATA} ${MESSAGE} ${DOCDIR}/post-install-notes ${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${EXDIR} .for dir in ${EXDIRS} @${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${EXDIR}/${dir} @@ -171,7 +167,7 @@ post-install: ${WRKSRC}/majordomo.cf ${EXDIR}/majordomo.cf # verify installation; requires interaction -check test: install +test: install ${PREFIX}/libexec/majordomo/wrapper config-test .include "../../mk/bsd.pkg.mk" diff --git a/mail/majordomo/pkg/MESSAGE b/mail/majordomo/pkg/MESSAGE index 2a85dec6d74..b99ca6bafe6 100644 --- a/mail/majordomo/pkg/MESSAGE +++ b/mail/majordomo/pkg/MESSAGE @@ -1,27 +1,31 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:31 wiz Exp $ + Post-Install Notes for Majordomo ================================ -Before you can use Majordomo, you will need to complete a few steps manually: +Before you can use Majordomo, you will need to complete a few steps +manually: - - install majordomo.cf in @HOME@/@MAJORDOMO_USER@. - Look in @PREFIX@/share/examples/majordomo for an example and be sure - to change instances of @HOSTNAME@ as appropriate. + - install majordomo.cf in ${HOME}/${MAJORDOMO_USER}. + Look in ${PREFIX}/share/examples/majordomo for an example and + be sure to change instances of ${HOSTNAME} as appropriate. - - create lists in @HOME@/@MAJORDOMO_USER@. - Look in @PREFIX@/share/doc/majordomo for information and see the - files and directories for an example list (example-l) in - @PREFIX@/share/examples/majordomo. Pay attention to the permissions - on the files and directories. + - create lists in ${HOME}/${MAJORDOMO_USER}. + Look in ${PREFIX}/share/doc/majordomo for information and see + the files and directories for an example list (example-l) in + ${PREFIX}/share/examples/majordomo. Pay attention to the + permissions on the files and directories. - - add a .forward file in @HOME@/@MAJORDOMO_USER@ (or an appropriate - alias) so administrative mail to @MAJORDOMO_USER@ gets redirected - properly. + - add a .forward file in ${HOME}/${MAJORDOMO_USER} (or an + appropriate alias) so administrative mail to + ${MAJORDOMO_USER} gets redirected properly. - install majordomo aliases for sendmail. - For example, create /etc/aliases.majordomo following the example in - @PREFIX@/share/examples/majordomo and add it to your sendmail - configuration. This can be done by adding a line similar to the - following to /etc/sendmail.cf : + For example, create /etc/aliases.majordomo following the + example in ${PREFIX}/share/examples/majordomo and add it to + your sendmail configuration. This can be done by adding a + line similar to the following to /etc/sendmail.cf : OA/etc/aliases.majordomo (for 8.6.x Sendmail), @@ -31,21 +35,24 @@ Before you can use Majordomo, you will need to complete a few steps manually: define(`ALIAS_FILE',/etc/aliases,/etc/aliases.majordomo') - - if the group for @MAJORDOMO_USER@ (@MAJORDOMO_GROUP@) is not daemon, - add @MAJORDOMO_USER@ as a trusted user for sendmail. This can be - done by adding a line similar to the following in /etc/sendmail.cf : + - if the group for ${MAJORDOMO_USER} (${MAJORDOMO_GROUP}) is not + daemon, add ${MAJORDOMO_USER} as a trusted user for sendmail. + This can be done by adding a line similar to the following + in /etc/sendmail.cf: - T@MAJORDOMO_USER@ + T${MAJORDOMO_USER} or a line similar to the following to your m4 macros file: - define(`confTRUSTED_USERS', @MAJORDOMO_USER@)dnl + define(`confTRUSTED_USERS', ${MAJORDOMO_USER})dnl - - be sure to run `newaliases' to create the sendmail database, and - be sure that sendmail knows about any changes to /etc/sendmail.cf - (e.g., reboot or rerun sendmail) + - be sure to run `newaliases' to create the sendmail database, + and be sure that sendmail knows about any changes to + /etc/sendmail.cf (e.g., reboot or restart sendmail) - add entries in /etc/newsyslog.conf to rotate the log in - @HOME@/@MAJORDOMO_USER@/Log if necessary + ${HOME}/${MAJORDOMO_USER}/Log if necessary. Enjoy Majordomo! + +=========================================================================== diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile index 2bd2c613ab7..48e4ee1edfe 100644 --- a/mail/procmail/Makefile +++ b/mail/procmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2000/08/26 14:26:57 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2001/01/29 11:34:31 wiz Exp $ # FreeBSD Id: Makefile,v 1.24 1997/05/14 14:40:34 ache Exp # @@ -12,8 +12,6 @@ HOMEPAGE= http://www.procmail.org/ INSTALL_TARGET= install-suid install.man MAKE_ENV= SHELL=/bin/sh -MESSAGE_FILE= ${WRKDIR}/MESSAGE - post-patch: ${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h-orig ${SED} -e 's|@LOCALBASE@|${LOCALBASE}|g' < ${WRKSRC}/config.h-orig \ @@ -23,9 +21,6 @@ post-patch: < ${WRKSRC}/man/procmail.man-orig \ > ${WRKSRC}/man/procmail.man -pre-install: - ${SED} -e 's,@PREFIX@,${PREFIX},g' ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" diff --git a/mail/procmail/pkg/MESSAGE b/mail/procmail/pkg/MESSAGE index 16be21a6674..711a80abf6f 100644 --- a/mail/procmail/pkg/MESSAGE +++ b/mail/procmail/pkg/MESSAGE @@ -1,12 +1,12 @@ -$NetBSD: MESSAGE,v 1.3 2000/08/26 14:26:59 wiz Exp $ - ============================================================= +$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:31 wiz Exp $ + Please note the following: - - The system-wide procmailrc is expected in @PREFIX@/etc - (e.g. @PREFIX@/etc/procmailrc). + - The system-wide procmailrc is expected in ${PREFIX}/etc + (e.g. ${PREFIX}/etc/procmailrc). - The system-wide procmailrc directory is expected in - @PREFIX@/etc (e.g. @PREFIX@/etc/procmailrcs/*). + ${PREFIX}/etc (e.g. ${PREFIX}/etc/procmailrcs/*). ============================================================= diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 9661d9bb90d..456bca1b54b 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2001/01/21 05:58:50 itojun Exp $ +# $NetBSD: Makefile,v 1.28 2001/01/29 11:34:31 wiz Exp $ DISTNAME= sendmail.8.11.2 PKGNAME= sendmail-8.11.2 @@ -24,7 +24,6 @@ NO_CONFIGURE= yes MAKE_ENV+= BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \ BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" -MESSAGE_FILE= ${WRKDIR}/MESSAGE WRKSRC= ${WRKDIR}/${PKGNAME} SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4 @@ -38,6 +37,7 @@ USE_DB2?= YES USE_DB2?= NO .endif +MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC PLIST_SRC= ${WRKDIR}/.PLIST_SRC DESCR_SRC= ${WRKDIR}/.DESCR_SRC @@ -86,14 +86,13 @@ do-build: post-build: ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \ <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.sendmail - ${SED} -e 's#@@PKGNAME@@#${PKGNAME}#g' \ - -e 's#@@PREFIX@@#${PREFIX}#g' \ - <${PKGDIR}/MESSAGE >${MESSAGE_FILE} ${CAT} ${PKGDIR}/PLIST.common ${PKGDIR}/PLIST.${LOWER_OPSYS} > ${PLIST_SRC} +test-build: + ${CP} ${PKGDIR}/MESSAGE ${MESSAGE_SRC} .if ${USE_DB2} == YES - ${ECHO} >>${MESSAGE_FILE} "" - ${ECHO} >>${MESSAGE_FILE} "If you are upgrading from \"sendmail\" 8.8.x don't forget to rebuild all" - ${ECHO} >>${MESSAGE_FILE} "databases with \"${PREFIX}/bin/newaliases\" and \"${PREFIX}/sbin/makemap\"." + ${ECHO} "" >> ${MESSAGE_SRC} + ${ECHO} "If you are upgrading from \"sendmail\" 8.8.x don't forget to rebuild all" >> ${MESSAGE_SRC} + ${ECHO} "databases with \"${PREFIX}/bin/newaliases\" and \"${PREFIX}/sbin/makemap\"." >> ${MESSAGE_SRC} ${ECHO} >>${PLIST_SRC} "@exec mv -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || true" ${ECHO} >>${PLIST_SRC} "@unexec mv -f /usr/sbin/makemap.8.8 /usr/sbin/makemap || true" .endif diff --git a/mail/sendmail/pkg/MESSAGE b/mail/sendmail/pkg/MESSAGE index a0d6221c0fd..2db816bdbd0 100644 --- a/mail/sendmail/pkg/MESSAGE +++ b/mail/sendmail/pkg/MESSAGE @@ -1,5 +1,7 @@ -To use "@@PKGNAME@@" as the system's mail transport agent you have -to install "@@PREFIX@@/etc/mailer.conf.sendmail" as global mailwrapper +$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:32 wiz Exp $ + +To use "${PKGNAME}" as the system's mail transport agent you have +to install "${PREFIX}/etc/mailer.conf.sendmail" as global mailwrapper configuration file. The command below will do that for you: -ln -fs @@PREFIX@@/etc/mailer.conf.sendmail /etc/mailer.conf +ln -fs ${PREFIX}/etc/mailer.conf.sendmail /etc/mailer.conf diff --git a/mail/sendmail88/Makefile b/mail/sendmail88/Makefile index d17d29b92dd..709f733c628 100644 --- a/mail/sendmail88/Makefile +++ b/mail/sendmail88/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $ +# $NetBSD: Makefile,v 1.2 2001/01/29 11:34:32 wiz Exp $ DISTNAME= sendmail.8.8.8 PKGNAME= sendmail-8.8.8 @@ -11,7 +11,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.sendmail.org/ MANCOMPRESSED_IF_MANZ= YES -MESSAGE_FILE= ${WRKSRC}/MESSAGE WRKSRC= ${WRKDIR}/${PKGNAME} M4DIR= ${PREFIX}/share/sendmail @@ -110,11 +109,11 @@ post-extract: do-configure: cd ${WRKSRC}; \ for FILE in ${FILESDIR}/${MAKEFILE} ${FILESDIR}/${MAKEFILE}.inc \ - ${FILESDIR}/mailer.conf ${PKGDIR}/MESSAGE; do \ + ${FILESDIR}/mailer.conf; do \ ${CP} $${FILE} .; \ done; \ ${CP} ${FILESDIR}/netbsd-proto.mc ${WRKSRC}/cf/cf; \ - for FILE in MESSAGE cf/README cf/feature/smrsh.m4 mailer.conf; do \ + for FILE in cf/README cf/feature/smrsh.m4 mailer.conf; do \ ${CP} $${FILE} tempfile; \ ${SED} -e 's#@@PKGNAME@@#${PKGNAME}#g' \ -e 's#@@PREFIX@@#${PREFIX}#g' \ diff --git a/mail/sendmail88/pkg/MESSAGE b/mail/sendmail88/pkg/MESSAGE index a0d6221c0fd..0ef122a12c8 100644 --- a/mail/sendmail88/pkg/MESSAGE +++ b/mail/sendmail88/pkg/MESSAGE @@ -1,5 +1,10 @@ -To use "@@PKGNAME@@" as the system's mail transport agent you have -to install "@@PREFIX@@/etc/mailer.conf.sendmail" as global mailwrapper +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:32 wiz Exp $ + +To use "${PKGNAME}" as the system's mail transport agent you have +to install "${PREFIX}/etc/mailer.conf.sendmail" as global mailwrapper configuration file. The command below will do that for you: -ln -fs @@PREFIX@@/etc/mailer.conf.sendmail /etc/mailer.conf +ln -fs ${PREFIX}/etc/mailer.conf.sendmail /etc/mailer.conf + +====================================================================== diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile index c8c75862652..787e001b91d 100644 --- a/mail/smtpfeed/Makefile +++ b/mail/smtpfeed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/01/21 06:02:27 itojun Exp $ +# $NetBSD: Makefile,v 1.11 2001/01/29 11:34:32 wiz Exp $ # Based on FreeBSD Id: Makefile,v 1.27 1999/04/03 08:25:18 itojun Exp # @@ -21,8 +21,6 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec # use bind8? #CONFIGURE_ARGS+= --with-bind8 -MESSAGE_FILE= ${WRKDIR}/MESSAGE - DOCS= COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \ ML-ADMIN ML-ADMIN.j OPTIONS OPTIONS.j README README.j \ RELEASE.NOTE SIGNAL SIGNAL.j TODO @@ -36,11 +34,6 @@ BUILD_DEFS+= USE_INET6 CONFIGURE_ARGS+=--enable-ipv6 .endif -post-build: - ${SED} -e 's#@@PKGNAME@@#${PKGNAME}#g' \ - -e 's#@@PREFIX@@#${PREFIX}#g' \ - < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCDIR} diff --git a/mail/smtpfeed/pkg/MESSAGE b/mail/smtpfeed/pkg/MESSAGE index 119f76db6d9..9110659d0db 100644 --- a/mail/smtpfeed/pkg/MESSAGE +++ b/mail/smtpfeed/pkg/MESSAGE @@ -1,8 +1,11 @@ -************************************************************** -Executable for @@PKGNAME@@ is installed into -@@PREFIX@@/libexec/smtpfeed. +====================================================================== +$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:32 wiz Exp $ + +The executable for ${PKGNAME} is installed into +${PREFIX}/libexec/smtpfeed. You'll need to prepare (1) sendmail with WIDE patch applied, and (2) properly configured sendmail.cf. -(1) is included in mail/sendmail pkgsrc. -************************************************************** +(1) is done in the mail/sendmail package. + +====================================================================== diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index f9ae0f98df1..89d8c260a79 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/01/25 17:52:51 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:32 wiz Exp $ DISTNAME= squirrelmail-1.0pre3 PKGNAME= squirrelmail-0.9.3 @@ -17,10 +17,10 @@ NO_BUILD= # defined DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL -MESSAGE_FILE= ${WRKDIR}/MESSAGE SM_SUBDIR= share/squirrelmail SMDIR= ${PREFIX}/${SM_SUBDIR} +MESSAGE_SUBST+= SMDIR=${SMDIR} post-extract: cd ${WRKSRC}; \ @@ -47,8 +47,6 @@ pre-install: -e "s|@CP@|${CP}|g" \ -e "s|@MKDIR@|${MKDIR}|g" \ ${PKGDIR}/INSTALL > ${INSTALL_FILE} - ${SED} -e "s|@SMDIR@|${SMDIR}|g" \ - ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: diff --git a/mail/squirrelmail/pkg/MESSAGE b/mail/squirrelmail/pkg/MESSAGE index 26750448402..0d6b5637124 100644 --- a/mail/squirrelmail/pkg/MESSAGE +++ b/mail/squirrelmail/pkg/MESSAGE @@ -1,16 +1,16 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2001/01/24 22:44:13 jlam Exp $ +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:33 wiz Exp $ You will need to make SquirrelMail accessible through your HTTP server. If you are running Apache and ap-php, then you may either symlink - @SMDIR@ + ${SMDIR} into DocumentRoot, or add the following lines to httpd.conf: - Alias /mail/ "@SMDIR@" + Alias /mail/ "${SMDIR}" - <Directory "@SMDIR@"> + <Directory "${SMDIR}"> Options Indexes MultiViews AllowOverride None Order allow,deny diff --git a/math/abacus/Makefile b/math/abacus/Makefile index 91b8ecdf7e2..955d68a949f 100644 --- a/math/abacus/Makefile +++ b/math/abacus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/01/24 18:44:59 he Exp $ +# $NetBSD: Makefile,v 1.9 2001/01/29 11:34:33 wiz Exp $ # FreeBSD Id: Makefile,v 1.3 1998/09/25 10:07:44 asami Exp # @@ -18,8 +18,6 @@ BROKEN= This package has been updated to compile with tcl-8.3.2, but dumps core USE_GMAKE= yes USE_X11BASE= yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE - pre-patch: @for d in `${FIND} ${WRKSRC} -name RCS -type d -print`; do \ ${MV} $$d $$d-dist; \ @@ -30,9 +28,6 @@ pre-patch: # @ ${RM} -f ${WRKSRC}/canvas # @ ${LN} -fs ${WRKSRC}/canvas-tcl8.0.0 ${WRKSRC}/canvas -pre-install: - ${SED} -e "s_@PREFIX@_${PREFIX}_" < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - do-install: @ ${SED} s!@PREFIX@!${PREFIX}!g ${WRKSRC}/abacus >${WRKSRC}/abacus.sh @ ${INSTALL_SCRIPT} ${WRKSRC}/abacus.sh ${PREFIX}/bin/abacus diff --git a/math/abacus/pkg/MESSAGE b/math/abacus/pkg/MESSAGE index 65d07e0bd42..9e1c7b20ee7 100644 --- a/math/abacus/pkg/MESSAGE +++ b/math/abacus/pkg/MESSAGE @@ -1,4 +1,5 @@ -$NetBSD: MESSAGE,v 1.2 2000/09/03 23:08:34 wiz Exp $ +====================================================================== +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:33 wiz Exp $ Define the following environment variables: @@ -7,6 +8,8 @@ Define the following environment variables: ABACUS_BROWSER - web browser to view WWW pages and info. e.g.: - setenv ABACUS_HOME @PREFIX@/share/abacus + setenv ABACUS_HOME ${PREFIX}/share/abacus setenv ABACUS_EDITOR emacs setenv ABACUS_BROWSER netscape + +====================================================================== diff --git a/misc/fd/Makefile b/misc/fd/Makefile index 984cb04fbb6..258a638c447 100644 --- a/misc/fd/Makefile +++ b/misc/fd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/10/19 04:26:39 hubertf Exp $ +# $NetBSD: Makefile,v 1.11 2001/01/29 11:34:34 wiz Exp $ # FreeBSD: ports/misc/fd/Makefile,v 1.14 1999/08/25 07:21:37 obrien Exp # @@ -11,7 +11,6 @@ MASTER_SITES= ftp://ftp.ics.es.osaka-u.ac.jp/pub/FDclone/ \ MAINTAINER= Nobuhiro Yasutomi <nobu@psrc.isac.co.jp> MANLANG= ja -MAN1= fd.1 MAKE_ENV= LANG=${MANLANG} DOCS= README FAQ HISTORY ToAdmin @@ -25,6 +24,5 @@ post-install: @for i in ${DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd; \ done - @${CAT} ${PKGDIR}/MESSAGE .include "../../mk/bsd.pkg.mk" diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile index ee422cff3f2..9a7f56be437 100644 --- a/misc/jitterbug/Makefile +++ b/misc/jitterbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/12/08 09:43:06 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2001/01/29 11:34:34 wiz Exp $ DISTNAME= jitterbug-1.6.2 WRKSRC= ${WRKDIR}/${PKGNAME}/source @@ -20,7 +20,6 @@ ADDGROUP= ${LOCALBASE}/sbin/groupadd PLIST_SRC= ${WRKDIR}/PLIST-src INSTALL_FILE= ${WRKDIR}/INSTALL DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -MESSAGE_FILE= ${WRKDIR}/MESSAGE CONFIGDIR= ${WRKDIR}/${PKGNAME}/config DOCSDIR= ${WRKDIR}/${PKGNAME}/docs CGIBINDIR= libexec/cgi-bin @@ -60,6 +59,10 @@ JB_EMAIL?= ${JB_LOCALMAIL}@${JB_FQHOSTNAME} HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} +MESSAGE_SUBST+= JB_USER=${JB_USER} \ + JB_PACKAGE=${JB_PACKAGE} \ + JB_LOCALMAIL=${JB_LOCALMAIL} + pre-extract: .if ${JB_FQHOSTNAME} == "totally.unknown.domain" @${ECHO} @@ -161,13 +164,6 @@ pre-install: >${WRKDIR}/NEWPACKAGE @${SED} \ -e 's|@JB_USER@|${JB_USER}|g' \ - -e 's|@JB_PACKAGE@|${JB_PACKAGE}|g' \ - -e 's|@PREFIX@|${PREFIX}|g' \ - -e 's|@JB_LOCALMAIL@|${JB_LOCALMAIL}|g' \ - <${PKGDIR}/MESSAGE \ - >${MESSAGE_FILE} - @${SED} \ - -e 's|@JB_USER@|${JB_USER}|g' \ -e 's|@JB_GROUP@|${JB_GROUP}|g' \ -e 's|@JB_PACKAGE@|${JB_PACKAGE}|g' \ -e 's|@PREFIX@|${PREFIX}|g' \ @@ -232,7 +228,7 @@ do-install: ${WRKDIR}/jitterbug.auth ${PREFIX}/${JB_USER}/etc ${MKDIR} ${PREFIX}/${JB_USER}/doc ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644 \ - ${MESSAGE_FILE} ${PREFIX}/${JB_USER}/doc/POSTINSTALL + ${MESSAGE} ${PREFIX}/${JB_USER}/doc/POSTINSTALL ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644 \ ${WRKDIR}/NEWPACKAGE ${PREFIX}/${JB_USER}/doc ${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644 \ diff --git a/misc/jitterbug/pkg/MESSAGE b/misc/jitterbug/pkg/MESSAGE index 564d8a2e988..9c2d2ed3d32 100644 --- a/misc/jitterbug/pkg/MESSAGE +++ b/misc/jitterbug/pkg/MESSAGE @@ -1,29 +1,29 @@ - =============================================================================== +$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:34 wiz Exp $ + Jitterbug now has successfully been installed on your system. Before using jitterbug you should perform the following steps: -o Set a system password for the @JB_USER@ user (as root) +o Set a system password for the ${JB_USER} user (as root) -o Set a htpasswd for the @JB_USER@ user (using htpasswd): - htpasswd @PREFIX@/@JB_USER@/etc/jitterbug.auth @JB_USER@ +o Set a htpasswd for the ${JB_USER} user (using htpasswd): + htpasswd ${PREFIX}/${JB_USER}/etc/jitterbug.auth ${JB_USER} o Customize (if necessary) - @PREFIX@/etc/jitterbug/@JB_PACKAGE@ and - @PREFIX@/etc/jitterbug/@JB_PACKAGE@.private + ${PREFIX}/etc/jitterbug/${JB_PACKAGE} and + ${PREFIX}/etc/jitterbug/${JB_PACKAGE}.private o Customize the html documents in the project's bug tracking directory: - @PREFIX@/@JB_USER@/@JB_PACKAGE@/bug_tracking + ${PREFIX}/${JB_USER}/${JB_PACKAGE}/bug_tracking -o Add an alias for @JB_USER@ to your mail aliases: +o Add an alias for ${JB_USER} to your mail aliases: The details on how to do this depend on which MTA you use. For standard sendmail, add the following lines to your aliases files (/etc/aliases or /etc/mail/aliases): - @JB_LOCALMAIL@: "|@PREFIX@/@JB_USER@/bin/new_message @JB_PACKAGE@" + ${JB_LOCALMAIL}: "|${PREFIX}/${JB_USER}/bin/new_message ${JB_PACKAGE}" -o Append @PREFIX@/etc/jitterbug/httpd.conf.add to your httpd.conf - (typically @PREFIX@/etc/httpd/httpd.conf) and restart your httpd. +o Append ${PREFIX}/etc/jitterbug/httpd.conf.add to your httpd.conf + (typically ${PREFIX}/etc/httpd/httpd.conf) and restart your httpd. =============================================================================== - diff --git a/misc/staroffice/Makefile b/misc/staroffice/Makefile index 7eec9dd206c..e695b1226cd 100644 --- a/misc/staroffice/Makefile +++ b/misc/staroffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/08/31 02:35:27 hubertf Exp $ +# $NetBSD: Makefile,v 1.14 2001/01/29 11:34:34 wiz Exp $ # DISTNAME= so51a_lnx_${LANGNO} @@ -69,7 +69,6 @@ LANGSUB= 51AA9999 PLIST_SUBST+= LANGNO=${LANGNO} PLIST_SRC= ${WRKDIR}/PLIST -MESSAGE_FILE= ${WRKDIR}/MESSAGE INSTALL_FILE= ${WRKDIR}/INSTALL do-fetch: @@ -135,9 +134,7 @@ post-install: >${WRKDIR}/${file} ${INSTALL_SCRIPT} ${WRKDIR}/${file} ${PREFIX}/bin .endfor -.for file in MESSAGE INSTALL - ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' < ${PKGDIR}/${file} \ - >${WRKDIR}/${file} -.endfor + ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' < ${FILESDIR}/INSTALL \ + >$WRKDIR}/INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/misc/staroffice/pkg/MESSAGE b/misc/staroffice/pkg/MESSAGE index 89ba9d84d3b..e17170b22ff 100644 --- a/misc/staroffice/pkg/MESSAGE +++ b/misc/staroffice/pkg/MESSAGE @@ -1,14 +1,15 @@ -$NetBSD: MESSAGE,v 1.1.1.1 1999/11/22 21:23:49 rh Exp $ - ========================================================================== - StarOffice has now been installed in @@PREFIX@@/Office51. +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:34 wiz Exp $ + + StarOffice has now been installed in ${PREFIX}/Office51. Before using this package for the first time, each user has to run - @@PREFIX@@/bin/sosetup. Thereafter, StarOffice can be started using - the @@PREFIX@@/bin/soffice command. + ${PREFIX}/bin/sosetup. Thereafter, StarOffice can be started using + the ${PREFIX}/bin/soffice command. Please note that under NetBSD the program will pop up a requester, complaining that it is unable to load the 'PluginManager' component. This is normal and can be ignored (you can simply click away the requester). + ========================================================================== diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 9d35c868de9..3d234789d64 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.653 2001/01/29 01:56:51 jwise Exp $ +# $NetBSD: bsd.pkg.mk,v 1.654 2001/01/29 11:34:21 wiz Exp $ # # This file is in the public domain. # @@ -504,9 +504,21 @@ INSTALL_FILE= ${PKGDIR}/INSTALL DEINSTALL_FILE= ${PKGDIR}/DEINSTALL .endif -# Set MESSAGE_FILE to be the name of any MESSAGE file -.if !defined(MESSAGE_FILE) && exists(${PKGDIR}/MESSAGE) -MESSAGE_FILE= ${PKGDIR}/MESSAGE +# Set MESSAGE_SRC to be the name of any MESSAGE file, if ${MESSAGE} +# hasn't be defined +.if !defined(MESSAGE_SRC) && !defined(MESSAGE) && exists(${PKGDIR}/MESSAGE) +MESSAGE_SRC= ${PKGDIR}/MESSAGE +.endif + +.if defined(MESSAGE_SRC) +MESSAGE= ${WRKDIR}/.MESSAGE + +# Set MESSAGE_SUBST to substitute "${variable}" to "value" in MESSAGE +MESSAGE_SUBST+= PKGNAME=${PKGNAME} \ + PREFIX=${PREFIX} \ + LOCALBASE=${LOCALBASE} \ + X11PREFIX=${X11PREFIX} \ + X11BASE=${X11BASE} .endif .if (${OPSYS} == "SunOS") @@ -715,8 +727,8 @@ PKG_ARGS_COMMON+= -i ${INSTALL_FILE} .ifdef DEINSTALL_FILE PKG_ARGS_COMMON+= -k ${DEINSTALL_FILE} .endif -.ifdef MESSAGE_FILE -PKG_ARGS_COMMON+= -D ${MESSAGE_FILE} +.ifdef MESSAGE +PKG_ARGS_COMMON+= -D ${MESSAGE} .endif .ifndef NO_MTREE PKG_ARGS_COMMON+= -m ${MTREE_FILE} @@ -1636,7 +1648,7 @@ _PORT_USE: .USE .endif -real-su-install: +real-su-install: ${MESSAGE} .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER) .if defined(CONFLICTS) ${_PKG_SILENT}${_PKG_DEBUG} \ @@ -1757,10 +1769,10 @@ real-su-install: ${_PKG_SILENT}${_PKG_DEBUG}\ ${MAKE} ${MAKEFLAGS} do-shlib-handling SHLIB_PLIST_MODE=0 .endif # OPSYS == "NetBSD" || OPSYS == "SunOS" -.ifdef MESSAGE_FILE +.ifdef MESSAGE @${ECHO_MSG} "${_PKGSRC_IN}> Please note the following:" @${ECHO_MSG} "" - @${CAT} ${MESSAGE_FILE} + @${CAT} ${MESSAGE} @${ECHO_MSG} "" .endif .if !defined(NO_PKG_REGISTER) @@ -3130,7 +3142,7 @@ print-PLIST: # accordance to the @pkgdep directive in the packing lists .if !target(fake-pkg) -fake-pkg: ${PLIST} ${DESCR} +fake-pkg: ${PLIST} ${DESCR} ${MESSAGE} ${_PKG_SILENT}${_PKG_DEBUG}\ if [ ! -f ${PLIST} -o ! -f ${COMMENT} -o ! -f ${DESCR} ]; then \ ${ECHO} "** Missing package files for ${PKGNAME} - installation not recorded."; \ @@ -3215,9 +3227,9 @@ fake-pkg: ${PLIST} ${DESCR} ${CP} ${DEINSTALL_FILE} ${PKG_DBDIR}/${PKGNAME}/+DEINSTALL; \ fi; \ fi; \ - if [ -n "${MESSAGE_FILE}" ]; then \ - if ${TEST} -e ${MESSAGE_FILE}; then \ - ${CP} ${MESSAGE_FILE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \ + if [ -n "${MESSAGE}" ]; then \ + if ${TEST} -e ${MESSAGE}; then \ + ${CP} ${MESSAGE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \ fi; \ fi; \ list="`${MAKE} ${MAKEFLAGS} run-depends-list PACKAGE_DEPENDS_QUICK=true ECHO_MSG=${TRUE} | sort -u`" ; \ @@ -3349,6 +3361,19 @@ PERL5_GENERATE_PLIST= ${PERL5_COMMENT}; \ PERL5_GENERATE_PLIST= ${TRUE} .endif +message: ${MESSAGE} +.ifdef MESSAGE +${MESSAGE}: ${MESSAGE_SRC} + ${_PKG_SILENT}${_PKG_DEBUG} \ + if [ -z "${MESSAGE_SRC}" ]; then \ + ${ECHO} "${MESSAGE_SRC} not found."; \ + ${ECHO} "Please set MESSAGE_SRC correctly."; \ + else \ + ${SED} ${MESSAGE_SUBST:S/=/}!/:S/$/!g/:S/^/ -e s!\\\${/}\ + ${MESSAGE_SRC} > ${MESSAGE}; \ + fi +.endif + plist: ${PLIST} ${PLIST}: ${PLIST_SRC} ${_PKG_SILENT}${_PKG_DEBUG} \ diff --git a/net/arla/Makefile b/net/arla/Makefile index 421afde4eca..9838c57c6b6 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/01/26 05:21:45 hubertf Exp $ +# $NetBSD: Makefile,v 1.12 2001/01/29 11:34:34 wiz Exp $ # DISTNAME= arla-0.34.5 @@ -29,14 +29,13 @@ CONFIGURE_ARGS+= --with-krb4=${PREFIX} CONFIGURE_ARGS+= --with-arlacachedir=${ARLA_CACHE} .endif -PLIST_SRC= ${WRKDIR}/PLIST -MESSAGE_FILE= ${WRKDIR}/MESSAGE - .if defined(ARLA_CACHE) CACHEDIR= ${ARLA_CACHE} .else CACHEDIR= ${LOCALBASE}/cache .endif +MESSAGE_SUBST+= ARLA_CACHE=${CACHEDIR} +PLIST_SUBST+= ARLA_CACHE=${CACHEDIR} post-patch: # This is ugly. Utterly ugly. Sigh. @@ -87,15 +86,6 @@ do-configure: # while arla expects LDFLAGS=-R${LOCALBASE} @(LDFLAGS= ; cd ${WRKSRC}; ./configure ${CONFIGURE_ARGS}) -pre-install: - @${SED} -e 's|@ARLA_CACHE@|${CACHEDIR}|g' \ - <${PKGDIR}/PLIST \ - >${PLIST_SRC} - @${SED} -e 's|@PREFIX@|${PREFIX}|g' \ - -e 's|@ARLA_CACHE@|${CACHEDIR}|g' \ - <${PKGDIR}/MESSAGE \ - >${MESSAGE_FILE} - post-install: @${ECHO} " " @if [ -e ${CACHEDIR} ]; then \ diff --git a/net/arla/pkg/MESSAGE b/net/arla/pkg/MESSAGE index 329e2a68af7..db9de211a65 100644 --- a/net/arla/pkg/MESSAGE +++ b/net/arla/pkg/MESSAGE @@ -1,21 +1,24 @@ =============================================================================== +$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:35 wiz Exp $ + Arla now has been installed on your system. -The cache directory used by arla is @ARLA_CACHE@. +The cache directory used by arla is ${ARLA_CACHE}. This directory should be on a local disk. You can change the location of the cache directory by setting the ARLA_CACHE environment variable (or by setting ARLA_CACHE in /etc/mk.conf) to the desired location prior to building arla. To complete the installation you'll have to configure arla. -Default configuration files are installed in @PREFIX@/etc. +Default configuration files are installed in ${PREFIX}/etc. At a minimum, to configure an arla client, copy -@PREFIX@/etc/{CellServDB,SuidCells,ThisCell,arla.conf}.default to -@PREFIX@/etc/{CellServDB,SuidCells,ThisCell,arla.conf} and customize them. +${PREFIX}/etc/{CellServDB,SuidCells,ThisCell,arla.conf}.default to +${PREFIX}/etc/{CellServDB,SuidCells,ThisCell,arla.conf} and customize them. Start arlad from rc.local, using the script provided in -@PREFIX@/etc/rc.d/arlad.sh and include an entry for xfs in your /etc/fstab -(see @PREFIX@/share/examples/arla/fstab). -Also, append @PREFIX@/share/examples/arla/services to /etc/services and -append @PREFIX@/share/examples/arla/lkm.conf to /etc/lkm.conf. +${PREFIX}/etc/rc.d/arlad and include an entry for xfs in your /etc/fstab +(see ${PREFIX}/share/examples/arla/fstab). +Also, append ${PREFIX}/share/examples/arla/services to /etc/services and +append ${PREFIX}/share/examples/arla/lkm.conf to /etc/lkm.conf. + =============================================================================== diff --git a/net/arla/pkg/PLIST b/net/arla/pkg/PLIST index 548cc6984d1..c4e65a09609 100644 --- a/net/arla/pkg/PLIST +++ b/net/arla/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2001/01/26 05:21:46 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.6 2001/01/29 11:34:35 wiz Exp $ include/atypes.h include/fs_errors.h include/base64.h @@ -98,10 +98,10 @@ man/man3/cmd.3 @unexec install-info --delete %D/info/arla.info %D/info/dir info/arla.info @exec install-info %D/info/arla.info %D/info/dir -@exec if [ ! -e @ARLA_CACHE@ ] ; then /bin/mkdir -p @ARLA_CACHE@; /bin/chmod 700 @ARLA_CACHE@; chown root @ARLA_CACHE@; fi +@exec if [ ! -e ${ARLA_CACHE} ] ; then /bin/mkdir -p ${ARLA_CACHE}; /bin/chmod 700 ${ARLA_CACHE}; chown root ${ARLA_CACHE}; fi @exec if [ ! -e /sbin/mount_xfs ]; then /bin/ln -s %D/bin/mount_xfs /sbin/mount_xfs; fi @exec if ! /usr/bin/grep xfs_mod /etc/lkm.conf 2>/dev/null 1>&2 ; then /bin/cat %D/share/examples/arla/lkm.conf >> /etc/lkm.conf; fi @exec if ! /usr/bin/grep afs3-bos /etc/services 2>/dev/null 1>&2 ; then /bin/cat %D/share/examples/arla/services >> /etc/services; fi @exec if ! /usr/bin/grep afs /etc/fstab 2>/dev/null 1>&2 ; then /bin/cat %D/share/examples/arla/fstab >> /etc/fstab; fi @unexec /bin/rm -f /sbin/mount_xfs -@unexec /bin/rm -rf @ARLA_CACHE@ +@unexec /bin/rm -rf ${ARLA_CACHE} diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile index dce7f653db7..f70fcc36f18 100644 --- a/net/ddclient/Makefile +++ b/net/ddclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/09/03 12:36:55 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:35 wiz Exp $ # DISTNAME= ddclient-2.3.1 @@ -10,11 +10,6 @@ HOMEPAGE= http://burry.net/ddclient NO_BUILD= yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE - -pre-install: - ${SED} -e "s,@PREFIX@,${PREFIX},g" ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - do-install: ${SED} \ -e 's,@LOCALBASE@,${LOCALBASE},g' \ diff --git a/net/ddclient/pkg/MESSAGE b/net/ddclient/pkg/MESSAGE index d5c2c022fa5..6aefbfd4ff6 100644 --- a/net/ddclient/pkg/MESSAGE +++ b/net/ddclient/pkg/MESSAGE @@ -1,6 +1,9 @@ -$NetBSD: MESSAGE,v 1.2 2000/09/03 12:36:55 wiz Exp $ +====================================================================== +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:35 wiz Exp $ 1. Please register at http://www.dyndns.org/ -2. Copy @PREFIX@/etc/ddclient.conf-example to @PREFIX@/etc/ddclient.conf +2. Copy ${PREFIX}/etc/ddclient.conf-example to ${PREFIX}/etc/ddclient.conf and adjust to your needs. + +====================================================================== diff --git a/net/dhid/Makefile b/net/dhid/Makefile index da7038d1ab4..703f7d8e267 100644 --- a/net/dhid/Makefile +++ b/net/dhid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/09/03 12:40:50 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/01/29 11:34:35 wiz Exp $ # DISTNAME= dhid-4.0.1 @@ -10,15 +10,11 @@ HOMEPAGE= http://www.dhis.org/ DEPENDS+= gmp-[0-9]*:../../devel/gmp -MESSAGE_FILE= ${WRKDIR}/MESSAGE - do-configure: ${SED} \ -e "s,@PREFIX@,${PREFIX},g" \ -e "s,@ECHO@,${ECHO},g" \ < ${FILESDIR}/dhid.sh > ${WRKDIR}/dhid.sh - ${SED} -e "s,@PREFIX@,${PREFIX},g" \ - < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dhid ${PREFIX}/sbin diff --git a/net/dhid/pkg/MESSAGE b/net/dhid/pkg/MESSAGE index 37534269129..82ea4eaa91f 100644 --- a/net/dhid/pkg/MESSAGE +++ b/net/dhid/pkg/MESSAGE @@ -1,11 +1,12 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2000/09/12 15:18:42 jlam Exp $ +$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:35 wiz Exp $ If you don't already have a FQDN with dhis.org domain, you will need to register at http://www.dhis.org/dhis/register.html. -You will need to setup @PREFIX@/etc/dhid.conf with settings for +You will need to setup ${PREFIX}/etc/dhid.conf with settings for `idnumber', `fqdn', and `password' with your DHIS-provided host id number, FQDN with dhis.org domain, and update password, respectively. You receive these values when registering with dhis.org (see above). + =========================================================================== diff --git a/net/icsi-finger/Makefile b/net/icsi-finger/Makefile index 4ace836fdf8..6f1fd74f9de 100644 --- a/net/icsi-finger/Makefile +++ b/net/icsi-finger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1999/07/05 20:45:43 tron Exp $ +# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:35 wiz Exp $ # DISTNAME= icsi-finger-1.0.27 @@ -11,8 +11,6 @@ MAINTAINER= is@netbsd.org USE_X11= yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE - XMPLD= ${PREFIX}/share/examples/icsi-finger XMPLDT= ${XMPLD}/targets @@ -39,8 +37,6 @@ pre-configure: $$i.bak > $$i ; \ ${RM} -f $$i.bak ; \ done - ${SED} -e s@/usr/pkg@${PREFIX}@g ${PKGDIR}/MESSAGE | \ - fmt >${WRKDIR}/MESSAGE do-${INSTALL}: ${INSTALL} -c -m 755 ${WRKSRC}/src/finger ${PREFIX}/bin/gfinger diff --git a/net/icsi-finger/pkg/MESSAGE b/net/icsi-finger/pkg/MESSAGE index 31b99d1fae3..fd2467195f8 100644 --- a/net/icsi-finger/pkg/MESSAGE +++ b/net/icsi-finger/pkg/MESSAGE @@ -1,3 +1,6 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:36 wiz Exp $ + This is the NetBSD package for ICSI-finger, a more advanced version of GNU finger. @@ -5,12 +8,14 @@ This needs a log of configuration to be useful. Therefore it isn't activated when installed. You'll find example configuration files in -/usr/pkg/share/examples/icsi-finger and -/usr/pkg/share/examples/icsi-finger/targets, and are strongly advised +${PREFIX}/share/examples/icsi-finger and +${PREFIX}/share/examples/icsi-finger/targets, and are strongly advised to read the gfingerd and cfingerd man pages. Also, if you activate the package, you'll need to append -/usr/pkg/share/examples/icsi-finger/inetd.conf-add to /etc/inetd.conf, -/usr/pkg/share/examples/icsi-finger/services-add to /etc/services, and +${PREFIX}/share/examples/icsi-finger/inetd.conf-add to /etc/inetd.conf, +${PREFIX}/share/examples/icsi-finger/services-add to /etc/services, and (on the master finger server) -/usr/pkg/share/examples/icsi-finger/rc.local-add to /etc/rc.local. +${PREFIX}/share/examples/icsi-finger/rc.local-add to /etc/rc.local. + +====================================================================== diff --git a/net/ispman/Makefile b/net/ispman/Makefile index 574b267a592..1c215eeef1a 100644 --- a/net/ispman/Makefile +++ b/net/ispman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/01/25 10:46:40 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:36 wiz Exp $ # DISTNAME= ispman-0.5 @@ -19,7 +19,6 @@ DEPENDS+= postfix>=19991231pl08:../../mail/postfix .endif USE_PERL5= YES -MESSAGE_FILE= ${WRKDIR}/MESSAGE ISPMAN_HTDOCS?= ${PREFIX}/share/ispman/virtual ISPMAN_IP?= 127.0.0.1 @@ -47,7 +46,5 @@ do-build: do-install: cd ${WRKSRC} && ${PERL5} ./pkginstall.pl && \ ${INSTALL_DATA} ispman.ldif ${PREFIX}/etc/ispman - ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' < ${PKGDIR}/MESSAGE \ - > ${WRKDIR}/MESSAGE .include "../../mk/bsd.pkg.mk" diff --git a/net/ispman/pkg/MESSAGE b/net/ispman/pkg/MESSAGE index aec2b54e639..e8dfa026215 100644 --- a/net/ispman/pkg/MESSAGE +++ b/net/ispman/pkg/MESSAGE @@ -1,27 +1,28 @@ -$NetBSD: MESSAGE,v 1.1.1.1 2000/10/21 19:02:32 rh Exp $ - ========================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:36 wiz Exp $ + ISPMan has now been installed on your system. Before using this package, copy the default configuration from - '@@PREFIX@@/etc/ispman/ispman.conf.default' to - '@@PREFIX@@/etc/ispman/ispman.conf' (and edit it accordingly). + '${PREFIX}/etc/ispman/ispman.conf.default' to + '${PREFIX}/etc/ispman/ispman.conf' (and edit it accordingly). You also need to create the appropriate template files in - '@@PREFIX@@/etc/ispman/templates' (or copy them from the + '${PREFIX}/etc/ispman/templates' (or copy them from the corresponding .default files that can be found there). Finally, you need a working apache, cyrus-imapd, postfix, openldap, PAM, and pam-ldap setup. ISPMan configuration templates for openldap can be found under - '@@PREFIX@@/etc/openldap/ldap.conf.ispman' and - '@@PREFIX@@/etc/openldap/slapd.conf.ispman'. Thereafter, you can + '${PREFIX}/etc/openldap/ldap.conf.ispman' and + '${PREFIX}/etc/openldap/slapd.conf.ispman'. Thereafter, you can initialize openldap by issuing the following command: - @@PREFIX@@/sbin/ldif2ldbm -i @@PREFIX@@/etc/ispman/ispman.ldif + ${PREFIX}/sbin/ldif2ldbm -i ${PREFIX}/etc/ispman/ispman.ldif On the machine(s) you are running cyrus on, you need to have pam-ldap and an PAM-enabled cyrus-sasl installed and configured (see the corresponding packages for more information). + ========================================================================== diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index aee8810ac10..4969e22c458 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2000/10/23 13:47:53 bouyer Exp $ +# $NetBSD: Makefile,v 1.21 2001/01/29 11:34:36 wiz Exp $ # FreeBSD Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp # @@ -33,8 +33,6 @@ CONFIGURE_ARGS+= --with-png-lib=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-png-inc=${LOCALBASE}/include .endif -MESSAGE_FILE= ${WRKDIR}/MESSAGE - post-build: ${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/mrtg.conf.example \ >${WRKDIR}/mrtg.conf.example @@ -42,8 +40,6 @@ post-build: >${WRKDIR}/netstat2mrtg ${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/sys2mrtg \ >${WRKDIR}/sys2mrtg - ${SED} s#@PREFIX@#${PREFIX}#g <${PKGDIR}/MESSAGE \ - >${MESSAGE_FILE} do-install: ${INSTALL_DATA_DIR} ${PREFIX}/etc/mrtg diff --git a/net/mrtg/pkg/MESSAGE b/net/mrtg/pkg/MESSAGE index 48b2cb7e537..ef2e8d5c3c7 100644 --- a/net/mrtg/pkg/MESSAGE +++ b/net/mrtg/pkg/MESSAGE @@ -1,6 +1,5 @@ ============================================================================= - -$NetBSD: MESSAGE,v 1.6 2000/10/20 16:07:01 bouyer Exp $ +$NetBSD: MESSAGE,v 1.7 2001/01/29 11:34:36 wiz Exp $ The Multi Router Traffic Grapher is now installed. Do note that three programs have changed names to more readily reflect their MRTG-specific @@ -9,10 +8,10 @@ function; make sure to prefix them with "mrtg": cfgmaker -> mrtgcfgmaker indexmaker -> mrtgindexmaker -The documentation can be found at @PREFIX@/share/doc/mrtg/manual.html; +The documentation can be found at ${PREFIX}/share/doc/mrtg/manual.html; there is a .txt version there as well. A sample config file collecting various datas from a NetBSD machine can -be found in @PREFIX@/etc/mrtg/. +be found in ${PREFIX}/etc/mrtg/. ============================================================================= diff --git a/net/netsaint-base/Makefile b/net/netsaint-base/Makefile index c3e943a626a..790b5b2e7ce 100644 --- a/net/netsaint-base/Makefile +++ b/net/netsaint-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/01/16 16:23:07 rh Exp $ +# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:36 wiz Exp $ # DISTNAME= netsaint-0.0.6 @@ -13,13 +13,10 @@ DEPENDS+= gd>1.8.1:../../graphics/gd .include "Makefile.common" -MESSAGE_FILE= ${WRKDIR}/MESSAGE - post-configure: ${SED} <${FILESDIR}/netsaint-setup.sh >${WRKDIR}/netsaint-setup.sh \ -e 's:@@USER@@:${NETSAINT_USER}:g' \ -e 's:@@GROUP@@:${NETSAINT_GROUP}:g' - ${SED} -e 's:@@PREFIX@@:${PREFIX}:g' <${PKGDIR}/MESSAGE >${MESSAGE_FILE} post-install: cd ${WRKSRC} && ${MAKE} install-config diff --git a/net/netsaint-base/pkg/MESSAGE b/net/netsaint-base/pkg/MESSAGE index 37671b23bda..cf738de7a05 100644 --- a/net/netsaint-base/pkg/MESSAGE +++ b/net/netsaint-base/pkg/MESSAGE @@ -1,9 +1,9 @@ -$NetBSD: MESSAGE,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $ - ========================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:37 wiz Exp $ + netsaint-base has now been installed. Before using this package for the first time, you need to run 'netsaint-setup.sh' and then set up the - configuration files in @@PREFIX@@/etc/netsaint (simply copy over the + configuration files in ${PREFIX}/etc/netsaint (simply copy over the sample configuration files you find there and edit them accordingly). If you want to use the web frontend, you need to make sure that the @@ -14,4 +14,5 @@ $NetBSD: MESSAGE,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $ Please note that without plug-ins, this package will not do anything useful. It is therefore recommended to install the 'netsaint-plugins' package as well. + ========================================================================== diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile index 5ab9d8a629d..1deb7c2d457 100644 --- a/net/ntp4/Makefile +++ b/net/ntp4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/08/18 19:39:53 fredb Exp $ +# $NetBSD: Makefile,v 1.14 2001/01/29 11:34:37 wiz Exp $ # DISTNAME= ntp-4.0.99k @@ -17,10 +17,6 @@ CONFIGURE_ENV+= "LIBS=-ltermcap" # for ntpdc DOCDIR= ${PREFIX}/share/doc EXAMPLESDIR= ${PREFIX}/share/examples -MESSAGE_FILE= ${WRKDIR}/MESSAGE - -post-build: - ${SED} 's|@PREFIX@|${PREFIX}|g' < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE post-install: cd ${WRKSRC}; \ diff --git a/net/ntp4/pkg/MESSAGE b/net/ntp4/pkg/MESSAGE index 501c9dca36f..97bcdd807dd 100644 --- a/net/ntp4/pkg/MESSAGE +++ b/net/ntp4/pkg/MESSAGE @@ -1,7 +1,10 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:37 wiz Exp $ + THERE ARE NO MAN PAGES. All installed documentation is accessible through - file:/@PREFIX@/share/doc/ntp4/index.htm + file:/${PREFIX}/share/doc/ntp4/index.htm User to user support is available at @@ -12,3 +15,5 @@ and online docs are viewable through NTP's home at http://www.ntp.org/ or http://www.eecis.udel.edu/~ntp/ + +====================================================================== diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile index b4fca85358d..d66d9aec4b8 100644 --- a/net/ra-rtsp-proxy/Makefile +++ b/net/ra-rtsp-proxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/01/26 05:21:46 hubertf Exp $ +# $NetBSD: Makefile,v 1.7 2001/01/29 11:34:37 wiz Exp $ DISTNAME= rtspd-src-1.0.0.0 PKGNAME= ra-rtsp-proxy-1.0.0.0 @@ -19,7 +19,6 @@ NO_BIN_ON_CDROM= ${RESTRICTED} DOWNLOAD= http://proforma.real.com/mario/devzone/rtspproxyform.html -MESSAGE_FILE= ${WRKDIR}/MESSAGE WRKSRC= ${WRKDIR}/rtspd-1.0.0.0a do-fetch: @@ -34,8 +33,6 @@ do-fetch: post-build: ${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/rtspd.sh >${WRKDIR}/rtspd.sh - @${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE \ - >${MESSAGE_FILE} do-install: ${INSTALL_SCRIPT} ${WRKDIR}/rtspd.sh ${PREFIX}/etc/rc.d/rtspd diff --git a/net/ra-rtsp-proxy/pkg/MESSAGE b/net/ra-rtsp-proxy/pkg/MESSAGE index 4f5856aaec8..c90996b061e 100644 --- a/net/ra-rtsp-proxy/pkg/MESSAGE +++ b/net/ra-rtsp-proxy/pkg/MESSAGE @@ -1 +1,6 @@ -Please add "@PREFIX@/etc/rc.d/rtspd.sh" to "/etc/rc.local". +====================================================================== +$NetBSD + +Please add "${PREFIX}/etc/rc.d/rtspd" to "/etc/rc.local". + +====================================================================== diff --git a/net/radius/Makefile b/net/radius/Makefile index 5638fde120f..76dd500d9f4 100644 --- a/net/radius/Makefile +++ b/net/radius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2000/02/29 01:13:35 kim Exp $ +# $NetBSD: Makefile,v 1.16 2001/01/29 11:34:38 wiz Exp $ # # Tempted to install another radius package? # @@ -37,7 +37,6 @@ MAKE_ENV+= RADLIBS="${RADLIBS} -lskey" LIBS=-lcrypt \ INSTALL="${INSTALL} -c" INSTALL_TARGET= man-install install util-install config-install -MESSAGE_FILE= ${WRKDIR}/MESSAGE WRKSRC= ${WRKDIR} pre-patch: @@ -47,8 +46,4 @@ pre-patch: ${PATCH} -s .endfor -post-build: - @${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE \ - >${MESSAGE_FILE} - .include "../../mk/bsd.pkg.mk" diff --git a/net/radius/pkg/MESSAGE b/net/radius/pkg/MESSAGE index afb65c8154b..a41a65e2f92 100644 --- a/net/radius/pkg/MESSAGE +++ b/net/radius/pkg/MESSAGE @@ -1,2 +1,8 @@ -To use the The Merit AAA Server you have to copy the contents of the directory -"@PREFIX@/share/examples/radius" to "/etc/raddb" and to customize it. +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:38 wiz Exp $ + +To use the The Merit AAA Server you have to copy the contents of +the directory "${PREFIX}/share/examples/radius" to "/etc/raddb" +and to customize it. + +====================================================================== diff --git a/net/upclient/Makefile b/net/upclient/Makefile index 2b251fca546..44034fb68a5 100644 --- a/net/upclient/Makefile +++ b/net/upclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/01/26 04:45:33 hubertf Exp $ +# $NetBSD: Makefile,v 1.7 2001/01/29 11:34:38 wiz Exp $ # DISTNAME= upclient-4.09 @@ -10,7 +10,6 @@ MASTER_SITES= http://www.atomicvoid.net/uptimes/ \ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.uptimes.net/ -MESSAGE_FILE= ${WRKDIR}/.MESSAGE ALL_TARGET= upclient .if !defined(UPCLIENT_LOGIN) || \ @@ -19,11 +18,6 @@ ALL_TARGET= upclient IS_INTERACTIVE= yes .endif -post-extract: - ${SED} \ - -e 's|@PREFIX@|${PREFIX}|g' \ - ${PKGDIR}/MESSAGE >${MESSAGE_FILE} - post-patch: ${MV} ${WRKSRC}/upchk ${WRKSRC}/upchk.bak ${SED} \ diff --git a/net/upclient/pkg/MESSAGE b/net/upclient/pkg/MESSAGE index 4bfad100d36..01ea137b3e2 100644 --- a/net/upclient/pkg/MESSAGE +++ b/net/upclient/pkg/MESSAGE @@ -1,2 +1,7 @@ -To start the Uptime Client, run the @PREFIX@/etc/rc.d/upclient.sh +====================================================================== +$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:38 wiz Exp $ + +To start the Uptime Client, run the ${PREFIX}/etc/rc.d/upclient script either manually or via /etc/rc.local. + +====================================================================== diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile index 35ca9d1b4f5..ce8b334fdc9 100644 --- a/parallel/glunix/Makefile +++ b/parallel/glunix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2000/10/21 22:52:37 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/01/29 11:34:39 wiz Exp $ DISTNAME= glunix-release-1-0a PKGNAME= glunix-1.0a @@ -23,9 +23,8 @@ IS_INTERACTIVE= yes NO_MTREE= yes NO_WRKSUBDIR= yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE - NOW_ROOT= ${LOCALBASE}/now +MESSAGE_SUBST+= NOW_ROOT=${NOW_ROOT} .if (${MACHINE} == "i386") FLAGS= "-m486 -DL_ENDIAN" @@ -56,7 +55,6 @@ pre-configure: fi pre-install: - ${SED} -e 's|\$${NOW_ROOT}|${NOW_ROOT}|g' ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} @${ECHO} "updating /etc/shells"; ${CP} /etc/shells /etc/shells.bak; ( ${GREP} -v ${NOW_ROOT}/bin/glush /etc/shells.bak; \ diff --git a/parallel/glunix/pkg/MESSAGE b/parallel/glunix/pkg/MESSAGE index f2b3b580739..4cf2086aa9d 100644 --- a/parallel/glunix/pkg/MESSAGE +++ b/parallel/glunix/pkg/MESSAGE @@ -1,3 +1,6 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:39 wiz Exp $ + QUICK START GUIDE: Change your directory to the now installation base, eg: @@ -28,3 +31,5 @@ Here is a sample run_glunix command: Once the run_glunix command has successfully completed, you can run "glustat" to find out how many nodes came up. + +====================================================================== diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile index 2ee60bf7e0e..e07d888c5e1 100644 --- a/parallel/pvm3/Makefile +++ b/parallel/pvm3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2000/10/21 22:53:35 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2001/01/29 11:34:39 wiz Exp $ DISTNAME= pvm3.4.3 PKGNAME= pvm-3.4.3 @@ -23,14 +23,10 @@ MAKE_ENV+= PVM_ROOT=${WRKSRC} MAKE_ENV+= PVM_ARCH= MAKE_ENV+= SSH=${SSH} ALL_TARGET= all install -MESSAGE_FILE= ${WRKDIR}/MESSAGE PLIST_SRC= ${WRKDIR}/PLIST-src PVM_DIR= ${PREFIX}/pvm3 -pre-install: - ${SED} "s_@PREFIX@_${PREFIX}_g" < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - do-install: PVM_ARCH=`${PVM_ROOT}/lib/pvmgetarch` ; export PVM_ARCH ;\ ${INSTALL_PROGRAM_DIR} ${PVM_DIR}/bin/$$PVM_ARCH ;\ diff --git a/parallel/pvm3/pkg/MESSAGE b/parallel/pvm3/pkg/MESSAGE index 1bd5c533656..a92e75ac5bf 100644 --- a/parallel/pvm3/pkg/MESSAGE +++ b/parallel/pvm3/pkg/MESSAGE @@ -1,11 +1,14 @@ -$NetBSD: MESSAGE,v 1.4 2000/09/03 13:02:21 wiz Exp $ +====================================================================== +$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:39 wiz Exp $ -You must set the environment variable PVM_ROOT to @PREFIX@/pvm3 in your +You must set the environment variable PVM_ROOT to ${PREFIX}/pvm3 in your startup files (.cshrc, .profile) on all machines in the cluster. In addition, you may want to add the lines contained in -@PREFIX@/pvm3/lib/cshrc.stub to the system .cshrc. +${PREFIX}/pvm3/lib/cshrc.stub to the system .cshrc. You can specify each host's run path in your pvmhosts file like so: -hostname ep=@PREFIX@/bin +hostname ep=${PREFIX}/bin This allows you to point different architecture types to various sets of shared or local binaries. See pvmd(1) for more information. + +====================================================================== diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index a13164e7d06..23d8ecbe192 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/01/18 17:05:50 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2001/01/29 11:34:39 wiz Exp $ # DISTNAME= xpkgwedge-1.1 @@ -16,7 +16,6 @@ NO_CHECKSUM= # defined DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL -MESSAGE_FILE= ${WRKDIR}/MESSAGE .include "../../mk/bsd.prefs.mk" @@ -44,8 +43,6 @@ do-build: < ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} ${SED} -e "s,@X11BASE@,${X11BASE},g" \ < ${PKGDIR}/INSTALL > ${INSTALL_FILE} - ${SED} -e "s,@PREFIX@,${PREFIX},g" \ - < ${PKGDIR}/MESSAGE.pre > ${MESSAGE_FILE} do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/config diff --git a/pkgtools/xpkgwedge/pkg/MESSAGE.pre b/pkgtools/xpkgwedge/pkg/MESSAGE index 230ad06225e..5cbea1cbc94 100644 --- a/pkgtools/xpkgwedge/pkg/MESSAGE.pre +++ b/pkgtools/xpkgwedge/pkg/MESSAGE @@ -1,5 +1,5 @@ ========================================================================== -$NetBSD: MESSAGE.pre,v 1.6 2000/10/23 17:32:08 jlam Exp $ +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:39 wiz Exp $ NOTES: @@ -7,7 +7,7 @@ NOTES: /etc/csh.login by hand in order to make pkgs built with xpkgwedge run properly, e.g. - XAPPLRESDIR=@PREFIX@/lib/X11/app-defaults + XAPPLRESDIR=${PREFIX}/lib/X11/app-defaults If any users set XAPPLRESDIR in their own environment, these settings will not work -- such users need to set XUSERFILESEARCHPATH (syntax diff --git a/print/pcps/Makefile b/print/pcps/Makefile index 81b95c73796..8c21e765844 100644 --- a/print/pcps/Makefile +++ b/print/pcps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/11/23 13:47:00 rh Exp $ +# $NetBSD: Makefile,v 1.2 2001/01/29 11:34:40 wiz Exp $ # DISTNAME= pcps840 @@ -13,17 +13,13 @@ HOMEPAGE= http://www.swreg.org/soft_shop/695/shopscr3.shtml MAKEFILE= makefile ALL_TARGET= MAKE_ENV+= "CC=${CC} ${CFLAGS} -DUNIX" -MESSAGE_FILE= ${WRKDIR}/MESSAGE +NO_CONFIGURE= yes LICENSE= shareware RESTRICTED= This is shareware for your evaluation and subsequent payment NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM=${RESTRICTED} -do-configure: - ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' < ${PKGDIR}/MESSAGE \ - >${WRKDIR}/MESSAGE - do-install: @${INSTALL_PROGRAM} ${WRKSRC}/pcps ${PREFIX}/bin/pcps @${INSTALL_MAN} ${FILESDIR}/pcps.1 ${PREFIX}/man/man1 diff --git a/print/pcps/pkg/MESSAGE b/print/pcps/pkg/MESSAGE index e422539a613..65c3c4967e4 100644 --- a/print/pcps/pkg/MESSAGE +++ b/print/pcps/pkg/MESSAGE @@ -1,12 +1,13 @@ -$NetBSD: MESSAGE,v 1.1.1.1 2000/11/23 13:47:00 rh Exp $ +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:40 wiz Exp $ ---------------------------------------------------------- - The configuration f\ile is set for US 8.5x11 inch paper + The configuration file is set for US 8.5x11 inch paper and some other options you may wish to customize. PCPS is Copyright (c) 1992-2000 by MicroSource. PCPS IS NOT FREE, this version is SHAREWARE. - See @@PREFIX@@/share/doc/pcps/license.doc for details. ---------------------------------------------------------- + See ${PREFIX}/share/doc/pcps/license.doc for details. + +====================================================================== diff --git a/security/amavis/Makefile b/security/amavis/Makefile index f6f872db427..afae0d3f0b2 100644 --- a/security/amavis/Makefile +++ b/security/amavis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/10/23 14:52:53 rh Exp $ +# $NetBSD: Makefile,v 1.4 2001/01/29 11:34:40 wiz Exp $ # DISTNAME= amavis-0.2.1-pre3 @@ -30,14 +30,10 @@ CONFIGURE_ENV+= procmail="/usr/libexec/mail.local" CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR} CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO} -MESSAGE_FILE= ${WRKDIR}/MESSAGE - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/zipsecure/zipsecure ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/src/securetar/securetar ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/src/scanmails/scanmails ${PREFIX}/sbin - ${SED} -e 's#@PREFIX@#${PREFIX}#g' < ${PKGDIR}/MESSAGE \ - >${WRKDIR}/MESSAGE ${SED} -e 's#@PREFIX@#${PREFIX}#g' < ${FILESDIR}/amavis.m4 \ >${WRKDIR}/amavis.m4 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/amavis diff --git a/security/amavis/pkg/MESSAGE b/security/amavis/pkg/MESSAGE index af25cdeee0b..cfc8556ec09 100644 --- a/security/amavis/pkg/MESSAGE +++ b/security/amavis/pkg/MESSAGE @@ -1,9 +1,9 @@ -$NetBSD: MESSAGE,v 1.3 2000/10/23 14:57:16 rh Exp $ - ========================================================================== +$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:40 wiz Exp $ + AMaViS has now been installed on your system. In order to integrate the virus scanner with sendmail, copy - @PREFIX@/share/examples/amavis/amavis.m4 to the 'mailer' sendmail + ${PREFIX}/share/examples/amavis/amavis.m4 to the 'mailer' sendmail configuration directory. Then use 'amavis' instead of 'local' for local mail delivery. Alternatively, you can simply replace @@ -16,7 +16,8 @@ Mlocal, P=/usr/libexec/mail.local, F=lsDFMAw5:/|@qrmn9, S=10/30, R=20/40, in your installed "sendmail.cf" by -Mlocal, P=@PREFIX@/sbin/scanmails, F=lsDFMAw5:/|@qrmn9, S=10/30, R=20/40, +Mlocal, P=${PREFIX}/sbin/scanmails, F=lsDFMAw5:/|@qrmn9, S=10/30, R=20/40, T=DNS/RFC822/X-Unix, A=scanmails -d $u + ========================================================================== diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index 8c4becb2844..e4a1ba94cbb 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/10/11 16:28:53 wennmach Exp $ +# $NetBSD: Makefile,v 1.7 2001/01/29 11:34:41 wiz Exp $ # DISTNAME= krb4-1.0.1 @@ -13,19 +13,12 @@ CRYPTO= yes GNU_CONFIGURE= yes #USE_GTEXINFO= yes #not currently needed -MESSAGE_FILE= ${WRKDIR}/MESSAGE - post-patch: @${SED} -e 's|@PREFIX@|${PREFIX}|g' \ <${WRKSRC}/lib/kafs/kafs.h \ >${WRKSRC}/lib/kafs/kafs.h.sed @${MV} ${WRKSRC}/lib/kafs/kafs.h.sed ${WRKSRC}/lib/kafs/kafs.h -pre-install: - @${SED} -e 's|@PREFIX@|${PREFIX}|g' \ - <${PKGDIR}/MESSAGE \ - >${MESSAGE_FILE} - post-install: @${MKDIR} ${PREFIX}/share/examples/kth-krb4 ${INSTALL_DATA} ${WRKSRC}/etc/krb.conf ${PREFIX}/share/examples/kth-krb4 diff --git a/security/kth-krb4/pkg/MESSAGE b/security/kth-krb4/pkg/MESSAGE index ee8e173e9c4..a291d383b71 100644 --- a/security/kth-krb4/pkg/MESSAGE +++ b/security/kth-krb4/pkg/MESSAGE @@ -1,13 +1,16 @@ =============================================================================== +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:41 wiz Exp $ + Kth-krb4 now has been installed on your system. To complete the installation you'll have to configure Kerberos. More information on how to configure Kerberos is available via the "info" command. Sample configuration files are installed in -@PREFIX@/share/examples/kth-krb4. +${PREFIX}/share/examples/kth-krb4. At a minimum, to configure a Kerberos client, copy -@PREFIX@/share/examples/kth-krb4/{krb.conf,krb.realms} to /etc and +${PREFIX}/share/examples/kth-krb4/{krb.conf,krb.realms} to /etc and customize them. Also, apply the patches provided in services.diff to /etc/services. + =============================================================================== diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 1e61af28863..2427e92f471 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2001/01/10 16:05:52 tron Exp $ +# $NetBSD: Makefile,v 1.35 2001/01/29 11:34:41 wiz Exp $ DISTNAME= openssh-2.3.0p1 CATEGORIES= security @@ -48,7 +48,6 @@ BUILD_DEFS+= SSH_CONF_DIR DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL -MESSAGE_FILE= ${WRKDIR}/MESSAGE # matches what's in `Configure' (except sparc64 and alpha, see PR 10984) ONLY_FOR_PLATFORM= NetBSD-*-arm32 NetBSD-*-i386 \ @@ -60,6 +59,8 @@ ONLY_FOR_PLATFORM= NetBSD-*-arm32 NetBSD-*-i386 \ SSH_CONF_DIR?= /etc +MESSAGE_SUBST+= SSH_CONF_DIR=${SSH_CONF_DIR} + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${SSH_CONF_DIR} CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE} @@ -87,7 +88,6 @@ post-build: ${PKGDIR}/DEINSTALL \ ${PKGDIR}/INSTALL \ ${PKGDIR}/INSTALL.SunOS \ - ${PKGDIR}/MESSAGE \ ${FILESDIR}/sshd.sh; \ do \ ${SED} -e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \ diff --git a/security/openssh/pkg/MESSAGE b/security/openssh/pkg/MESSAGE index 4ff54dcc806..1a754dc9bc5 100644 --- a/security/openssh/pkg/MESSAGE +++ b/security/openssh/pkg/MESSAGE @@ -1,13 +1,13 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.2 2000/09/28 09:25:15 jlam Exp $ +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:41 wiz Exp $ -If "starter" configuration files were installed (in @SSH_CONF_DIR@) +If "starter" configuration files were installed (in ${SSH_CONF_DIR}) when the package was installed, be sure to examine them (and the man pages for ssh and sshd) to determine whether you want to make any changes. Copies of the example configuration files are installed in -@PREFIX@/share/examples/ssh, so those can still be used for reference -after you have made changes to those installed in @SSH_CONF_DIR@, or if +${PREFIX}/share/examples/ssh, so those can still be used for reference +after you have made changes to those installed in ${SSH_CONF_DIR}, or if you had existing configuration files, which would not be overwritten in the installation process. @@ -15,5 +15,6 @@ In general, you will want to set up /etc/rc.local to start sshd at boot time. Something like the following should do the job: # Run sshd if installed and configured -@PREFIX@/etc/rc.d/sshd +${PREFIX}/etc/rc.d/sshd + ========================================================================== diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile index 2d34c46d6fe..a84f4a8ddd9 100644 --- a/security/smtpd/Makefile +++ b/security/smtpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/09/03 13:22:31 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:41 wiz Exp $ # DISTNAME= smtpd-2.0 @@ -11,7 +11,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.obtuse.com/smtpd.html SPOOL= /var/spool/smtpd -MESSAGE_FILE= ${WRKDIR}/MESSAGE pre-install: -${MKDIR} ${SPOOL}/etc @@ -20,8 +19,4 @@ pre-install: ${CHMOD} -R g=,o= ${SPOOL} ${CP} /etc/localtime /etc/resolv.conf ${SPOOL}/etc -post-build: - ${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE \ - >${MESSAGE_FILE} - .include "../../mk/bsd.pkg.mk" diff --git a/security/smtpd/pkg/MESSAGE b/security/smtpd/pkg/MESSAGE index ceac3b1a2d6..65fa24e97e8 100644 --- a/security/smtpd/pkg/MESSAGE +++ b/security/smtpd/pkg/MESSAGE @@ -1,5 +1,5 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.2 2000/09/03 13:22:31 wiz Exp $ +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:41 wiz Exp $ The necessary spool and configuration directories were created under /var/spool/smtpd. Please edit /var/spool/smtpd/etc/smtp_check_rules @@ -7,7 +7,8 @@ according to your taste. You will want to start smtpfwdd in rc.local, and add a line like -smtp stream tcp nowait root @PREFIX@/sbin/smtpd smtpd +smtp stream tcp nowait root ${PREFIX}/sbin/smtpd smtpd to your /etc/inetd.conf when you are done. + ========================================================================== diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 9002f76f2a2..023613925a5 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2000/09/26 19:59:54 fredb Exp $ +# $NetBSD: Makefile,v 1.85 2001/01/29 11:34:42 wiz Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -147,9 +147,10 @@ ROOT_GROUP?= wheel .endif DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -MESSAGE_FILE= ${WRKDIR}/MESSAGE PLIST_SRC= ${WRKDIR}/PLIST -PLIST_SUBST+= INSTALL="${INSTALL}" ROOT_GROUP="${ROOT_GROUP}" +PLIST_SUBST+= INSTALL="${INSTALL}" \ + ROOT_GROUP="${ROOT_GROUP}" +MESSAGE_SUBST+= SSH_CONF_DIR="${SSH_CONF_DIR}" pre-patch: @${MV} -f ${WRKSRC}/make-ssh-known-hosts.pl \ @@ -178,7 +179,7 @@ post-patch: post-build: @cd ${PKGDIR}; \ - for FILE in DEINSTALL MESSAGE PLIST ${FILESDIR}/sshd.sh; do \ + for FILE in DEINSTALL PLIST ${FILESDIR}/sshd.sh; do \ ${SED} -e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \ -e 's#@PREFIX@#${PREFIX}#g' \ <$${FILE} >${WRKDIR}/`basename $${FILE}`; \ diff --git a/security/ssh/pkg/MESSAGE b/security/ssh/pkg/MESSAGE index b99e81a15ee..f4c7d464fca 100644 --- a/security/ssh/pkg/MESSAGE +++ b/security/ssh/pkg/MESSAGE @@ -1,13 +1,13 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.4 2000/09/28 09:25:16 jlam Exp $ +$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:42 wiz Exp $ -If "starter" configuration files were installed (in @SSH_CONF_DIR@) +If "starter" configuration files were installed (in ${SSH_CONF_DIR}) when the package was installed, be sure to examine them (and the man pages for ssh and sshd) to determine whether you want to make any changes. Copies of the example configuration files are installed in -@PREFIX@/share/examples/ssh, so those can still be used for reference -after you have made changes to those installed in @SSH_CONF_DIR@, or if +${PREFIX}/share/examples/ssh, so those can still be used for reference +after you have made changes to those installed in ${SSH_CONF_DIR}, or if you had existing configuration files, which would not be overwritten in the installation process. @@ -15,5 +15,6 @@ In general, you will want to set up /etc/rc.local to start sshd at boot time. Something like the following should do the job: # Run sshd if installed and configured -@PREFIX@/etc/rc.d/sshd +${PREFIX}/etc/rc.d/sshd + ========================================================================== diff --git a/security/ssh6/Makefile b/security/ssh6/Makefile index 10c0ca3b85e..6d76edc6a76 100644 --- a/security/ssh6/Makefile +++ b/security/ssh6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/10/10 09:52:00 itojun Exp $ +# $NetBSD: Makefile,v 1.10 2001/01/29 11:34:42 wiz Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -145,8 +145,8 @@ CFLAGS+= -m68060 .endif DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -MESSAGE_FILE= ${WRKDIR}/MESSAGE PLIST_SRC= ${WRKDIR}/PLIST +MESSAGE_SUBST+= SSH_CONF_DIR=${SSH_CONF_DIR} pre-patch: @${MV} -f ${WRKSRC}/make-ssh-known-hosts.pl \ @@ -175,7 +175,7 @@ post-patch: post-build: @cd ${PKGDIR}; \ - for FILE in DEINSTALL MESSAGE PLIST ${FILESDIR}/sshd.sh; do \ + for FILE in DEINSTALL PLIST ${FILESDIR}/sshd.sh; do \ ${SED} -e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \ -e 's#@PREFIX@#${PREFIX}#g' \ <$${FILE} >${WRKDIR}/`basename $${FILE}`; \ diff --git a/security/ssh6/pkg/MESSAGE b/security/ssh6/pkg/MESSAGE index 35edbe53f41..ba81750658f 100644 --- a/security/ssh6/pkg/MESSAGE +++ b/security/ssh6/pkg/MESSAGE @@ -1,13 +1,13 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.2 2000/09/28 09:25:16 jlam Exp $ +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:42 wiz Exp $ -If "starter" configuration files were installed (in @SSH_CONF_DIR@) +If "starter" configuration files were installed (in ${SSH_CONF_DIR}) when the package was installed, be sure to examine them (and the man pages for ssh and sshd) to determine whether you want to make any changes. Copies of the example configuration files are installed in -@PREFIX@/share/examples/ssh, so those can still be used for reference -after you have made changes to those installed in @SSH_CONF_DIR@, or if +${PREFIX}/share/examples/ssh, so those can still be used for reference +after you have made changes to those installed in ${SSH_CONF_DIR}, or if you had existing configuration files, which would not be overwritten in the installation process. @@ -15,5 +15,6 @@ In general, you will want to set up /etc/rc.local to start sshd at boot time. Something like the following should do the job: # Run sshd if installed and configured -@PREFIX@/etc/rc.d/sshd +${PREFIX}/etc/rc.d/sshd + ========================================================================== diff --git a/security/sudo/Makefile b/security/sudo/Makefile index 4ad1acbfdd6..a29f34823b2 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2000/12/06 16:27:39 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2001/01/29 11:34:42 wiz Exp $ # FreeBSD Id: Makefile,v 1.9 1997/11/12 03:24:41 obrien Exp # @@ -43,7 +43,6 @@ CONFIGURE_ARGS+= --with-nbsdops --disable-path-info PLIST_SRC= ${PKGDIR}/PLIST.common PLIST_SRC+= ${PKGDIR}/PLIST.${LOWER_OPSYS} -MESSAGE_FILE= ${WRKDIR}/MESSAGE DOCDIR= ${PREFIX}/share/doc/sudo EGDIR= ${PREFIX}/share/examples/sudo @@ -51,10 +50,6 @@ EGDIR= ${PREFIX}/share/examples/sudo pre-configure: cd ${WRKSRC} && autoconf -post-build: - ${SED} -e "s,@PREFIX@,${PREFIX},g" \ - < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - post-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/UPGRADE ${DOCDIR} diff --git a/security/sudo/pkg/MESSAGE b/security/sudo/pkg/MESSAGE index f1ff8fa5979..d691cdc6dc4 100644 --- a/security/sudo/pkg/MESSAGE +++ b/security/sudo/pkg/MESSAGE @@ -1,9 +1,9 @@ ============================================================================= -$NetBSD: MESSAGE,v 1.1 2000/12/06 06:33:40 jlam Exp $ +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:42 wiz Exp $ If you are upgrading from a version of sudo prior to 1.6, then please read - @PREFIX@/share/doc/sudo/UPGRADE + ${PREFIX}/share/doc/sudo/UPGRADE on how to modify your sudoers file appropriately. diff --git a/security/xdm-krb4/Makefile b/security/xdm-krb4/Makefile index e627b78b7ed..d27c594c2fd 100644 --- a/security/xdm-krb4/Makefile +++ b/security/xdm-krb4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/01/26 05:21:48 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:43 wiz Exp $ # DISTNAME= xdm-krb4-3.3.6.2 @@ -13,8 +13,6 @@ DEPENDS+= kth-krb4-1.0.1:../../security/kth-krb4 USE_X11BASE= yes USE_IMAKE= yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE - .include "../../mk/bsd.prefs.mk" post-patch: @@ -24,9 +22,6 @@ post-patch: pre-install: @${SED} -e 's|@PREFIX@|${PREFIX}|g' \ - <${PKGDIR}/MESSAGE \ - >${MESSAGE_FILE} - @${SED} -e 's|@PREFIX@|${PREFIX}|g' \ <${FILESDIR}/xdm-krb4.sh \ >${WRKDIR}/xdm-krb4.sh diff --git a/security/xdm-krb4/pkg/MESSAGE b/security/xdm-krb4/pkg/MESSAGE index 2526f764a48..e5cae9c1577 100644 --- a/security/xdm-krb4/pkg/MESSAGE +++ b/security/xdm-krb4/pkg/MESSAGE @@ -1,6 +1,9 @@ =============================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:43 wiz Exp $ + xdm-krb4 now has been installed on your system. A startup file (e.g. for inclusion into your /etc/rc.local) is provided -in @PREFIX@/etc/rc.d/xdm-krb4.sh +in ${PREFIX}/etc/rc.d/xdm-krb4.sh + =============================================================================== diff --git a/textproc/t1lib/Makefile b/textproc/t1lib/Makefile index 0f52ef50454..7d2219e67c0 100644 --- a/textproc/t1lib/Makefile +++ b/textproc/t1lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/06/21 01:58:33 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/01/29 11:34:43 wiz Exp $ # DISTNAME= t1lib-1.0.1 @@ -15,13 +15,8 @@ USE_LIBTOOL= # defined USE_X11BASE= # defined WRKSRC= ${WRKDIR}/T1-1.0.1 -MESSAGE_FILE= ${WRKDIR}/MESSAGE ALL_TARGET= without_doc -post-build: - ${SED} -e 's|@@PREFIX@@|${PREFIX}|g' \ - < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - post-install: ${MKDIR} ${PREFIX}/share/t1lib cd ${WRKSRC}; \ diff --git a/textproc/t1lib/pkg/MESSAGE b/textproc/t1lib/pkg/MESSAGE index 3284d657d33..ce2cb918e3d 100644 --- a/textproc/t1lib/pkg/MESSAGE +++ b/textproc/t1lib/pkg/MESSAGE @@ -1,18 +1,18 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2000/06/21 01:58:40 jlam Exp $ +$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:43 wiz Exp $ Sample configs tailored for NetBSD may have been copied to -@@PREFIX@@/share/t1lib, but no existing files were overwritten. -More samples may be found in @@PREFIX@@/share/examples/t1lib. +${PREFIX}/share/t1lib, but no existing files were overwritten. +More samples may be found in ${PREFIX}/share/examples/t1lib. Most programs that use the lib will look first in the directory specified by the environment variable T1LIB_CONFIG_DIR, and then -@@PREFIX@@/share/t1lib. However, you *must* set T1LIB_CONFIG_DIR +${PREFIX}/share/t1lib. However, you *must* set T1LIB_CONFIG_DIR to run the "xglyph" test X client. E.g, for Bourne shells: - ``T1LIB_CONFIG_DIR=@@PREFIX@@/share/t1lib xglyph &'' + ``T1LIB_CONFIG_DIR=${PREFIX}/share/t1lib xglyph &'' The complete documentation requires LaTeX to build. If you have the print/teTeX package (or some other "tex"), -``cd @@PREFIX@@/share/doc/t1lib; make'' to build t1lib_doc.dvi. +``cd ${PREFIX}/share/doc/t1lib; make'' to build t1lib_doc.dvi. =========================================================================== diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile index 0b3af09fd45..0b3665280a8 100644 --- a/time/cardboard-schedule/Makefile +++ b/time/cardboard-schedule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/12/17 23:32:25 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2001/01/29 11:34:43 wiz Exp $ # DISTNAME= cs113ins @@ -20,7 +20,6 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} EXTRACT_CMD= (cd ${WRKDIR} && unzip -x ${DOWNLOADED_DISTFILE}) || ${TRUE} -MESSAGE_FILE= ${WRKDIR}/MESSAGE CSFILES= cs/images/Logo2.gif \ cs/images/Logo.gif \ @@ -37,7 +36,6 @@ post-build: ${SED} -e s,@PREFIX@,${PREFIX},g < ${FILESDIR}/csched.sh > ${WRKDIR}/csched.tmp ${SED} -e s,@LOCALBASE@,${LOCALBASE},g < ${WRKDIR}/csched.tmp > ${WRKDIR}/csched.tmp2 ${SED} -e s,@JAVA_HOME@,${JAVA_HOME},g < ${WRKDIR}/csched.tmp2 > ${WRKDIR}/csched - ${SED} -e s,@PREFIX@,${PREFIX},g < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE do-install: ${MKDIR} ${PREFIX}/lib/cardboard-schedule diff --git a/time/cardboard-schedule/pkg/MESSAGE b/time/cardboard-schedule/pkg/MESSAGE index 60096561d40..4f018b66132 100644 --- a/time/cardboard-schedule/pkg/MESSAGE +++ b/time/cardboard-schedule/pkg/MESSAGE @@ -1,6 +1,9 @@ ------------------------------------------------------------- +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:44 wiz Exp $ + A demo version of Cardboard Schedule has been installed. - Please read @PREFIX@/lib/cardboard-schedule/license.txt + Please read ${PREFIX}/lib/cardboard-schedule/license.txt before using Cardboard Schedule. ------------------------------------------------------------- + +====================================================================== diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile index a2f6d3f8bc0..c99fb6746c5 100644 --- a/wm/afterstep/Makefile +++ b/wm/afterstep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/01/25 12:36:16 fredb Exp $ +# $NetBSD: Makefile,v 1.4 2001/01/29 11:34:44 wiz Exp $ DISTNAME= AfterStep-1.8.0 PKGNAME= afterstep-1.8.0 @@ -34,8 +34,6 @@ CONFIGURE_ARGS+= --with-png-includes=${LOCALBASE}/include CONFIGURE_ARGS+= --with-png-lib=${LOCALBASE}/lib CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} -MESSAGE_FILE= ${WRKDIR}/MESSAGE - post-patch: for i in `${FIND} ${WRKSRC} -name "*.man" -print` \ ${WRKSRC}/autoconf/Makefile.common.in; do \ @@ -49,7 +47,4 @@ pre-configure: ${CHMOD} 755 configure; \ autoheader --localdir=autoconf autoconf/configure.in > autoconf/config.h.in; -post-build: - ${SED} 's|@PREFIX@|${PREFIX}|g' < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - .include "../../mk/bsd.pkg.mk" diff --git a/wm/afterstep/pkg/MESSAGE b/wm/afterstep/pkg/MESSAGE index b4f0bb6c487..f502e015bde 100644 --- a/wm/afterstep/pkg/MESSAGE +++ b/wm/afterstep/pkg/MESSAGE @@ -1,3 +1,6 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:44 wiz Exp $ + FIRST TIME USERS: To use afterstep as your window manager, simply invoke "exec afterstep" at the end of your .xinitrc (for "startx), or .xsession file (for xdm). @@ -6,15 +9,17 @@ Don't forget to comment out any line(s) for your current window manager. UPGRADERS: Afterstep-1.8.x is more configurable than ever, but note: the format of many of the configuration files has changed! In particular, it is no -longer necessary to maintain a complete copy of @PREFIX@/share/afterstep +longer necessary to maintain a complete copy of ${PREFIX}/share/afterstep in each home directory--your ~/Gnu/Library/Afterstep directory now need -only contain changes from the defaults in @PREFIX@/share/afterstep. +only contain changes from the defaults in ${PREFIX}/share/afterstep. Upgraders are advised to back up their old ~/Gnu/Library/Afterstep directory, and review the documentation before merging diffs carefully. EVERYBODY: The AfterStep Control Panel for 1.8.x is still under development. See the online docs--Wharf top button, or bottom item of start menu, -or view @PREFIX@/share/afterstep/doc/afterstep.html with any browser. +or view ${PREFIX}/share/afterstep/doc/afterstep.html with any browser. If you are connected to the Internet, a FAQ, mailing lists, and other resources may be found on the Afterstep Home Page: + +====================================================================== diff --git a/www/adzap/Makefile b/www/adzap/Makefile index e82420b72d8..e18afe0d6e3 100644 --- a/www/adzap/Makefile +++ b/www/adzap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/01/14 14:06:01 simonb Exp $ +# $NetBSD: Makefile,v 1.7 2001/01/29 11:34:44 wiz Exp $ # DISTNAME= adzap-20010112 @@ -9,8 +9,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.zip.com.au/~cs/adzap/index.html WRKSRC= ${WRKDIR}/adzap -MESSAGE_FILE= ${WRKDIR}/MESSAGE - NO_BUILD= # defined USE_PERL5= # defined @@ -32,8 +30,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/examples/adzap .endfor -post-install: - ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' < ${PKGDIR}/MESSAGE \ - >${WRKDIR}/MESSAGE - .include "../../mk/bsd.pkg.mk" diff --git a/www/adzap/pkg/MESSAGE b/www/adzap/pkg/MESSAGE index aea725bb26b..5bd8cf07bd0 100644 --- a/www/adzap/pkg/MESSAGE +++ b/www/adzap/pkg/MESSAGE @@ -1,12 +1,13 @@ -$NetBSD: MESSAGE,v 1.2 2000/04/25 15:50:21 rh Exp $ - ========================================================================== +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:44 wiz Exp $ + Adzap has now been installed. To get it up and running, copy - @@PREFIX@@/share/examples/adzap/adzap.conf to /etc and modify + ${PREFIX}/share/examples/adzap/adzap.conf to /etc and modify it to match your setup. Then edit your squid configuration and - add @@PREFIX@@/libexec/adzap as your http-redirector. + add ${PREFIX}/libexec/adzap as your http-redirector. If you run a web server, you can copy the *.{html,js,gif} files from - @@PREFIX@@/share/examples/adzap to your htdocs tree and modify + ${PREFIX}/share/examples/adzap to your htdocs tree and modify the web locations in /etc/adzap.conf accordingly. + ========================================================================== diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index 559953d9686..67688099e07 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/01/13 15:30:49 tv Exp $ +# $NetBSD: Makefile,v 1.27 2001/01/29 11:34:44 wiz Exp $ # DISTNAME= mod_ssl-2.7.1-1.3.14 @@ -18,8 +18,6 @@ CONFLICTS= apache-1.3.[0123456789] apache-*modssl-* apache6-* HAS_CONFIGURE= defined USE_SSL= defined -MESSAGE_FILE= ${WRKDIR}/MESSAGE - .include "../../mk/bsd.prefs.mk" CONFIGURE_ARGS+= --with-apxs=${PREFIX}/sbin/apxs @@ -35,8 +33,6 @@ post-build: post-install: @${SED} -e "s,@PREFIX@,${PREFIX},g" \ - < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - @${SED} -e "s,@PREFIX@,${PREFIX},g" \ < ${FILESDIR}/README.mkcert > ${WRKDIR}/README.mkcert @cd ${PREFIX}/lib/httpd; ${MV} -f libssl.so mod_ssl.so diff --git a/www/ap-ssl/pkg/MESSAGE b/www/ap-ssl/pkg/MESSAGE index 0ebf358fa2e..a8d0f8507b0 100644 --- a/www/ap-ssl/pkg/MESSAGE +++ b/www/ap-ssl/pkg/MESSAGE @@ -1,10 +1,10 @@ ============================================================================= -$NetBSD: MESSAGE,v 1.5 2000/10/13 21:48:02 jlam Exp $ +$NetBSD: MESSAGE,v 1.6 2001/01/29 11:34:45 wiz Exp $ You will need to generate certificates and keys for your server before Apache will start with mod_ssl support. Please read - @PREFIX@/share/doc/mod_ssl/README.mkcert + ${PREFIX}/share/doc/mod_ssl/README.mkcert for more information on how to do this. diff --git a/www/asWedit/Makefile b/www/asWedit/Makefile index c329d043e5d..8b78d71bb77 100644 --- a/www/asWedit/Makefile +++ b/www/asWedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/09/08 13:33:15 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/01/29 11:34:45 wiz Exp $ # DISTNAME= ${PKGNAME}-i386.linux @@ -25,7 +25,6 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} NO_BUILD= yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE CHECK_SHLIBS= no @@ -34,8 +33,6 @@ do-configure: ${SED} -e 's:/usr/local/lib:${PREFIX}/libdata:g' \ -e 's:^!!\*helpDir:*helpDir:' \ < AsWedit.bak > AsWedit - ${SED} -e 's:@@PREFIX@@:${PREFIX}:g' \ - < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE do-install: ${INSTALL_PROGRAM} ${WRKSRC}/asWedit ${PREFIX}/bin diff --git a/www/asWedit/pkg/MESSAGE b/www/asWedit/pkg/MESSAGE index 8a72a296dda..fa1d74ff750 100644 --- a/www/asWedit/pkg/MESSAGE +++ b/www/asWedit/pkg/MESSAGE @@ -1,12 +1,12 @@ -$NetBSD: MESSAGE,v 1.1.1.1 2000/07/17 09:39:05 rh Exp $ - ========================================================================== - asWedit has now been installed in @@PREFIX@@. +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:45 wiz Exp $ + + asWedit has now been installed in ${PREFIX}. Before using this package for the first time, each user has to merge - the contents of @@PREFIX@@/share/examples/asWedit/AsWedit with his/her + the contents of ${PREFIX}/share/examples/asWedit/AsWedit with his/her X resources. This can be done using the command - xrdb -merge @@PREFIX@@/share/examples/asWedit/AsWedit + xrdb -merge ${PREFIX}/share/examples/asWedit/AsWedit ========================================================================== diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index 97bc5a4a9fa..56ae7cd1b41 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/10/19 23:23:34 jwise Exp $ +# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:45 wiz Exp $ DISTNAME= Cocoon-1.8 PKGNAME= cocoon-1.8 @@ -31,13 +31,11 @@ WRKSRC= ${WRKDIR}/${PKGNAME} NO_CONFIGURE= USE_JAVA= yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE post-extract: ${RM} ${WRKSRC}/lib/fop_0_13_0.jar ${WRKSRC}/lib/servlet_2_2.jar \ ${WRKSRC}/lib/xalan_1_2_D02.jar ${WRKSRC}/lib/xerces_1_2.jar \ ${WRKSRC}/lib/bsf.jar ${WRKSRC}/lib/bsfengines.jar - ${SED} -e s,@PREFIX@,${PREFIX},g < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE # Yes -- you have to run build.sh _twice_. The first time triggers a bug in JDK-1.1 javac, # and the second time completes successfully. While we're at it, note that we can't diff --git a/www/cocoon/pkg/MESSAGE b/www/cocoon/pkg/MESSAGE index a5a041c6f83..0bcb1fece6c 100644 --- a/www/cocoon/pkg/MESSAGE +++ b/www/cocoon/pkg/MESSAGE @@ -1,21 +1,23 @@ ================================================================ +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:45 wiz Exp $ + Cocoon is now installed. To see cocoon in action, make sure that - @PREFIX@/lib/java/cocoon.jar, - @PREFIX@/lib/java/fop.jar, - @PREFIX@/lib/java/xalan.jar, - @PREFIX@/lib/java/xerces.jar, and - @PREFIX@/jakarta/tomcat/lib/servlet.jar + ${PREFIX}/lib/java/cocoon.jar, + ${PREFIX}/lib/java/fop.jar, + ${PREFIX}/lib/java/xalan.jar, + ${PREFIX}/lib/java/xerces.jar, and + ${PREFIX}/jakarta/tomcat/lib/servlet.jar are in your CLASSPATH and add - @PREFIX@/share/examples/java/cocoon + ${PREFIX}/share/examples/java/cocoon as a servlet context under Jakarta Tomcat. For more information, or for instructions on using cocoon with other servlet environments, see - @PREFIX@/share/doc/java/cocoon/install.html + ${PREFIX}/share/doc/java/cocoon/install.html ================================================================ diff --git a/www/htdig/Makefile b/www/htdig/Makefile index e6f63bc2e5d..5f22f29ca5c 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/02/29 23:31:32 hubertf Exp $ +# $NetBSD: Makefile,v 1.7 2001/01/29 11:34:45 wiz Exp $ # DISTNAME= htdig-3.1.5 @@ -17,11 +17,6 @@ CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \ --with-search-dir=${PREFIX}/share/examples/htdig CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include/db2 -MESSAGE_FILE= ${WRKDIR}/MESSAGE - -post-build: - ${SED} 's#@PREFIX@#${PREFIX}#g' < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE - post-install: if [ ! -f ${PREFIX}/etc/htdig/htdig.conf ]; then \ ${CP} ${PREFIX}/share/examples/htdig/htdig.conf ${PREFIX}/etc/htdig/; \ diff --git a/www/htdig/pkg/MESSAGE b/www/htdig/pkg/MESSAGE index 9503eb70e0d..fdb88fb8586 100644 --- a/www/htdig/pkg/MESSAGE +++ b/www/htdig/pkg/MESSAGE @@ -1,10 +1,15 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:46 wiz Exp $ + A sample ht://Dig config file has been installed to -@PREFIX@/etc/htdig/htdig.conf, unless that file existed already. -The sample @PREFIX@/bin/rundig script may be run to create a database +${PREFIX}/etc/htdig/htdig.conf, unless that file existed already. +The sample ${PREFIX}/bin/rundig script may be run to create a database in the newly created empty directory, /var/db/htdig. A sample search form, which may be used to search that database, has been installed to -@PREFIX@/share/examples/htdig/search.html. +${PREFIX}/share/examples/htdig/search.html. For an example of how to set up ht://Dig and integrate it with your web site, you may wish to examine the scripts installed into /var/wwwoffle/html/htdig/scripts by the www/wwwoffle package. + +====================================================================== diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile index 52481c59c34..828184131b6 100644 --- a/www/jakarta-tomcat/Makefile +++ b/www/jakarta-tomcat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/12/13 03:49:30 jwise Exp $ +# $NetBSD: Makefile,v 1.12 2001/01/29 11:34:46 wiz Exp $ DISTNAME= jakarta-tomcat.src PKGNAME= jakarta-tomcat-3.1.1 @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/jakarta-tomcat-3.1.1-src JAKARTA_HOME= ${PREFIX}/jakarta MAKE_ENV+= JAVA_HOME=${JAVA_HOME} -MESSAGE_FILE= ${WRKDIR}/MESSAGE +MESSAGE_SUBST+= TOMCAT_HOME=${JAKARTA_HOME} post-patch: ${SED} -e s,@JAKARTA_HOME@,${JAKARTA_HOME},g \ @@ -34,10 +34,6 @@ do-build: cd ${WRKSRC}/../jakarta-ant && ${SH} bootstrap.sh cd ${WRKSRC} && ${SH} ./build.sh -post-build: - ${SED} 's,@TOMCAT_HOME@,${JAKARTA_HOME}/tomcat,g' \ - < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE - do-install: ${MKDIR} ${JAKARTA_HOME}/tomcat cd ${WRKSRC} && ${SH} ./build.sh dist diff --git a/www/jakarta-tomcat/pkg/MESSAGE b/www/jakarta-tomcat/pkg/MESSAGE index d17cec029f8..0467bd3d91f 100644 --- a/www/jakarta-tomcat/pkg/MESSAGE +++ b/www/jakarta-tomcat/pkg/MESSAGE @@ -1,16 +1,17 @@ -============================================================= +====================================================================== +$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:46 wiz Exp $ For detailed instructions on how to run Tomcat, either as a standalone server or in conjunction with Apache (using the www/ap-jserv package), see: - @TOMCAT_HOME@/doc/uguide/tomcat_ug.html + ${TOMCAT_HOME}/doc/uguide/tomcat_ug.html -For more information on application development with Tomcat +For more information on application development with Tomcat, see - @TOMCAT_HOME@/doc/appdev/index.html + ${TOMCAT_HOME}/doc/appdev/index.html Note also that in order for Tomcat to start up, ${JAVA_HOME} must point to your JVM installation. -============================================================= +====================================================================== diff --git a/www/jssi/Makefile b/www/jssi/Makefile index 9e1e8ab5bc9..ee2dd6f8274 100644 --- a/www/jssi/Makefile +++ b/www/jssi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/06/22 14:23:26 jwise Exp $ +# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:46 wiz Exp $ DISTNAME= ApacheJSSI-1.1.2 PKGNAME= jssi-1.1.2 @@ -18,11 +18,9 @@ USE_GMAKE= NO_CONFIGURE= WRKSRC= ${WRKDIR}/ApacheJSSI-1.1.2/src/java MAKE_ENV+= CLASSPATH=${CLASSPATH} -MESSAGE_FILE= ${WRKDIR}/MESSAGE post-build: (cd ${WRKSRC}/../../docs && CLASSPATH=${CLASSPATH} ${SH} generate_javadoc) - ${SED} -e 's,@PREFIX@,${PREFIX},g' < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE do-install: ${INSTALL_DATA} ${WRKSRC}/ApacheJSSI.jar ${PREFIX}/lib/java/ApacheJSSI.jar diff --git a/www/jssi/pkg/MESSAGE b/www/jssi/pkg/MESSAGE index 7e3e9955763..c0e8aeac230 100644 --- a/www/jssi/pkg/MESSAGE +++ b/www/jssi/pkg/MESSAGE @@ -1,5 +1,5 @@ ============================================================================= -$NetBSD: MESSAGE,v 1.2 2000/05/09 20:53:19 jwise Exp $ +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:46 wiz Exp $ To install Apache-JSSI for use with Apache Server's mod_jserv (from the ap-jserv package), add the following line to your httpd.conf: @@ -8,7 +8,7 @@ ap-jserv package), add the following line to your httpd.conf: and the following line to your zone.properties: - repositories=@PREFIX@/lib/java/ApacheJSSI.jar + repositories=${PREFIX}/lib/java/ApacheJSSI.jar To use Apache-JSSI with others servlet engines, see the appropriate documentation. diff --git a/www/php3-mysql/Makefile b/www/php3-mysql/Makefile index b5e71690115..f6e8b9692da 100644 --- a/www/php3-mysql/Makefile +++ b/www/php3-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/10/21 23:04:34 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/01/29 11:34:46 wiz Exp $ # PKGNAME= php-mysql-${PHP_VERSION} @@ -9,8 +9,6 @@ CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} BUILDING_EXTENSION_MODULE=yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE - do-build: cd ${WRKSRC}/functions && \ ${COMPILE.c} -I.. -I. -I${LOCALBASE}/include/mysql -fPIC -DPIC -DCOMPILE_DL mysql.c && \ @@ -18,6 +16,5 @@ do-build: do-install: ${INSTALL_DATA} ${WRKSRC}/functions/mysql.so ${PREFIX}/lib/php3/ - ${SED} -e 's|@PREFIX@|${PREFIX}|g' ${PKGDIR}/MESSAGE >${MESSAGE_FILE} .include "../php3/Makefile" diff --git a/www/php3-mysql/pkg/MESSAGE b/www/php3-mysql/pkg/MESSAGE index 57bb90dec6e..7ebad5c1862 100644 --- a/www/php3-mysql/pkg/MESSAGE +++ b/www/php3-mysql/pkg/MESSAGE @@ -1,12 +1,15 @@ -$NetBSD: MESSAGE,v 1.2 2000/10/02 14:29:23 agc Exp $ +====================================================================== +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:47 wiz Exp $ To enable fully this package, you will need to ensure that the following lines appear in php3.ini (which is normally -@PREFIX@/etc/php3.ini) +${PREFIX}/etc/php3.ini) - extension_dir=@PREFIX@/lib/php3 + extension_dir=${PREFIX}/lib/php3 extension=mysql.so If you are using the ap-php3 package (php3 as an apache module), you will need to restart apache. The command "apachectl restart" will do this. + +====================================================================== diff --git a/www/php4/Makefile b/www/php4/Makefile index 4daeca78d42..ae3ce39e640 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/01/25 17:18:07 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/01/29 11:34:47 wiz Exp $ .include "../../www/php4/Makefile.common" @@ -10,12 +10,6 @@ HOMEPAGE= http://www.php.net/ CONFLICTS+= ap-php-4.0.3pl1 -MESSAGE_FILE= ${WRKDIR}/.MESSAGE - -pre-install: - ${SED} -e "s,@PREFIX@,${PREFIX},g" \ - < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/libexec/cgi-bin ${LN} -sf ../../bin/php ${PREFIX}/libexec/cgi-bin/php diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module index 2618dd688b2..3d624bfb9e5 100644 --- a/www/php4/Makefile.module +++ b/www/php4/Makefile.module @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.module,v 1.1.1.1 2000/12/17 09:19:32 jlam Exp $ +# $NetBSD: Makefile.module,v 1.2 2001/01/29 11:34:47 wiz Exp $ # # This Makefile is provided to ease creating PHP4 packages for the extension # modules distributed in the PHP4 sources. @@ -17,24 +17,16 @@ MODULESDIR= ${WRKSRC}/modules PLIST_SUBST+= MODNAME=${MODNAME} MESSAGE_SRC= ${.CURDIR}/../../www/php4/pkg/MESSAGE.module -MESSAGE_FILE= ${WRKDIR}/MESSAGE +MESSAGE_SUBST+= MODNAME=${MODNAME} \ + PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} PLIST_SRC= ${.CURDIR}/../../www/php4/pkg/PLIST.module do-build: @cd ${EXTDIR}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${ALL_TARGET} -pre-install: pre-module-install - do-install: do-module-install -pre-module-install: - ${CAT} ${MESSAGE_SRC} | ${SED} \ - -e "s,@MODNAME@,${MODNAME},g" \ - -e "s,@PHP_EXTENSION_DIR@,${PHP_EXTENSION_DIR},g" \ - -e "s,@PREFIX@,${PREFIX},g" \ - > ${MESSAGE_FILE} - do-module-install: ${INSTALL_DATA_DIR} ${PREFIX}/${PHP_EXTENSION_DIR} ${INSTALL_DATA} ${MODULESDIR}/${MODNAME}.so \ diff --git a/www/php4/pkg/MESSAGE b/www/php4/pkg/MESSAGE index 626b8ebc121..745b23b834e 100644 --- a/www/php4/pkg/MESSAGE +++ b/www/php4/pkg/MESSAGE @@ -1,13 +1,14 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2000/12/17 21:33:55 jlam Exp $ +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:47 wiz Exp $ Example configuration files suitable as a basis for a custom php.ini may be found at: - @PREFIX@/etc/php.ini-dist - @PREFIX@/etc/php.ini-optimized + ${PREFIX}/etc/php.ini-dist + ${PREFIX}/etc/php.ini-optimized To process PHP scripts, you will need a PHP-enabled HTTP server. You may either configure the HTTP server to use PHP as a CGI program, or install a PHP module for your HTTP server, e.g. ap-php4. + =========================================================================== diff --git a/www/php4/pkg/MESSAGE.module b/www/php4/pkg/MESSAGE.module index 3d7537a634c..4bd4adf3fb3 100644 --- a/www/php4/pkg/MESSAGE.module +++ b/www/php4/pkg/MESSAGE.module @@ -1,10 +1,11 @@ =========================================================================== -$NetBSD: MESSAGE.module,v 1.2 2001/01/15 16:32:28 jlam Exp $ +$NetBSD: MESSAGE.module,v 1.3 2001/01/29 11:34:47 wiz Exp $ To enable this package, add the following lines to php.ini: - extension_dir=@PREFIX@/@PHP_EXTENSION_DIR@ - extension=@MODNAME@.so + extension_dir=${PREFIX}/${PHP_EXTENSION_DIR} + extension=${MODNAME}.so and restart your PHP4-enabled HTTP server to load this module. + =========================================================================== diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index 3f26e034a7e..55080caac2c 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/01/26 05:21:49 hubertf Exp $ +# $NetBSD: Makefile,v 1.24 2001/01/29 11:34:47 wiz Exp $ DISTNAME= wwwoffle-2.6 CATEGORIES= www @@ -17,8 +17,7 @@ HOMEPAGE= http://www.gedanken.demon.co.uk/wwwoffle/ USE_GMAKE= yes NO_CONFIGURE= yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE -PLIST_SRC= ${WRKDIR}/PLIST +PLIST_SUBST+= GTAR=${GTAR} BUILD_DEFS+= USE_INET6 @@ -31,9 +30,6 @@ MAKE_ENV+= LIBRARY="-lnsl -lsocket" post-build: @${SED} -e 's#@PREFIX@#${PREFIX}#g' <${FILESDIR}/wwwoffle.sh \ >${WRKDIR}/wwwoffle.sh - @${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE \ - >${MESSAGE_FILE} - @${SED} -e 's#@GTAR@#${GTAR}#g' <${PKGDIR}/PLIST >${PLIST_SRC} pre-install: ${MKDIR} ${PREFIX}/etc/wwwoffle diff --git a/www/wwwoffle/pkg/MESSAGE b/www/wwwoffle/pkg/MESSAGE index cb4c297d524..909e2c5cdb7 100644 --- a/www/wwwoffle/pkg/MESSAGE +++ b/www/wwwoffle/pkg/MESSAGE @@ -1 +1,6 @@ -Please add "@PREFIX@/etc/rc.d/wwwoffle.sh" to "/etc/rc.local". +====================================================================== +$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:47 wiz Exp $ + +Please add "${PREFIX}/etc/rc.d/wwwoffle" to "/etc/rc.local". + +====================================================================== diff --git a/www/wwwoffle/pkg/PLIST b/www/wwwoffle/pkg/PLIST index 7bbd5fbacef..c7997d29e14 100644 --- a/www/wwwoffle/pkg/PLIST +++ b/www/wwwoffle/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2001/01/26 05:21:49 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.9 2001/01/29 11:34:47 wiz Exp $ bin/wwwoffle bin/wwwoffle-ls bin/wwwoffle-mv @@ -30,7 +30,7 @@ share/doc/wwwoffle/README.lang share/doc/wwwoffle/README.udmsearch share/doc/wwwoffle/README.win32 @dirrm share/doc/wwwoffle -@exec @GTAR@ xzCf / %D/libdata/wwwoffle-spool.tar.gz +@exec ${GTAR} xzCf / %D/libdata/wwwoffle-spool.tar.gz @exec cd /var/wwwoffle/html && mv wwwoffle.pac wwwoffle.pac.dist && sed /PROXY/s/localhost/`hostname`/ <wwwoffle.pac.dist >wwwoffle.pac @unexec cd /var/wwwoffle && rm -rf html* lasttime outgoing prevtime* temp @unexec rmdir /var/wwwoffle/* 2>/dev/null && rmdir /var/wwwoffle ; : diff --git a/x11/lesstif12/Makefile b/x11/lesstif12/Makefile index ad178ba64ee..b1d031e3a0a 100644 --- a/x11/lesstif12/Makefile +++ b/x11/lesstif12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/12/22 17:26:22 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:48 wiz Exp $ PKGNAME= lesstif12-${LESSTIF_VERSION} @@ -11,12 +11,6 @@ CONFIGURE_ARGS+= --enable-build-12 CONFIGURE_ARGS+= --disable-build-20 CONFIGURE_ARGS+= --enable-default-12 -MESSAGE_FILE= ${WRKDIR}/MESSAGE - -pre-install: - ${SED} -e "s,@PREFIX@,${PREFIX},g" \ - < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} - # We don't install any documentation, but the installation process creates # this directory anyway, so remove it if it's empty. # diff --git a/x11/lesstif12/pkg/MESSAGE b/x11/lesstif12/pkg/MESSAGE index 7bd83b2b197..8d24067eff2 100644 --- a/x11/lesstif12/pkg/MESSAGE +++ b/x11/lesstif12/pkg/MESSAGE @@ -1,14 +1,15 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2000/12/22 17:26:22 jlam Exp $ +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:48 wiz Exp $ Please note that this package is provided for those programs which will not work with newer versions of LessTif. To allow this package to coexist with newer versions of LessTif, it has been installed -in @PREFIX@/LessTif/1.2/{include,lib}. +in ${PREFIX}/LessTif/1.2/{include,lib}. You should be able to select this version of LessTif when compiling programs which use it by passing the following flags to the compiler: - -I@PREFIX@/LessTif/Motif1.2/include - -L@PREFIX@/LessTif/Motif1.2/lib -Wl,-R@PREFIX@/LessTif/Motif1.2/lib + -I${PREFIX}/LessTif/Motif1.2/include + -L${PREFIX}/LessTif/Motif1.2/lib -Wl,-R${PREFIX}/LessTif/Motif1.2/lib + =========================================================================== diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile index 0125c9bf159..81890c22180 100644 --- a/x11/tkman/Makefile +++ b/x11/tkman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2000/09/11 21:08:49 fredb Exp $ +# $NetBSD: Makefile,v 1.25 2001/01/29 11:34:49 wiz Exp $ # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp # @@ -17,7 +17,6 @@ DEPENDS+= tk-8.3.2:../../x11/tk USE_X11= yes -MESSAGE_FILE= ${WRKDIR}/MESSAGE WRKSRC= ${WRKDIR}/${PKGNAME} post-install: @@ -25,8 +24,6 @@ post-install: -e 's|@@PREFIX@@|${PREFIX}|' \ -e 's|@@X11BASE@@|${X11BASE}|' \ < ${FILESDIR}/mkindex > ${WRKDIR}/mkindex - ${SED} -e 's|@@PREFIX@@|${PREFIX}|' \ - < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE ${INSTALL_SCRIPT} ${WRKDIR}/mkindex ${PREFIX}/libexec .include "../../mk/bsd.pkg.mk" diff --git a/x11/tkman/pkg/MESSAGE b/x11/tkman/pkg/MESSAGE index 1662d1ae510..2058d72db4b 100644 --- a/x11/tkman/pkg/MESSAGE +++ b/x11/tkman/pkg/MESSAGE @@ -1,5 +1,10 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:49 wiz Exp $ + You can have the glimpse and apropos databases, needed by tkman, kept up-to-date by adding the following entry to root's crontab (edit to taste): -10 2 * * 6 @@PREFIX@@/libexec/mkindex +10 2 * * 6 ${PREFIX}/libexec/mkindex + +====================================================================== diff --git a/x11/xscribble/Makefile b/x11/xscribble/Makefile index 3d435366152..c562bff56b4 100644 --- a/x11/xscribble/Makefile +++ b/x11/xscribble/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/11/17 14:40:16 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:49 wiz Exp $ DISTNAME= xscribble PKGNAME= xscribble-20000616 @@ -12,11 +12,6 @@ HOMEPAGE= http://www.handhelds.org/projects/xscribble.html USE_IMAKE= YES NO_INSTALL_MANPAGES= YES -MESSAGE_FILE= ${WRKDIR}/MESSAGE - -post-patch: - ${SED} -e "s,@PREFIX@,${PREFIX},g" <${PKGDIR}/MESSAGE >${MESSAGE_FILE} - post-install: ${MKDIR} ${PREFIX}/share/examples/xscribble ${CP} ${WRKSRC}/classifiers/*.cl ${PREFIX}/share/examples/xscribble diff --git a/x11/xscribble/pkg/MESSAGE b/x11/xscribble/pkg/MESSAGE index a63d82fc932..ce6d9eb2775 100644 --- a/x11/xscribble/pkg/MESSAGE +++ b/x11/xscribble/pkg/MESSAGE @@ -1,2 +1,7 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:49 wiz Exp $ + To actually use xscribble, you need to copy -@PREFIX@/share/examples/xscribble/*.cl into ~/.classifiers. +${PREFIX}/share/examples/xscribble/*.cl into ~/.classifiers. + +====================================================================== |