[pkgsrc/trunk]: pkgsrc Fix inappropriate uses of ${LOCALBASE} or ${X11PREFIX}...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aab14c8c4485
branches:  trunk
changeset: 495670:aab14c8c4485
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jun 17 04:49:45 2005 +0000

description:
Fix inappropriate uses of ${LOCALBASE} or ${X11PREFIX} instead of
${PREFIX}.

diffstat:

 audio/gqmpeg-skins/Makefile      |   4 ++--
 audio/taglib/Makefile            |   4 ++--
 audio/toolame/Makefile           |   6 +++---
 benchmarks/httperf/Makefile      |   6 +++---
 cad/xchiplogo/Makefile           |   4 ++--
 cross/binutils/Makefile          |   4 ++--
 databases/oraedit/Makefile       |   4 ++--
 devel/cvs2cl/Makefile            |   4 ++--
 devel/mrproject/Makefile         |   4 ++--
 devel/prc-tools/Makefile         |   6 +++---
 devel/ruby-optparse/Makefile     |   4 ++--
 emulators/ia64sim/Makefile       |   4 ++--
 fonts/ja-elisat/Makefile         |   4 ++--
 fonts/ja-elisau/Makefile         |   4 ++--
 fonts/ja-kaname/Makefile         |   4 ++--
 fonts/ja-naga10/Makefile         |   4 ++--
 fonts/type1inst/Makefile         |  12 ++++++------
 games/crossfire-cli/Makefile     |  14 +++++++-------
 games/crossfire-srv/Makefile     |  14 +++++++-------
 games/freesci/Makefile           |   6 +++---
 games/lbreakout2/Makefile        |   6 +++---
 games/scummvm/Makefile           |   4 ++--
 games/tanked/Makefile            |   6 +++---
 games/xboing/Makefile            |   8 ++++----
 games/xdoom/Makefile             |   4 ++--
 games/xjig/Makefile              |   6 +++---
 games/xpipeman/Makefile          |   8 ++++----
 games/zoom/Makefile              |   4 ++--
 graphics/dvdbackup/Makefile      |   4 ++--
 graphics/gnuplot/Makefile.common |   4 ++--
 graphics/jpeg2ps/Makefile        |   6 +++---
 lang/SmartEiffel/Makefile        |   4 ++--
 lang/baci/Makefile               |  14 +++++++-------
 lang/clisp/Makefile              |   4 ++--
 lang/drscheme/Makefile           |   6 +++---
 lang/gcc34-ada/Makefile          |   6 +++---
 lang/ruby/Makefile               |   4 ++--
 lang/sr/Makefile                 |   4 ++--
 mail/jchkmail/Makefile           |   6 +++---
 math/snns/Makefile               |  12 ++++++------
 multimedia/mpeg_encode/Makefile  |  16 ++++++++--------
 net/chrony/Makefile              |   4 ++--
 net/firewalk/Makefile            |   4 ++--
 net/fping/Makefile               |   4 ++--
 net/fping6/Makefile              |   4 ++--
 net/ntop/Makefile                |   4 ++--
 net/tightvnc/Makefile            |   4 ++--
 net/vnc/Makefile                 |   4 ++--
 news/suck/Makefile               |  10 +++++-----
 news/xrn/Makefile                |   6 +++---
 pkgtools/shlock/Makefile         |   4 ++--
 print/apsfilter/Makefile         |   4 ++--
 print/hpijs/Makefile             |  14 +++++++-------
 security/rats/Makefile           |   4 ++--
 security/tct/Makefile            |  24 ++++++++++++------------
 sysutils/grun/Makefile           |   4 ++--
 sysutils/memconf/Makefile        |   4 ++--
 sysutils/xbatt/Makefile          |   4 ++--
 textproc/subtitleripper/Makefile |   6 +++---
 www/chimera/Makefile             |   6 +++---
 www/htmllint/Makefile            |   6 +++---
 www/snownews/Makefile            |  18 +++++++++---------
 www/weex/Makefile                |  10 +++++-----
 x11/control-center/Makefile      |   4 ++--
 x11/gtk/Makefile                 |   4 ++--
 x11/rxvt/Makefile                |   9 +++++----
 x11/ssystem/Makefile             |  16 ++++++++--------
 x11/xglobe/Makefile              |  18 +++++++++---------
 x11/xmove/Makefile               |   4 ++--
 x11/xorg-clients/Makefile        |   4 ++--
 70 files changed, 232 insertions(+), 231 deletions(-)

diffs (truncated from 1499 to 300 lines):

