diff options
70 files changed, 232 insertions, 231 deletions
diff --git a/audio/gqmpeg-skins/Makefile b/audio/gqmpeg-skins/Makefile index c2512939c12..2c1dbd01e91 100644 --- a/audio/gqmpeg-skins/Makefile +++ b/audio/gqmpeg-skins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:38 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/17 04:49:45 jlam Exp $ DISTNAME= gqmpeg-skins-20030712 PKGREVISION= 3 @@ -91,7 +91,7 @@ INSTALLATION_DIRS= share/gqmpeg/skins do-install: for i in ${DISTFILES} ; do \ ${ECHO} unpacking $$i ; \ - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$i | ( cd ${LOCALBASE}/share/gqmpeg/skins ; \ + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$i | ( cd ${PREFIX}/share/gqmpeg/skins ; \ ${GTAR} -zxf - ) ; \ done ${FIND} ${PREFIX}/share/gqmpeg/skins -type d -print | \ diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile index 4157ffd7d73..cc88ce533d0 100644 --- a/audio/taglib/Makefile +++ b/audio/taglib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:44:57 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/17 04:49:45 jlam Exp $ # DISTNAME= taglib-1.3.1 @@ -19,6 +19,6 @@ pre-build: post-install: ${INSTALL} -c -o ${ROOT_USER} -g ${ROOT_GROUP} -m 444 \ - ${FILESDIR}/id3lib_strings.h ${LOCALBASE}/include/taglib/. + ${FILESDIR}/id3lib_strings.h ${PREFIX}/include/taglib/. .include "../../mk/bsd.pkg.mk" diff --git a/audio/toolame/Makefile b/audio/toolame/Makefile index 6bbe6edbbfc..39c3046a54e 100644 --- a/audio/toolame/Makefile +++ b/audio/toolame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:39 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/17 04:49:45 jlam Exp $ # DISTNAME= toolame-02l @@ -21,9 +21,9 @@ INSTALLATION_DIRS= bin TOOLAME_HTMLFILES= changes.html default.html psycho.html readme.html vbr.html do-install: - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/html/toolame + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/toolame cd ${WRKSRC}/html; ${INSTALL_DATA} ${TOOLAME_HTMLFILES} \ - ${LOCALBASE}/share/doc/html/toolame + ${PREFIX}/share/doc/html/toolame ${INSTALL_PROGRAM} ${WRKSRC}/toolame ${PREFIX}/bin .include "../../mk/bsd.pkg.mk" diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile index df990e95535..8d08d6be0ee 100644 --- a/benchmarks/httperf/Makefile +++ b/benchmarks/httperf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:40 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/17 04:49:45 jlam Exp $ # DISTNAME= httperf-0.6 @@ -24,7 +24,7 @@ LDFLAGS+= -lsocket -lnsl -lresolv INSTALLATION_DIRS= bin man/man1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/httperf ${LOCALBASE}/bin/httperf - ${INSTALL_MAN} ${WRKSRC}/httperf.man ${LOCALBASE}/man/man1/httperf.1 + ${INSTALL_PROGRAM} ${WRKSRC}/httperf ${PREFIX}/bin/httperf + ${INSTALL_MAN} ${WRKSRC}/httperf.man ${PREFIX}/man/man1/httperf.1 .include "../../mk/bsd.pkg.mk" diff --git a/cad/xchiplogo/Makefile b/cad/xchiplogo/Makefile index 6eb8150161c..c26f4b5decb 100644 --- a/cad/xchiplogo/Makefile +++ b/cad/xchiplogo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:41 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/17 04:49:45 jlam Exp $ # DISTNAME= xchiplogo @@ -14,7 +14,7 @@ COMMENT= Program for generating pretty logos on VLSI chips INSTALLATION_DIRS= bin do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xchiplogo ${LOCALBASE}/bin/xchiplogo + ${INSTALL_PROGRAM} ${WRKSRC}/xchiplogo ${PREFIX}/bin/xchiplogo .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" diff --git a/cross/binutils/Makefile b/cross/binutils/Makefile index 3232e72a012..993101741dc 100644 --- a/cross/binutils/Makefile +++ b/cross/binutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/05/22 20:07:44 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/06/17 04:49:45 jlam Exp $ # # GNU binutils configured to hold `as many targets as the cross system is # capable of using'. Configures and builds everything except gas, which @@ -74,7 +74,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/bfd/bfd.h ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/ld/ldscripts/* ${PREFIX}/lib/ldscripts ${INSTALL_SCRIPT} ${WRKSRC}/cross-env ${BINDIR} - ${LN} -s ${BINDIR}/cross-env ${LOCALBASE}/bin/cross-env + ${LN} -s ${BINDIR}/cross-env ${PREFIX}/bin/cross-env post-build: ${SED} -e 's|@@PREFIX@@|${PREFIX}|' < ${FILESDIR}/cross-env > \ diff --git a/databases/oraedit/Makefile b/databases/oraedit/Makefile index 53eb2dbf4cf..b01844d2448 100644 --- a/databases/oraedit/Makefile +++ b/databases/oraedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:44 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/17 04:49:45 jlam Exp $ DISTNAME= oraedit-0.1.4 CATEGORIES= databases @@ -15,7 +15,7 @@ PYTHON_PATCH_SCRIPTS= oraedit INSTALLATION_DIRS= bin do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/oraedit ${LOCALBASE}/bin/oraedit + ${INSTALL_SCRIPT} ${WRKSRC}/oraedit ${PREFIX}/bin/oraedit .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cvs2cl/Makefile b/devel/cvs2cl/Makefile index 2a66c3f600f..29affb6a806 100644 --- a/devel/cvs2cl/Makefile +++ b/devel/cvs2cl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:45 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/17 04:49:46 jlam Exp $ # DISTNAME= cvs2cl-2.58 @@ -20,6 +20,6 @@ INSTALLATION_DIRS= bin do-install: ${INSTALL_SCRIPT} ${DISTDIR}/${DISTNAME} \ - ${LOCALBASE}/bin/${DISTNAME:C/-.*$//} + ${PREFIX}/bin/${DISTNAME:C/-.*$//} .include "../../mk/bsd.pkg.mk" diff --git a/devel/mrproject/Makefile b/devel/mrproject/Makefile index 8a47fb07cf7..b23144007f8 100644 --- a/devel/mrproject/Makefile +++ b/devel/mrproject/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/04/11 21:45:28 tv Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/17 04:49:46 jlam Exp $ # DISTNAME= mrproject-0.5.1 @@ -15,7 +15,7 @@ USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${LOCALBASE}/etc/mrproject +CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/mrproject CONFIGURE_ARGS+= --without-python CONFIGURE_ARGS+= --without-evolution-idldir diff --git a/devel/prc-tools/Makefile b/devel/prc-tools/Makefile index 5ac34f9a60c..9a205c7afed 100644 --- a/devel/prc-tools/Makefile +++ b/devel/prc-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/06/01 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/17 04:49:46 jlam Exp $ # DISTNAME= prc-tools-2.2 @@ -48,9 +48,9 @@ GCC_REQD+= 2.8.0 CONFIGURE_ARGS+=--enable-targets=m68k-palmos,arm-palmos CONFIGURE_ARGS+=--enable-languages=c,c++ CONFIGURE_ARGS+=--with-headers=${WRKSRC}/empty -CONFIGURE_ARGS+=--with-palmdev-prefix=${LOCALBASE}/share/palmdev +CONFIGURE_ARGS+=--with-palmdev-prefix=${PREFIX}/share/palmdev CONFIGURE_ARGS+=--disable-nls -#CONFIGURE_ARGS+=--enable-html-docs=${LOCALBASE}/share/doc/html/prc-tools +#CONFIGURE_ARGS+=--enable-html-docs=${PREFIX}/share/doc/html/prc-tools post-extract: ${LN} -s ../${DIST_BINUTILS} ${WRKSRC}/binutils diff --git a/devel/ruby-optparse/Makefile b/devel/ruby-optparse/Makefile index 21528a88eb2..f227ebe976b 100644 --- a/devel/ruby-optparse/Makefile +++ b/devel/ruby-optparse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:48 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/17 04:49:46 jlam Exp $ DISTNAME= optparse-0.12 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} @@ -36,7 +36,7 @@ do-install: .for f in ${EXAMPLES_JA} ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/optparse/${f}.ja .endfor - ${INSTALL_MAN} ${WRKSRC}/optparse.1 ${LOCALBASE}/man/man3/optparse.3 + ${INSTALL_MAN} ${WRKSRC}/optparse.1 ${PREFIX}/man/man3/optparse.3 .include "../../lang/ruby/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/ia64sim/Makefile b/emulators/ia64sim/Makefile index 755afde46b8..bc6ad0b2a98 100644 --- a/emulators/ia64sim/Makefile +++ b/emulators/ia64sim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:50 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/17 04:49:46 jlam Exp $ DISTNAME= ia64sim PKGNAME= ia64sim-0.3 @@ -17,6 +17,6 @@ MAKEFILE= makefile.unx INSTALLATION_DIRS= bin do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ia64sim ${LOCALBASE}/bin/ia64sim + ${INSTALL_PROGRAM} ${WRKSRC}/ia64sim ${PREFIX}/bin/ia64sim .include "../../mk/bsd.pkg.mk" diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile index d2ef4c706fe..89851b6b56a 100644 --- a/fonts/ja-elisat/Makefile +++ b/fonts/ja-elisat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:27 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/17 04:49:46 jlam Exp $ DISTNAME= elisat10 PKGNAME= ja-elisat-1.0 @@ -12,7 +12,7 @@ COMMENT= 8x8 dots X11 bitmap font for JIS X 0208 WRKSRC= ${WRKDIR} USE_X11BASE= YES DOCDIR= ${PREFIX}/share/doc/elisat -FONTDIR= ${X11PREFIX}/lib/X11/fonts/local +FONTDIR= ${PREFIX}/lib/X11/fonts/local #ALIAS= ${WRKDIR}/fonts.alias PKGSRC_USE_TOOLS+= gzip diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile index 78bd964e281..324c306203d 100644 --- a/fonts/ja-elisau/Makefile +++ b/fonts/ja-elisau/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:59 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/17 04:49:46 jlam Exp $ DISTNAME= elisau10 PKGNAME= ja-elisau-1.0 @@ -22,7 +22,7 @@ USE_TOOLS+= patch PKGSRC_USE_TOOLS+= gzip USE_X11BASE= YES DOCDIR= ${PREFIX}/share/doc/elisau -FONTDIR= ${X11PREFIX}/lib/X11/fonts/local +FONTDIR= ${PREFIX}/lib/X11/fonts/local DISTPATCH= ${WRKSRC}/clR5x8-s5x8.diff LICENSE= no-commercial-use diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile index fca1ce8ec22..e3b3a762b2e 100644 --- a/fonts/ja-kaname/Makefile +++ b/fonts/ja-kaname/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:27 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/17 04:49:46 jlam Exp $ DISTNAME= kaname_k12_bdf PKGNAME= ja-kaname-0.0.0.20030112 @@ -12,7 +12,7 @@ WRKSRC= ${WRKDIR} USE_X11BASE= YES PKGSRC_USE_TOOLS+= gzip DOCDIR= ${PREFIX}/share/doc/kaname -FONTDIR= ${X11PREFIX}/lib/X11/fonts/local +FONTDIR= ${PREFIX}/lib/X11/fonts/local #LICENSE= no-commercial-use diff --git a/fonts/ja-naga10/Makefile b/fonts/ja-naga10/Makefile index f2efb134a22..230a66d5f40 100644 --- a/fonts/ja-naga10/Makefile +++ b/fonts/ja-naga10/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/15 22:02:27 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/17 04:49:46 jlam Exp $ DISTNAME= knj10-1.1 PKGNAME= ja-naga10-1.1 @@ -14,7 +14,7 @@ COMMENT= 10x10 dots X11 bitmap font for JIS X 0208 USE_X11BASE= YES PKGSRC_USE_TOOLS+= gzip DOCDIR= ${PREFIX}/share/doc -FONTDIR= ${X11PREFIX}/lib/X11/fonts/local +FONTDIR= ${PREFIX}/lib/X11/fonts/local post-extract: cd ${WRKDIR}; \ diff --git a/fonts/type1inst/Makefile b/fonts/type1inst/Makefile index 1eba14f8dbc..2c587eae08e 100644 --- a/fonts/type1inst/Makefile +++ b/fonts/type1inst/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:52 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/17 04:49:46 jlam Exp $ # DISTNAME= type1inst-0.6.1 @@ -16,10 +16,10 @@ NO_BUILD= yes INSTALLATION_DIRS= bin man/man1 do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/type1inst ${X11PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/t1embed ${X11PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/type1inst.man ${X11PREFIX}/man/man1/type1inst.1 - @${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/type1inst - @${INSTALL_DATA} ${WRKSRC}/README ${X11PREFIX}/share/doc/type1inst + @${INSTALL_SCRIPT} ${WRKSRC}/type1inst ${PREFIX}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/t1embed ${PREFIX}/bin + @${INSTALL_MAN} ${WRKSRC}/type1inst.man ${PREFIX}/man/man1/type1inst.1 + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/type1inst + @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/type1inst .include "../../mk/bsd.pkg.mk" diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile index ea3d4bc3c12..2471f2526f3 100644 --- a/games/crossfire-cli/Makefile +++ b/games/crossfire-cli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:49 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/17 04:49:46 jlam Exp $ # DISTNAME= crossfire-client-1.0.0 @@ -20,7 +20,7 @@ CF_RAW= client-0.95.2-raw-sounds.tgz USE_PERL5= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-sound-dir=${LOCALBASE}/share/cfclient/sounds +CONFIGURE_ARGS+= --with-sound-dir=${PREFIX}/share/cfclient/sounds PKGSRC_USE_TOOLS+= gtar REPLACE_PERL= utils/deftoheader.pl items.pl @@ -35,13 +35,13 @@ pre-build: cd ${WRKSRC} && ${MAKE} soundsdef.h post-install: - @${INSTALL_DATA_DIR} ${LOCALBASE}/share/cfclient - cd ${LOCALBASE}/share/cfclient && \ + @${INSTALL_DATA_DIR} ${PREFIX}/share/cfclient + cd ${PREFIX}/share/cfclient && \ ${GZCAT} ${DISTDIR}/${CF_SND} | ${GTAR} xmf - - cd ${LOCALBASE}/share/cfclient && \ + cd ${PREFIX}/share/cfclient && \ ${GZCAT} ${DISTDIR}/${CF_RAW} | ${GTAR} xmf - - ${INSTALL_DATA} ${WRKSRC}/def_keys ${LOCALBASE}/share/cfclient - @${CHOWN} -R ${ROOT_USER}:games ${LOCALBASE}/share/cfclient + ${INSTALL_DATA} ${WRKSRC}/def_keys ${PREFIX}/share/cfclient + @${CHOWN} -R ${ROOT_USER}:games ${PREFIX}/share/cfclient .include "../../graphics/png/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile index 79c41121f75..55133596e85 100644 --- a/games/crossfire-srv/Makefile +++ b/games/crossfire-srv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:49 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/17 04:49:46 jlam Exp $ # DISTNAME= crossfire-1.0.0 @@ -34,13 +34,13 @@ REPLACE_PERL+= doc/include_html.pl doc/playbook/make_index.pl REPLACE_PERL+= doc/spoiler-html/makeps.pl post-install: - cd ${LOCALBASE}/share/crossfire && \ + cd ${PREFIX}/share/crossfire && \ ${GZCAT} ${DISTDIR}/${CF_MAPS} | ${GTAR} xmf - - @${CHOWN} ${ROOT_USER}:games ${LOCALBASE}/bin/crossfire - @${CHMOD} 2755 ${LOCALBASE}/bin/crossfire - @${CHOWN} -R ${ROOT_USER}:games ${LOCALBASE}/share/crossfire - @${CHOWN} -R ${ROOT_USER}:games ${LOCALBASE}/var/crossfire - @${CHMOD} -R g+w ${LOCALBASE}/var/crossfire + @${CHOWN} ${ROOT_USER}:games ${PREFIX}/bin/crossfire + @${CHMOD} 2755 ${PREFIX}/bin/crossfire + @${CHOWN} -R ${ROOT_USER}:games ${PREFIX}/share/crossfire + @${CHOWN} -R ${ROOT_USER}:games ${PREFIX}/var/crossfire + @${CHMOD} -R g+w ${PREFIX}/var/crossfire .include "../../graphics/png/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" diff --git a/games/freesci/Makefile b/games/freesci/Makefile index 757247f5437..e567e1d081d 100644 --- a/games/freesci/Makefile +++ b/games/freesci/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:50 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/17 04:49:46 jlam Exp $ # DISTNAME= freesci-0.3.4c @@ -18,8 +18,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-ggi --without-directfb post-install: - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/examples/freesci - ${INSTALL_DATA} ${FILESDIR}/config ${LOCALBASE}/share/examples/freesci + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/freesci + ${INSTALL_DATA} ${FILESDIR}/config ${PREFIX}/share/examples/freesci .include "../../devel/SDL/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile index b536b9af1f4..2d973978060 100644 --- a/games/lbreakout2/Makefile +++ b/games/lbreakout2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:51 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/17 04:49:46 jlam Exp $ DISTNAME= lbreakout2-2.5.2 PKGREVISION= 1 @@ -10,8 +10,8 @@ HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= Breakout-style arcade game GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-highscore-path=${LOCALBASE}/share/games/ \ - --with-docdir=${LOCALBASE}/share/doc/html +CONFIGURE_ARGS+= --with-highscore-path=${PREFIX}/share/games/ \ + --with-docdir=${PREFIX}/share/doc/html LDFLAGS.SunOS+= -lsocket -lnsl diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile index d889793d4d7..62d8dae0196 100644 --- a/games/scummvm/Makefile +++ b/games/scummvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/17 04:49:46 jlam Exp $ DISTNAME= scummvm-0.7.1 CATEGORIES= games @@ -12,7 +12,7 @@ COMMENT= LucasArts Script Creation Utility for Maniac Mansion USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${LOCALBASE} +CONFIGURE_ARGS+= --prefix=${PREFIX} UNLIMIT_RESOURCES= datasize diff --git a/games/tanked/Makefile b/games/tanked/Makefile index 958c93c6593..c9fa824993e 100644 --- a/games/tanked/Makefile +++ b/games/tanked/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/12 08:22:59 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/17 04:49:46 jlam Exp $ # DISTNAME= tanked-0.90 @@ -10,12 +10,12 @@ MAINTAINER= root@garbled.net COMMENT= Multiplayer internet tank game for X11 USE_X11BASE= YES -USE_TOOLS+= imake +USE_TOOLS+= imake gmake post-patch: @${TOUCH} ${WRKSRC}/client/tanked.man @${MV} ${WRKSRC}/server/maps.list ${WRKSRC}/server/maps.list.bak - @${SED} -e 's@XXX@${X11PREFIX}/share/tanked/@' \ + @${SED} -e 's@XXX@${PREFIX}/share/tanked/@' \ < ${WRKSRC}/server/maps.list.bak > ${WRKSRC}/server/maps.list .include "../../graphics/xpm/buildlink3.mk" diff --git a/games/xboing/Makefile b/games/xboing/Makefile index 5d4d09b4ab3..75d9cfc8918 100644 --- a/games/xboing/Makefile +++ b/games/xboing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:58 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/17 04:49:46 jlam Exp $ # DISTNAME= xboing2.4 @@ -19,9 +19,9 @@ NO_INSTALL_MANPAGES= YES MAKE_ENV+= VARBASE=${VARBASE:Q} post-install: - ${CHOWN} ${GAMEOWN}:${GAMEGRP} ${X11PREFIX}/bin/xboing - ${CHMOD} ${GAMEMODE} ${X11PREFIX}/bin/xboing - ${INSTALL_MAN} ${WRKSRC}/xboing.man ${X11PREFIX}/man/man6/xboing.6 + ${CHOWN} ${GAMEOWN}:${GAMEGRP} ${PREFIX}/bin/xboing + ${CHMOD} ${GAMEMODE} ${PREFIX}/bin/xboing + ${INSTALL_MAN} ${WRKSRC}/xboing.man ${PREFIX}/man/man6/xboing.6 .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile index f87ac22cfa4..10362aa0cbf 100644 --- a/games/xdoom/Makefile +++ b/games/xdoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/06/16 06:57:56 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/17 04:49:46 jlam Exp $ DISTNAME= linuxdoom-1.10 PKGNAME= xdoom-1.10 @@ -21,7 +21,7 @@ EXTRACT_ONLY= doomsrc.zip EXTRACT_CMD= unzip -qo ${DISTDIR}/${EXTRACT_ONLY} USE_X11BASE= yes USE_TOOLS+= gmake -MAKE_ENV+= X11BASE=${X11BASE} INSTALL_PREFIX=${X11PREFIX} +MAKE_ENV+= X11BASE=${X11BASE} INSTALL_PREFIX=${PREFIX} PKGSRC_USE_TOOLS+= gtar gunzip diff --git a/games/xjig/Makefile b/games/xjig/Makefile index fa46cab1f66..ccc11f81635 100644 --- a/games/xjig/Makefile +++ b/games/xjig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/06/14 18:07:47 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/17 04:49:46 jlam Exp $ # DISTNAME= xjig-2.4 @@ -16,7 +16,7 @@ USE_LANGUAGES= c c++ BUILD_TARGET= xjig all post-install: - ${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xjig - ${INSTALL_DATA} ${WRKSRC}/tina.gif ${X11PREFIX}/lib/xjig + ${INSTALL_DATA_DIR} ${PREFIX}/lib/xjig + ${INSTALL_DATA} ${WRKSRC}/tina.gif ${PREFIX}/lib/xjig .include "../../mk/bsd.pkg.mk" diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile index 5ab02344a92..726c64d478c 100644 --- a/games/xpipeman/Makefile +++ b/games/xpipeman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:56 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/17 04:49:46 jlam Exp $ # DISTNAME= xpipeman-1.5 @@ -16,9 +16,9 @@ INSTALLATION_DIRS= bin man/man6 do-install: ${INSTALL} -o bin -g games -m 2755 ${WRKSRC}/xpipeman \ - ${X11PREFIX}/bin/xpipeman - ${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${X11PREFIX}/man/man6/xpipeman.6 - ${INSTALL} -d -o bin -g games -m 0775 ${X11PREFIX}/share/xpipeman + ${PREFIX}/bin/xpipeman + ${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${PREFIX}/man/man6/xpipeman.6 + ${INSTALL} -d -o bin -g games -m 0775 ${PREFIX}/share/xpipeman if [ ! -r /var/games/xpipescores ]; then \ ${INSTALL} -o bin -g games -m 0664 ${WRKSRC}/xpipescores /var/games ; \ fi diff --git a/games/zoom/Makefile b/games/zoom/Makefile index 927fb5baff1..3139be0d66a 100644 --- a/games/zoom/Makefile +++ b/games/zoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:53 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/17 04:49:46 jlam Exp $ # DISTNAME= zoom-1.0.1 @@ -26,7 +26,7 @@ GCC_REQD+= 3.0 .endif UNLIMIT_RESOURCES+= datasize -DOCDIR= ${LOCALBASE}/share/doc/html/zoom +DOCDIR= ${PREFIX}/share/doc/html/zoom post-install: ${INSTALL_DATA_DIR} ${DOCDIR} for f in colours.png configXwin.html configmac.html fonts.png \ diff --git a/graphics/dvdbackup/Makefile b/graphics/dvdbackup/Makefile index 4a45b76b87d..42eb7330ece 100644 --- a/graphics/dvdbackup/Makefile +++ b/graphics/dvdbackup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:57 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/17 04:49:47 jlam Exp $ DISTNAME= dvdbackup-0.1.1 PKGREVISION= 2 @@ -19,7 +19,7 @@ do-build: do-install: cd ${WRKSRC}; \ - ${INSTALL_PROGRAM} dvdbackup ${LOCALBASE}/bin; + ${INSTALL_PROGRAM} dvdbackup ${PREFIX}/bin; .include "../../multimedia/libdvdread/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gnuplot/Makefile.common b/graphics/gnuplot/Makefile.common index 7cee9b63e43..144e7439c1a 100644 --- a/graphics/gnuplot/Makefile.common +++ b/graphics/gnuplot/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2005/04/11 21:46:04 tv Exp $ +# $NetBSD: Makefile.common,v 1.4 2005/06/17 04:49:47 jlam Exp $ # DISTNAME= gnuplot-4.0.0 @@ -21,7 +21,7 @@ USE_MAKEINFO= YES INFO_FILES= gnuplot.info CONFIGURE_ARGS+= --with-pdf -CONFIGURE_ARGS+= --with-plot=${LOCALBASE} +CONFIGURE_ARGS+= --with-plot=${PREFIX} CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} CONFIGURE_ARGS+= --without-lisp-files diff --git a/graphics/jpeg2ps/Makefile b/graphics/jpeg2ps/Makefile index 657343ffdda..8ee4200b02a 100644 --- a/graphics/jpeg2ps/Makefile +++ b/graphics/jpeg2ps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:58 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/17 04:49:47 jlam Exp $ # DISTNAME= jpeg2ps-1.9 @@ -17,7 +17,7 @@ NO_BIN_ON_CD= ${RESTRICTED} INSTALLATION_DIRS= bin man/man1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/jpeg2ps ${LOCALBASE}/bin - ${INSTALL_MAN} ${WRKSRC}/jpeg2ps.1 ${LOCALBASE}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/jpeg2ps ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/jpeg2ps.1 ${PREFIX}/man/man1 .include "../../mk/bsd.pkg.mk" diff --git a/lang/SmartEiffel/Makefile b/lang/SmartEiffel/Makefile index dafeea97f25..3351c736bbb 100644 --- a/lang/SmartEiffel/Makefile +++ b/lang/SmartEiffel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/11/28 15:16:06 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2005/06/17 04:49:47 jlam Exp $ DISTNAME= se PKGNAME= SmartEiffel-2.0 @@ -31,6 +31,6 @@ post-build: ${RM} -f ${WRKSRC}/sys/system.se~ do-install: - ${CP} -r ${WRKSRC} ${LOCALBASE} + ${CP} -r ${WRKSRC} ${PREFIX} .include "../../mk/bsd.pkg.mk" diff --git a/lang/baci/Makefile b/lang/baci/Makefile index 4c7e13be3e8..4d3213fb5ea 100644 --- a/lang/baci/Makefile +++ b/lang/baci/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:59 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/17 04:49:47 jlam Exp $ # DISTNAME= bacisrc @@ -25,12 +25,12 @@ do-build: cd ${WRKSRC}/pascomp && ${MAKE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ccomp/bacc ${LOCALBASE}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/disasm/badis ${LOCALBASE}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/interp/bainterp ${LOCALBASE}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/pascomp/bapas ${LOCALBASE}/bin - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/baci - ${INSTALL_DATA} ${WRKDIR}/bacidoc/* ${LOCALBASE}/share/doc/baci + ${INSTALL_PROGRAM} ${WRKSRC}/ccomp/bacc ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/disasm/badis ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/interp/bainterp ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/pascomp/bapas ${PREFIX}/bin + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/baci + ${INSTALL_DATA} ${WRKDIR}/bacidoc/* ${PREFIX}/share/doc/baci ${CP} ${PKGDIR}/PLIST ${WRKDIR} .include "../../mk/bsd.pkg.mk" diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index c4d73c98a0c..307b4c0a347 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/05/02 17:42:06 drochner Exp $ +# $NetBSD: Makefile,v 1.43 2005/06/17 04:49:47 jlam Exp $ DISTNAME= clisp-2.33.2 CATEGORIES= lang @@ -32,7 +32,7 @@ do-configure: (cd .. ; ${SETENV} ${CONFIGURE_ENV} \ ${CONFIGURE_SCRIPT} --host=${MACHINE_GNU_PLATFORM} \ --prefix=${PREFIX}) && \ - ./makemake --prefix=${LOCALBASE} --with-readline --with-gettext \ + ./makemake --prefix=${PREFIX} --with-readline --with-gettext \ --with-dynamic-ffi --fsstnd=netbsd >Makefile pre-build: diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile index d8edf28b66a..576ecddd2c7 100644 --- a/lang/drscheme/Makefile +++ b/lang/drscheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:58 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/17 04:49:47 jlam Exp $ # DISTNAME= plt-${DRSCHEME_VERSION}-src-unix @@ -48,7 +48,7 @@ post-patch: ${WRKDIR}/plt/man/man1/drscheme.1 \ ${WRKDIR}/plt/man/man1/mred.1; do \ ${MV} -f $$patchee ${WRKSRC}/foo ; \ - ${SED} -e 's|@PREFIX@|${LOCALBASE}|' <${WRKSRC}/foo \ + ${SED} -e 's|@PREFIX@|${PREFIX}|' <${WRKSRC}/foo \ > $$patchee ; \ done; @${MV} -f ${WRKSRC}/mred/Makefile.in ${WRKSRC}/foo @@ -57,7 +57,7 @@ post-patch: @${FIND} ${WRKDIR} -name '*.orig' -print | ${XARGS} ${RM} -f post-install: - ${INSTALL_MAN_DIR} ${LOCALBASE}/man/man1 + ${INSTALL_MAN_DIR} ${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/../man/man1/*.1 ${PREFIX}/man/man1/ @cd ${PREFIX}/lib/plt && PATH="${OLD_PATH}" ${SH} install || ${TRUE} .for f in ${PROGRAMS} diff --git a/lang/gcc34-ada/Makefile b/lang/gcc34-ada/Makefile index c789bbc4a8c..c16092111ab 100644 --- a/lang/gcc34-ada/Makefile +++ b/lang/gcc34-ada/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/29 11:12:01 shannonjr Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/17 04:49:47 jlam Exp $ # DISTNAME= gcc-${GCC_VERSION} @@ -163,8 +163,8 @@ do-install: post-install: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/ada > ${WRKDIR}/ada ${ECHO} '"$$@"' >> ${WRKDIR}/ada - ${INSTALL_DATA} ${WRKDIR}/ada ${LOCALBASE}/bin/ada - ${CHMOD} +x ${WRKDIR}/ada ${LOCALBASE}/bin/ada + ${INSTALL_DATA} ${WRKDIR}/ada ${PREFIX}/bin/ada + ${CHMOD} +x ${WRKDIR}/ada ${PREFIX}/bin/ada ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} ${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print \ | ${SORT} | ${SED} -e "s,${PREFIX}/,,g" \ diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 3dab9f2eea5..0a160aee6e8 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/06/16 06:58:01 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/17 04:49:47 jlam Exp $ DISTNAME= ruby-${RUBY_VERSION} PKGREVISION= 2 @@ -31,7 +31,7 @@ do-install: ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} .if ${RUBY_NAME} != "ruby" .for f in ${RUBY_COMMANDS} - ${LN} -sf ${f}${RUBY_VER} ${LOCALBASE}/bin/${f} + ${LN} -sf ${f}${RUBY_VER} ${PREFIX}/bin/${f} ${ECHO} bin/${f} >> ${PLIST_SRC} .endfor ${LN} -sf ${RUBY_NAME}.1 ${PREFIX}/man/man1/ruby.1 diff --git a/lang/sr/Makefile b/lang/sr/Makefile index 622b3f4e769..1145f0c0014 100644 --- a/lang/sr/Makefile +++ b/lang/sr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:59 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/17 04:49:47 jlam Exp $ # DISTNAME= sr233 @@ -32,7 +32,7 @@ pre-configure: > ${WRKSRC}/Configuration pre-install: - -${MKDIR} ${LOCALBASE}/lib/sr + -${MKDIR} ${PREFIX}/lib/sr post-install: ${INSTALL_PROGRAM} ${WRKSRC}/csw/cstest ${PREFIX}/bin diff --git a/mail/jchkmail/Makefile b/mail/jchkmail/Makefile index a11094a0684..7576a1c3c61 100644 --- a/mail/jchkmail/Makefile +++ b/mail/jchkmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:20 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/17 04:49:47 jlam Exp $ # DISTNAME= jchkmail-1.3.1a @@ -12,8 +12,8 @@ COMMENT= Behavior-based virus and spam milter for Sendmail USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-rc-dir=${LOCALBASE}/etc/rc.d \ - --with-conf-dir=${LOCALBASE}/etc/jchkmail +CONFIGURE_ARGS+= --with-rc-dir=${PREFIX}/etc/rc.d \ + --with-conf-dir=${PREFIX}/etc/jchkmail .include "../../mail/libmilter/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/math/snns/Makefile b/math/snns/Makefile index 7af222786be..ffda57bdd2d 100644 --- a/math/snns/Makefile +++ b/math/snns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:04 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/17 04:49:47 jlam Exp $ DISTNAME= SNNSv4.2 PKGNAME= snns-4.2 @@ -16,19 +16,19 @@ XGUILOADPATH= ${PREFIX}/share/snns post-install: ${INSTALL_DATA_DIR} ${XGUILOADPATH}; - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/snns; - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/snns; - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/examples/snns; + ${INSTALL_DATA_DIR} ${PREFIX}/share/snns; + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snns; + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snns; ${INSTALL_DATA} ${WRKSRC}/help.hdoc ${XGUILOADPATH}; ${INSTALL_DATA} ${WRKSRC}/default.cfg ${XGUILOADPATH}; cd ${WRKSRC} && ${MAKE} install-man; for i in `ls -1 ${WRKSRC}/tools/doc`; do \ ${INSTALL_DATA} ${WRKSRC}/tools/doc/$$i \ - ${LOCALBASE}/share/doc/snns; \ + ${PREFIX}/share/doc/snns; \ done for i in `ls -1 ${WRKSRC}/examples`; do \ ${INSTALL_DATA} ${WRKSRC}/examples/$$i \ - ${LOCALBASE}/share/examples/snns; \ + ${PREFIX}/share/examples/snns; \ done .include "../../graphics/xpm/buildlink3.mk" diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile index a57588910bf..064a9874da3 100644 --- a/multimedia/mpeg_encode/Makefile +++ b/multimedia/mpeg_encode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:23 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/17 04:49:47 jlam Exp $ # DISTNAME= mpeg_encode-1.5b-src @@ -20,20 +20,20 @@ post-build: ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mpeg_encode ${LOCALBASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/mpeg_encode ${PREFIX}/bin .for i in eyuvtojpeg jmovie2jpeg mpeg_demux - ${INSTALL_PROGRAM} ${WRKSRC}/convert/${i} ${LOCALBASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/convert/${i} ${PREFIX}/bin .endfor - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/mpeg_encode + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mpeg_encode .for i in EXTENSIONS INPUT.FORMAT mpeg_encode.1 parallel.param param-summary \ template.param users-guide.fm users-guide.mif users-guide.ps - ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${LOCALBASE}/share/doc/mpeg_encode + ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${PREFIX}/share/doc/mpeg_encode .endfor - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/examples/mpeg_encode + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mpeg_encode cd ${WRKSRC}/examples ; for i in * ; do \ - ${INSTALL_DATA} $$i ${LOCALBASE}/share/examples/mpeg_encode; \ + ${INSTALL_DATA} $$i ${PREFIX}/share/examples/mpeg_encode; \ done - ${INSTALL_MAN} ${WRKSRC}/docs/mpeg_encode.1 ${LOCALBASE}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/docs/mpeg_encode.1 ${PREFIX}/man/man1 .include "../../graphics/jpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/chrony/Makefile b/net/chrony/Makefile index 845b0af6610..cc78ae8c350 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/17 04:49:47 jlam Exp $ DISTNAME= chrony-1.20 PKGREVISION= 1 @@ -14,7 +14,7 @@ USE_TOOLS+= gmake HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX} -EGDIR= ${LOCALBASE}/share/examples/chrony +EGDIR= ${PREFIX}/share/examples/chrony EGFILES= chrony.conf.example chrony.keys.example RCD_SCRIPTS= chronyd diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile index 615358e12cd..b7a52f08f54 100644 --- a/net/firewalk/Makefile +++ b/net/firewalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:46 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/17 04:49:47 jlam Exp $ DISTNAME= firewalk-5.0 CATEGORIES= net security @@ -15,7 +15,7 @@ CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include BUILDLINK_DEPENDS.libnet+= libnet-1.1.* -MAKE_ENV+= FIREWALK_LOC=${LOCALBASE} +MAKE_ENV+= FIREWALK_LOC=${PREFIX} .include "../../devel/libnet11/buildlink3.mk" .include "../../net/libdnet/buildlink3.mk" diff --git a/net/fping/Makefile b/net/fping/Makefile index 01af658f19f..15da99e2a85 100644 --- a/net/fping/Makefile +++ b/net/fping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/03/24 21:12:58 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/17 04:49:47 jlam Exp $ DISTNAME= fping-2.4b2_to PKGNAME= fping-2.4b2 @@ -13,6 +13,6 @@ COMMENT= Quickly ping many hosts w/o flooding the network GNU_CONFIGURE= YES post-install: - ${CHMOD} 4555 ${LOCALBASE}/sbin/fping + ${CHMOD} 4555 ${PREFIX}/sbin/fping .include "../../mk/bsd.pkg.mk" diff --git a/net/fping6/Makefile b/net/fping6/Makefile index cd50f645492..9a8ee8191cd 100644 --- a/net/fping6/Makefile +++ b/net/fping6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/07/17 22:51:10 grant Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/17 04:49:47 jlam Exp $ DISTNAME= fping-2.4b2_to-ipv6 PKGNAME= fping6-2.4b2 @@ -15,6 +15,6 @@ post-patch: @${MV} ${WRKSRC}/fping.8 ${WRKSRC}/fping6.8 post-install: - ${CHMOD} 4555 ${LOCALBASE}/sbin/fping6 + ${CHMOD} 4555 ${PREFIX}/sbin/fping6 .include "../../mk/bsd.pkg.mk" diff --git a/net/ntop/Makefile b/net/ntop/Makefile index ff3d9877720..3ba7dddcca8 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:25 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2005/06/17 04:49:47 jlam Exp $ DISTNAME= ntop-3.1 PKGREVISION= 3 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/share/ntop CONFIGURE_ARGS+= --with-gd-root=${BUILDLINK_PREFIX.gd} CONFIGURE_ARGS+= --with-gdbm-root=${BUILDLINK_PREFIX.gdbm} CONFIGURE_ARGS+= --with-gdchart-root=${BUILDLINK_PREFIX.gdchart} -CONFIGURE_ARGS+= --with-localedir=${LOCALBASE}/${PKGLOCALEDIR} +CONFIGURE_ARGS+= --with-localedir=${PREFIX}/${PKGLOCALEDIR} CONFIGURE_ARGS+= --with-libpng-root=${BUILDLINK_PREFIX.png} CONFIGURE_ARGS+= --with-ossl-root=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-pcap-root=${BUILDLINK_PREFIX.libpcap} diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index bbb2bc27f8c..5ad75e68ea3 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/12 05:26:47 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/17 04:49:47 jlam Exp $ # DISTNAME= tightvnc-1.2.9 @@ -36,7 +36,7 @@ post-install: ${PREFIX}/bin/vncpasswd ${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \ ${PREFIX}/man/man1/vncpasswd.1 - ${SED} -e 's|/usr/local/vnc/classes|${X11PREFIX}/share/vnc/classes|g' \ + ${SED} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \ -e 's|/usr/bin/perl|${PERL5}|g' \ < ${WRKSRC}/vncserver \ > ${WRKSRC}/vncserver.local diff --git a/net/vnc/Makefile b/net/vnc/Makefile index a3b8bc13544..a54a474da7d 100644 --- a/net/vnc/Makefile +++ b/net/vnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/04/18 13:23:13 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/17 04:49:47 jlam Exp $ DISTNAME= vnc-3.3.3r2 PKGNAME= vnc-3.3.3.2 @@ -42,7 +42,7 @@ post-install: .endif ${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd - ${SED} -e 's|/usr/local/vnc/classes|${X11PREFIX}/share/vnc/classes|g' \ + ${SED} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \ -e 's|/usr/bin/perl|${PERL5}|g' \ < ${WRKSRC}/vncserver \ > ${WRKSRC}/vncserver.local diff --git a/news/suck/Makefile b/news/suck/Makefile index 195efe49c7d..da11ff86288 100644 --- a/news/suck/Makefile +++ b/news/suck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:03 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/17 04:49:47 jlam Exp $ # DISTNAME= suck-4.3.2 @@ -26,14 +26,14 @@ GNU_CONFIGURE= yes .endif post-patch: - ${SED} -e 's|%%%HISTORY%%%|${LOCALBASE}/etc/news/history|g' \ + ${SED} -e 's|%%%HISTORY%%%|${PREFIX}/etc/news/history|g' \ ${WRKSRC}/Makefile.in >${WRKSRC}/Makefile.tmp @${MV} ${WRKSRC}/Makefile.tmp ${WRKSRC}/Makefile.in post-install: - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/examples/suck - ${CP} ${WRKSRC}/sample/* ${LOCALBASE}/share/examples/suck - ${CHMOD} 644 ${LOCALBASE}/share/examples/suck/* + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/suck + ${CP} ${WRKSRC}/sample/* ${PREFIX}/share/examples/suck + ${CHMOD} 644 ${PREFIX}/share/examples/suck/* #.include "../../databases/gdbm/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/news/xrn/Makefile b/news/xrn/Makefile index 243941f5391..0c611ae435e 100644 --- a/news/xrn/Makefile +++ b/news/xrn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/20 12:22:41 agc Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/17 04:49:47 jlam Exp $ # DISTNAME= 9.01 @@ -18,9 +18,9 @@ DIST_SUBDIR= xrn USE_IMAKE= yes pre-install: - ${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/xrn + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xrn for f in COMMON-PROBLMS COPYRIGHT CREDITS ChangeLog; do \ - ${INSTALL_DATA} ${WRKSRC}/$$f ${X11PREFIX}/share/doc/xrn; \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/xrn; \ done .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/shlock/Makefile b/pkgtools/shlock/Makefile index b7a61b6d4d9..53df6cd84ce 100644 --- a/pkgtools/shlock/Makefile +++ b/pkgtools/shlock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/25 02:23:15 reed Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/17 04:49:47 jlam Exp $ # DISTNAME= shlock-20020114 @@ -17,7 +17,7 @@ MANCOMPRESSED_IF_MANZ= yes PLIST_SRC= ${WRKDIR}/PLIST BUILD_DEFS+= MANINSTALL -MAKE_ENV+= BINDIR=${LOCALBASE}/bin MANDIR=${LOCALBASE}/man +MAKE_ENV+= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} MAKE_ENV+= MANOWN=${BINOWN} MANGRP=${BINGRP} diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile index bfadbbaeedf..0996481f95a 100644 --- a/print/apsfilter/Makefile +++ b/print/apsfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/20 12:24:28 agc Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/17 04:49:48 jlam Exp $ # DISTNAME= apsfilter-7.2.5 @@ -22,7 +22,7 @@ HAS_CONFIGURE= YES USE_BZIP2= YES USE_PKGINSTALL= YES -CONFIGURE_ARGS+=--prefix=${LOCALBASE} +CONFIGURE_ARGS+=--prefix=${PREFIX} CONFIGURE_ARGS+=--with-shell=${SH} CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR} diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile index e1e0a3903c8..f7d4f319abd 100644 --- a/print/hpijs/Makefile +++ b/print/hpijs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/06/17 03:50:30 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/17 04:49:48 jlam Exp $ DISTNAME= hpijs-1.7.1 PKGREVISION= # empty @@ -20,12 +20,12 @@ ONLY_FOR_COMPILER= gcc INSTALLATION_DIRS= bin do-install: - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/ppd - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/html/hpijs - cd ${WRKSRC} && ${CP} hpijs ${LOCALBASE}/bin/hpijs + ${INSTALL_DATA_DIR} ${PREFIX}/share/ppd + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/hpijs + cd ${WRKSRC} && ${CP} hpijs ${PREFIX}/bin/hpijs cd ${WRKSRC} && ${CP} hpijs_readme.html gs_hpijs.png \ - ${LOCALBASE}/share/doc/html/hpijs/ - cd ${WRKSRC} && ${CP} ppd/HP* ${LOCALBASE}/share/ppd/ - ${GZIP_CMD} ${LOCALBASE}/share/ppd/HP*.ppd + ${PREFIX}/share/doc/html/hpijs/ + cd ${WRKSRC} && ${CP} ppd/HP* ${PREFIX}/share/ppd/ + ${GZIP_CMD} ${PREFIX}/share/ppd/HP*.ppd .include "../../mk/bsd.pkg.mk" diff --git a/security/rats/Makefile b/security/rats/Makefile index 392b492ee1d..86bccf6c1f2 100644 --- a/security/rats/Makefile +++ b/security/rats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:18 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/17 04:49:48 jlam Exp $ # DISTNAME= rats-2.1 @@ -13,7 +13,7 @@ COMMENT= Rough Auditing Tool for Security PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --datadir=${LOCALBASE}/share/rats +CONFIGURE_ARGS+= --datadir=${PREFIX}/share/rats BUILD_TARGET= rats .include "../../textproc/expat/buildlink3.mk" diff --git a/security/tct/Makefile b/security/tct/Makefile index 4b4547aaaf2..d82851d82f4 100644 --- a/security/tct/Makefile +++ b/security/tct/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:20 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/17 04:49:48 jlam Exp $ # DISTNAME= tct-1.09 @@ -17,30 +17,30 @@ REPLACE_PERL+= extras/bdf extras/ils2mac extras/realpath REPLACE_PERL+= lazarus/lazarus do-install: - ${INSTALL_PROGRAM_DIR} ${LOCALBASE}/tct/bin + ${INSTALL_PROGRAM_DIR} ${PREFIX}/tct/bin cd ${WRKSRC}/bin && \ for f in grave-robber mactime; do \ - ${INSTALL_SCRIPT} $$f ${LOCALBASE}/tct/bin; \ + ${INSTALL_SCRIPT} $$f ${PREFIX}/tct/bin; \ done; \ for f in file icat ils lastcomm major_minor md5 pcat timeout unrm; do \ - ${INSTALL_PROGRAM} $$f ${LOCALBASE}/tct/bin; \ + ${INSTALL_PROGRAM} $$f ${PREFIX}/tct/bin; \ done cd ${WRKSRC}/extras && \ for f in bdf ils2mac realpath; do \ - ${INSTALL_SCRIPT} $$f ${LOCALBASE}/tct/bin; \ + ${INSTALL_SCRIPT} $$f ${PREFIX}/tct/bin; \ done - ${INSTALL_SCRIPT} ${WRKSRC}/lazarus/lazarus ${LOCALBASE}/tct/bin - ${INSTALL_PROGRAM_DIR} ${LOCALBASE}/tct/etc - cd ${WRKSRC}/etc && ${INSTALL_DATA} magic ${LOCALBASE}/tct/etc - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/tct + ${INSTALL_SCRIPT} ${WRKSRC}/lazarus/lazarus ${PREFIX}/tct/bin + ${INSTALL_PROGRAM_DIR} ${PREFIX}/tct/etc + cd ${WRKSRC}/etc && ${INSTALL_DATA} magic ${PREFIX}/tct/etc + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tct cd ${WRKSRC}/docs && \ for f in README design-notes grave-robber.README lazarus.README mac.README; do \ - ${INSTALL_DATA} $$f ${LOCALBASE}/share/doc/tct; \ + ${INSTALL_DATA} $$f ${PREFIX}/share/doc/tct; \ done ${INSTALL_DATA_DIR} ${PERL5_SITEARCH} cd ${WRKSRC}/lib && ${INSTALL_DATA} *.pl ${PERL5_SITEARCH} - ${INSTALL_PROGRAM_DIR} ${LOCALBASE}/tct/conf - cd ${WRKSRC}/conf && ${INSTALL_DATA} paths.pl *.cf ${LOCALBASE}/tct/conf + ${INSTALL_PROGRAM_DIR} ${PREFIX}/tct/conf + cd ${WRKSRC}/conf && ${INSTALL_DATA} paths.pl *.cf ${PREFIX}/tct/conf .include "../../lang/perl5/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile index 4b54f621d9c..5043557489e 100644 --- a/sysutils/grun/Makefile +++ b/sysutils/grun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:22 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/17 04:49:48 jlam Exp $ DISTNAME= grun-0.9.2 PKGREVISION= 3 @@ -14,7 +14,7 @@ USE_TOOLS+= gmake PTHREAD_OPTS+= require post-install: - ${MV} ${LOCALBASE}/man/man1/grun.1x ${LOCALBASE}/man/man1/grun.1 + ${MV} ${PREFIX}/man/man1/grun.1x ${PREFIX}/man/man1/grun.1 .include "../../x11/gtk/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/sysutils/memconf/Makefile b/sysutils/memconf/Makefile index 4d583d0bf85..f8d5da5daa2 100644 --- a/sysutils/memconf/Makefile +++ b/sysutils/memconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:34 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/17 04:49:48 jlam Exp $ # DISTNAME= memconf @@ -18,6 +18,6 @@ NO_BUILD= yes INSTALLATION_DIRS= sbin do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/memconf ${LOCALBASE}/sbin/memconf + ${INSTALL_SCRIPT} ${WRKSRC}/memconf ${PREFIX}/sbin/memconf .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile index 2136bbede44..004f667cb8d 100644 --- a/sysutils/xbatt/Makefile +++ b/sysutils/xbatt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:30 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/17 04:49:49 jlam Exp $ # DISTNAME= xbatt-1.3pr1 @@ -20,7 +20,7 @@ USE_IMAKE= YES BUILD_TARGET= xbatt post-install: - ${INSTALL_DATA} ${FILESDIR}/XBatt ${X11PREFIX}/lib/X11/app-defaults/XBatt + ${INSTALL_DATA} ${FILESDIR}/XBatt ${PREFIX}/lib/X11/app-defaults/XBatt ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/xbatt ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/xbatt ${INSTALL_MAN} ${WRKSRC}/README.jp ${PREFIX}/share/doc/xbatt diff --git a/textproc/subtitleripper/Makefile b/textproc/subtitleripper/Makefile index f5c55d9ca58..73eca692082 100644 --- a/textproc/subtitleripper/Makefile +++ b/textproc/subtitleripper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:37 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/17 04:49:49 jlam Exp $ # DISTNAME= subtitleripper-0.3-1 @@ -22,11 +22,11 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/subtitle2pgm ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/srttool ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/subtitle2vobsub ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/subtitleripper + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/subtitleripper cd ${WRKSRC}; ${INSTALL_DATA} README README.gocr README.srttool \ README.subtitle2pgm README.vobsub gocrfilter_en.sed \ gocrfilter_fr.sed gocrfilter_nl.sed gocrfilter_none.sed \ - ${LOCALBASE}/share/doc/subtitleripper + ${PREFIX}/share/doc/subtitleripper .include "../../graphics/netpbm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/chimera/Makefile b/www/chimera/Makefile index b2a9ee13784..5c5cb154eda 100644 --- a/www/chimera/Makefile +++ b/www/chimera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:52 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/17 04:49:49 jlam Exp $ # DISTNAME= chimera-2.0a19 @@ -20,9 +20,9 @@ pre-configure: Common.tmpl.dist > Common.tmpl post-install: - ${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/chimera + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/chimera cd ${WRKSRC}/doc && ${INSTALL_DATA} \ - HINTS INFO LICENSE ${X11PREFIX}/share/doc/chimera + HINTS INFO LICENSE ${PREFIX}/share/doc/chimera .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile index 0e4fe0e409c..afb259f89b4 100644 --- a/www/htmllint/Makefile +++ b/www/htmllint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/17 03:50:40 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/17 04:49:49 jlam Exp $ # DISTNAME= htmllint @@ -20,8 +20,8 @@ REPLACE_PERL= htmllint.cgi htmllint parsedtd.pl tagslist.cgi USE_PERL5= # defined NO_BUILD= # defined -CGIDIR= ${LOCALBASE}/libexec/cgi-bin -HTMLDIR= ${LOCALBASE}/share/httpd/htdocs/htmllint +CGIDIR= ${PREFIX}/libexec/cgi-bin +HTMLDIR= ${PREFIX}/share/httpd/htdocs/htmllint IMGDIR= ${HTMLDIR}/images INSTALLATION_DIRS= bin diff --git a/www/snownews/Makefile b/www/snownews/Makefile index 194ac82b707..695295231c1 100644 --- a/www/snownews/Makefile +++ b/www/snownews/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:42 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/17 04:49:49 jlam Exp $ DISTNAME= snownews-1.5.5.1 CATEGORIES= www @@ -24,17 +24,17 @@ MAKE_ENV+= EXTRA_LDFLAGS="${LDFLAGS} ${BUILDLINK_LDADD.gettext}" INSTALLATION_DIRS= bin man/man1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/snownews ${LOCALBASE}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/opml2snow ${LOCALBASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/snownews ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/opml2snow ${PREFIX}/bin .for M in de fr it nl ru_RU.KOI8-R - ${INSTALL_DATA_DIR} ${LOCALBASE}/man/${M}/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/man/${M}/snownews.1 ${LOCALBASE}/man/${M}/man1 + ${INSTALL_DATA_DIR} ${PREFIX}/man/${M}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/man/${M}/snownews.1 ${PREFIX}/man/${M}/man1 .endfor - ${INSTALL_MAN} ${WRKSRC}/doc/man/snownews.1 ${LOCALBASE}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/man/opml2snow.1 ${LOCALBASE}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/man/snownews.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/man/opml2snow.1 ${PREFIX}/man/man1 .for L in de es nl pt_BR ru sl zh_TW - ${INSTALL_DATA_DIR} ${LOCALBASE}/${PKGLOCALEDIR}/locale/${L}/LC_MESSAGES - ${INSTALL_DATA} ${WRKSRC}/po/${L}.mo ${LOCALBASE}/${PKGLOCALEDIR}/locale/${L}/LC_MESSAGES/snownews.mo + ${INSTALL_DATA_DIR} ${PREFIX}/${PKGLOCALEDIR}/locale/${L}/LC_MESSAGES + ${INSTALL_DATA} ${WRKSRC}/po/${L}.mo ${PREFIX}/${PKGLOCALEDIR}/locale/${L}/LC_MESSAGES/snownews.mo .endfor .include "../../converters/libiconv/buildlink3.mk" diff --git a/www/weex/Makefile b/www/weex/Makefile index 19fd1a005d1..b8df83b0d27 100644 --- a/www/weex/Makefile +++ b/www/weex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:48:03 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/17 04:49:49 jlam Exp $ DISTNAME= weex-2.6.1 CATEGORIES= www @@ -18,12 +18,12 @@ WEEX_DOCS= AUTHORS BUGS BUGS.ja COPYING COPYING.ja \ WEEX_DOCDIR= share/doc/weex post-install: - ${INSTALL_DATA_DIR} ${LOCALBASE}/${WEEX_DOCDIR} + ${INSTALL_DATA_DIR} ${PREFIX}/${WEEX_DOCDIR} .for f in ${WEEX_DOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${LOCALBASE}/${WEEX_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/${WEEX_DOCDIR} .endfor - ${INSTALL_DATA_DIR} ${LOCALBASE}/share/examples/weex + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/weex ${INSTALL_DATA} ${WRKSRC}/doc/sample.weexrc \ - ${LOCALBASE}/share/examples/weex + ${PREFIX}/share/examples/weex .include "../../mk/bsd.pkg.mk" diff --git a/x11/control-center/Makefile b/x11/control-center/Makefile index 6320806642b..b1d8087ec7b 100644 --- a/x11/control-center/Makefile +++ b/x11/control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/05/31 22:09:35 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2005/06/17 04:49:49 jlam Exp $ DISTNAME= control-center-1.4.0.4 PKGREVISION= 10 @@ -18,7 +18,7 @@ USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES -LOCALSTATEDIR= ${X11PREFIX}/var +LOCALSTATEDIR= ${PREFIX}/var GNU_CONFIGURE= YES CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 6964f741f52..f9b9c14364a 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.108 2005/06/01 18:03:29 jlam Exp $ +# $NetBSD: Makefile,v 1.109 2005/06/17 04:49:49 jlam Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 8 @@ -29,7 +29,7 @@ PKGCONFIG_OVERRIDE+= gtk+.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-xinput=xfree \ --with-native-locale=yes \ - --sysconfdir=${X11PREFIX}/share + --sysconfdir=${PREFIX}/share CONFIGURE_ENV+= X_LDFLAGS="${X_LDFLAGS}" INFO_FILES= gdk.info gtk.info diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 02deafe541f..a442000f88a 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.47 2005/06/17 04:49:49 jlam Exp $ DISTNAME= rxvt-2.7.10 PKGREVISION= 4 @@ -58,11 +58,12 @@ CFLAGS+= -DSunOS post-patch: ${MV} ${WRKSRC}/src/feature.h ${WRKSRC}/src/feature.h.orig ${SED} < ${WRKSRC}/src/feature.h.orig > ${WRKSRC}/src/feature.h \ - -e "s:/usr/lib/X11/app-defaults:${X11PREFIX}/lib/X11/app-defaults:" + -e "s:/usr/lib/X11/app-defaults:${PREFIX}/lib/X11/app-defaults:" pre-install: - if [ ! -f ${X11PREFIX}/lib/X11/app-defaults/Rxvt ]; then \ - ${INSTALL_DATA} ${FILESDIR}/Rxvt ${X11PREFIX}/lib/X11/app-defaults; \ + if [ ! -f ${PREFIX}/lib/X11/app-defaults/Rxvt ]; then \ + ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/app-defaults; \ + ${INSTALL_DATA} ${FILESDIR}/Rxvt ${PREFIX}/lib/X11/app-defaults; \ fi .include "../../graphics/xpm/buildlink3.mk" diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile index 421bce175a4..8373f3f829f 100644 --- a/x11/ssystem/Makefile +++ b/x11/ssystem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:44 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/17 04:49:49 jlam Exp $ # DISTNAME= ssystem-1.6 @@ -23,13 +23,13 @@ INSTALLATION_DIRS= bin do-install: cd ${WRKSRC} && \ - ${INSTALL_PROGRAM} ssystem ${X11PREFIX}/bin; \ - ${INSTALL_DATA_DIR} ${X11PREFIX}/share/ssystem; \ - ${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/ssystem; \ - ${INSTALL_DATA_DIR} ${X11PREFIX}/share/ssystem/hires; \ - ${INSTALL_DATA} ${DATA_FILES} ${X11PREFIX}/share/ssystem; \ - ${INSTALL_DATA} ${DOC_FILES} ${X11PREFIX}/share/doc/ssystem; \ - ${INSTALL_DATA} hires/README ${X11PREFIX}/share/ssystem/hires + ${INSTALL_PROGRAM} ssystem ${PREFIX}/bin; \ + ${INSTALL_DATA_DIR} ${PREFIX}/share/ssystem; \ + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ssystem; \ + ${INSTALL_DATA_DIR} ${PREFIX}/share/ssystem/hires; \ + ${INSTALL_DATA} ${DATA_FILES} ${PREFIX}/share/ssystem; \ + ${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/share/doc/ssystem; \ + ${INSTALL_DATA} hires/README ${PREFIX}/share/ssystem/hires .include "../../graphics/Mesa/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile index a1bce933a66..25b23b9787a 100644 --- a/x11/xglobe/Makefile +++ b/x11/xglobe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/17 04:49:49 jlam Exp $ # DISTNAME= xglobe-0.5 @@ -26,14 +26,14 @@ USE_X11BASE= YES USE_TOOLS+= gmake post-install: - ${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xglobe - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/mggd.gif ${X11PREFIX}/lib/xglobe/mggd.gif - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/LE.400.gif ${X11PREFIX}/lib/xglobe/daymap.gif - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Brill.400.gif ${X11PREFIX}/lib/xglobe/nightmap.gif - ${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/xglobe - ${INSTALL_DATA} ${WRKSRC}/README ${X11PREFIX}/share/doc/xglobe - ${INSTALL_DATA} ${WRKSRC}/README.maps ${X11PREFIX}/share/doc/xglobe - ${INSTALL_DATA} ${WRKSRC}/getcloudmap.sh ${X11PREFIX}/bin/xglobe-getcloudmap.sh + ${INSTALL_DATA_DIR} ${PREFIX}/lib/xglobe + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/mggd.gif ${PREFIX}/lib/xglobe/mggd.gif + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/LE.400.gif ${PREFIX}/lib/xglobe/daymap.gif + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Brill.400.gif ${PREFIX}/lib/xglobe/nightmap.gif + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xglobe + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xglobe + ${INSTALL_DATA} ${WRKSRC}/README.maps ${PREFIX}/share/doc/xglobe + ${INSTALL_DATA} ${WRKSRC}/getcloudmap.sh ${PREFIX}/bin/xglobe-getcloudmap.sh .include "../../x11/qt3-libs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile index 2c4ef94435f..6cbba9fea46 100644 --- a/x11/xmove/Makefile +++ b/x11/xmove/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/20 12:28:28 agc Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/17 04:49:49 jlam Exp $ # DISTNAME= xmove.2.0beta2 @@ -11,7 +11,7 @@ COMMENT= Move an X11 display between screens and displays WRKSRC= ${WRKDIR}/xmove USE_IMAKE= yes -XMOVEDOCDIR= ${X11PREFIX}/share/doc/xmove +XMOVEDOCDIR= ${PREFIX}/share/doc/xmove pre-configure: @${SED} -e 's|@x11base@|'${X11PREFIX}'|' < ${WRKSRC}/xmove/Imakefile > ${WRKSRC}/xmove/Imakefile.new && \ diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index 19b89791483..07a8686a735 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:33 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/17 04:49:49 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-clients-${XORG_VER} @@ -27,7 +27,7 @@ OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm/authdir \ OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm/authdir/authfiles \ ${ROOT_USER} ${ROOT_GROUP} 0700 -EGDIR= ${LOCALBASE}/share/examples/xorg/xdm +EGDIR= ${PREFIX}/share/examples/xorg/xdm PKG_SYSCONFSUBDIR= xorg/xdm CONF_FILES= ${EGDIR}/xdm-config ${PKG_SYSCONFDIR}/xdm-config |