diff -r a0efe9de9cc5 -r aab14c8c4485 audio/gqmpeg-skins/Makefile
--- a/audio/gqmpeg-skins/Makefile       Fri Jun 17 04:13:26 2005 +0000
+++ b/audio/gqmpeg-skins/Makefile       Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 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 -r a0efe9de9cc5 -r aab14c8c4485 audio/taglib/Makefile
--- a/audio/taglib/Makefile     Fri Jun 17 04:13:26 2005 +0000
+++ b/audio/taglib/Makefile     Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 
 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 -r a0efe9de9cc5 -r aab14c8c4485 audio/toolame/Makefile
--- a/audio/toolame/Makefile    Fri Jun 17 04:13:26 2005 +0000
+++ b/audio/toolame/Makefile    Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 
 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 -r a0efe9de9cc5 -r aab14c8c4485 benchmarks/httperf/Makefile
--- a/benchmarks/httperf/Makefile       Fri Jun 17 04:13:26 2005 +0000
+++ b/benchmarks/httperf/Makefile       Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 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 -r a0efe9de9cc5 -r aab14c8c4485 cad/xchiplogo/Makefile
--- a/cad/xchiplogo/Makefile    Fri Jun 17 04:13:26 2005 +0000
+++ b/cad/xchiplogo/Makefile    Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 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 -r a0efe9de9cc5 -r aab14c8c4485 cross/binutils/Makefile
--- a/cross/binutils/Makefile   Fri Jun 17 04:13:26 2005 +0000
+++ b/cross/binutils/Makefile   Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
        ${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 -r a0efe9de9cc5 -r aab14c8c4485 databases/oraedit/Makefile
--- a/databases/oraedit/Makefile        Fri Jun 17 04:13:26 2005 +0000
+++ b/databases/oraedit/Makefile        Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 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 -r a0efe9de9cc5 -r aab14c8c4485 devel/cvs2cl/Makefile
--- a/devel/cvs2cl/Makefile     Fri Jun 17 04:13:26 2005 +0000
+++ b/devel/cvs2cl/Makefile     Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 
 do-install:
        ${INSTALL_SCRIPT} ${DISTDIR}/${DISTNAME} \
-               ${LOCALBASE}/bin/${DISTNAME:C/-.*$//}
+               ${PREFIX}/bin/${DISTNAME:C/-.*$//}
 
 .include "../../mk/bsd.pkg.mk"
diff -r a0efe9de9cc5 -r aab14c8c4485 devel/mrproject/Makefile
--- a/devel/mrproject/Makefile  Fri Jun 17 04:13:26 2005 +0000
+++ b/devel/mrproject/Makefile  Fri Jun 17 04:49:45 2005 +0000
@@ -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_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 -r a0efe9de9cc5 -r aab14c8c4485 devel/prc-tools/Makefile
--- a/devel/prc-tools/Makefile  Fri Jun 17 04:13:26 2005 +0000
+++ b/devel/prc-tools/Makefile  Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 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 -r a0efe9de9cc5 -r aab14c8c4485 devel/ruby-optparse/Makefile
--- a/devel/ruby-optparse/Makefile      Fri Jun 17 04:13:26 2005 +0000
+++ b/devel/ruby-optparse/Makefile      Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 .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 -r a0efe9de9cc5 -r aab14c8c4485 emulators/ia64sim/Makefile
--- a/emulators/ia64sim/Makefile        Fri Jun 17 04:13:26 2005 +0000
+++ b/emulators/ia64sim/Makefile        Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 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 -r a0efe9de9cc5 -r aab14c8c4485 fonts/ja-elisat/Makefile
--- a/fonts/ja-elisat/Makefile  Fri Jun 17 04:13:26 2005 +0000
+++ b/fonts/ja-elisat/Makefile  Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 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 -r a0efe9de9cc5 -r aab14c8c4485 fonts/ja-elisau/Makefile
--- a/fonts/ja-elisau/Makefile  Fri Jun 17 04:13:26 2005 +0000
+++ b/fonts/ja-elisau/Makefile  Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 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 -r a0efe9de9cc5 -r aab14c8c4485 fonts/ja-kaname/Makefile
--- a/fonts/ja-kaname/Makefile  Fri Jun 17 04:13:26 2005 +0000
+++ b/fonts/ja-kaname/Makefile  Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 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 -r a0efe9de9cc5 -r aab14c8c4485 fonts/ja-naga10/Makefile
--- a/fonts/ja-naga10/Makefile  Fri Jun 17 04:13:26 2005 +0000
+++ b/fonts/ja-naga10/Makefile  Fri Jun 17 04:49:45 2005 +0000
@@ -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 @@
 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 -r a0efe9de9cc5 -r aab14c8c4485 fonts/type1inst/Makefile
--- a/fonts/type1inst/Makefile  Fri Jun 17 04:13:26 2005 +0000
+++ b/fonts/type1inst/Makefile  Fri Jun 17 04:49:45 2005 +0000
@@ -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 $
 #