[pkgsrc/trunk]: pkgsrc Back out previous. Pointed out by uebayasi@ and martti@.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/27327ea1a011
branches:  trunk
changeset: 533710:27327ea1a011
user:      hira <hira%pkgsrc.org@localhost>
date:      Tue Sep 25 10:03:52 2007 +0000

description:
Back out previous.  Pointed out by uebayasi@ and martti@.

diffstat:

 archivers/p7zip/Makefile         |   6 +++---
 chat/finch/Makefile              |   4 ++--
 chat/pidgin/Makefile             |   4 ++--
 comms/mgetty+sendfax/Makefile    |   4 ++--
 comms/obexapp/Makefile           |   4 ++--
 databases/freetds/Makefile       |   4 ++--
 databases/pgtclng/Makefile       |   4 ++--
 devel/flex/Makefile              |   4 ++--
 devel/ncurses/Makefile           |   6 +++---
 emulators/bochs/Makefile         |   4 ++--
 emulators/xm7/Makefile           |   4 ++--
 games/asc/Makefile               |   4 ++--
 games/craft/Makefile             |   4 ++--
 games/gtkballs/Makefile          |   4 ++--
 graphics/gimp-fix-ca/Makefile    |   4 ++--
 graphics/libscigraphica/Makefile |   4 ++--
 graphics/scigraphica/Makefile    |   4 ++--
 graphics/xpm/Makefile            |   4 ++--
 lang/f2c/Makefile                |   8 ++++----
 lang/tcl/Makefile                |   4 ++--
 mail/squirrelmail/Makefile       |   4 ++--
 net/samba/Makefile               |   4 ++--
 parallel/sge/Makefile            |  10 +++++-----
 regress/compiler/Makefile        |   4 ++--
 sysutils/cdrtools/Makefile       |   8 ++++----
 x11/kdebase3/Makefile            |   4 ++--
 x11/qt4-tools/Makefile           |   8 ++++----
 x11/tk/Makefile                  |   4 ++--
 28 files changed, 67 insertions(+), 67 deletions(-)

diffs (truncated from 534 to 300 lines):

diff -r 42293b181271 -r 27327ea1a011 archivers/p7zip/Makefile
--- a/archivers/p7zip/Makefile  Tue Sep 25 08:49:03 2007 +0000
+++ b/archivers/p7zip/Makefile  Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2007/09/25 08:31:52 hira Exp $
+# $NetBSD: Makefile,v 1.36 2007/09/25 10:03:52 hira Exp $
 
 DISTNAME=      p7zip_4.55_src_all
 PKGNAME=       p7zip-4.55
@@ -55,9 +55,9 @@
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${PREFIX}/lib/7z
        ${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* ${PREFIX}/lib/7z/Codecs
        ${INSTALL_LIB} ${WRKSRC}/bin/Formats/* ${PREFIX}/lib/7z/Formats
-       ${LN} -s ${PREFIX}/lib/7z/7z ${PREFIX}/bin
+       ln -s ${PREFIX}/lib/7z/7z ${PREFIX}/bin
 .else
-       ${LN} -s 7za ${PREFIX}/bin/7z
+       ln -s 7za ${PREFIX}/bin/7z
 .endif
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/p7zip
        ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/*.* ${PREFIX}/share/doc/p7zip
diff -r 42293b181271 -r 27327ea1a011 chat/finch/Makefile
--- a/chat/finch/Makefile       Tue Sep 25 08:49:03 2007 +0000
+++ b/chat/finch/Makefile       Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/25 10:03:52 hira Exp $
 #
 
 PKGNAME=       finch-${PIDGIN_VERSION}
@@ -33,7 +33,7 @@
 pre-build:
        # XXX Find a cleaner way.
        ${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \
-         ${LN} -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
+         ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
 
 post-install:
        ${INSTALL_MAN_DIR} ${DESTDIR:Q}${PREFIX:Q}/man/man1
diff -r 42293b181271 -r 27327ea1a011 chat/pidgin/Makefile
--- a/chat/pidgin/Makefile      Tue Sep 25 08:49:03 2007 +0000
+++ b/chat/pidgin/Makefile      Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/25 10:03:52 hira Exp $
 #
 
 PKGNAME=               pidgin-${PIDGIN_VERSION}
@@ -29,7 +29,7 @@
 pre-build:
        # XXX Find a cleaner way.
        ${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \
-         ${LN} -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
+         ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
 
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r 42293b181271 -r 27327ea1a011 comms/mgetty+sendfax/Makefile
--- a/comms/mgetty+sendfax/Makefile     Tue Sep 25 08:49:03 2007 +0000
+++ b/comms/mgetty+sendfax/Makefile     Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2007/09/25 08:49:03 hira Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/25 10:07:05 hira Exp $
 
 DISTNAME=      mgetty1.1.31-Jul24
 PKGNAME=       mgetty-1.1.31
@@ -63,6 +63,6 @@
        cd ${WRKSRC} && cp policy.h-dist policy.h
 
 do-configure:
-       ${MV} ${WRKSRC}/doc/fax.1in ${WRKSRC}/doc/sendfax.1in
+       mv ${WRKSRC}/doc/fax.1in ${WRKSRC}/doc/sendfax.1in
 
 .include "../../mk/bsd.pkg.mk"
diff -r 42293b181271 -r 27327ea1a011 comms/obexapp/Makefile
--- a/comms/obexapp/Makefile    Tue Sep 25 08:49:03 2007 +0000
+++ b/comms/obexapp/Makefile    Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/09/25 08:49:04 hira Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/25 10:07:05 hira Exp $
 #
 
 DISTNAME=      obexapp-1.4.7
@@ -27,7 +27,7 @@
 
 # because the directory name conflicts with the rc.d script
 post-extract:
-       ${MV} ${WRKDIR}/obexapp ${WRKDIR}/${DISTNAME}
+       mv ${WRKDIR}/obexapp ${WRKDIR}/${DISTNAME}
 
 .include "../../comms/openobex/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff -r 42293b181271 -r 27327ea1a011 databases/freetds/Makefile
--- a/databases/freetds/Makefile        Tue Sep 25 08:49:03 2007 +0000
+++ b/databases/freetds/Makefile        Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/25 10:03:52 hira Exp $
 
 DISTNAME=      freetds-0.63
 PKGREVISION=   4
@@ -38,7 +38,7 @@
 # easily changing the installation directory for the documentation.
 #
 pre-build:
-       cd ${WRKSRC}/doc/doc && ${LN} -s ${PKGNAME_NOREV:Q} ${PKGBASE:Q}
+       cd ${WRKSRC}/doc/doc && ln -s ${PKGNAME_NOREV:Q} ${PKGBASE:Q}
 
 # Dynamically generate PLIST entries for the documentation.  This target
 # may need to be modified for future FreeTDS releases.
diff -r 42293b181271 -r 27327ea1a011 databases/pgtclng/Makefile
--- a/databases/pgtclng/Makefile        Tue Sep 25 08:49:03 2007 +0000
+++ b/databases/pgtclng/Makefile        Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/25 10:03:52 hira Exp $
 #
 
 VER=           1.5.3
@@ -27,4 +27,4 @@
 .include "../../mk/bsd.pkg.mk"
 
 post-install:
-       cd ${PREFIX}/lib && ${LN} -s pgtcl${VER}/${PGTCLLIBNAME} libpgtcl.so
+       cd ${PREFIX}/lib && ln -s pgtcl${VER}/${PGTCLLIBNAME} libpgtcl.so
diff -r 42293b181271 -r 27327ea1a011 devel/flex/Makefile
--- a/devel/flex/Makefile       Tue Sep 25 08:49:03 2007 +0000
+++ b/devel/flex/Makefile       Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/25 10:03:52 hira Exp $
 
 DISTNAME=              flex-2.5.33
 PKGREVISION=           2
@@ -28,7 +28,7 @@
 .endif
 
 post-install:
-       cd ${DESTDIR:Q}${PREFIX:Q}/bin && ${LN} -s flex flex++
+       cd ${DESTDIR:Q}${PREFIX:Q}/bin && ln -s flex flex++
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 42293b181271 -r 27327ea1a011 devel/ncurses/Makefile
--- a/devel/ncurses/Makefile    Tue Sep 25 08:49:03 2007 +0000
+++ b/devel/ncurses/Makefile    Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2007/09/25 08:49:05 hira Exp $
+# $NetBSD: Makefile,v 1.80 2007/09/25 10:07:05 hira Exp $
 
 .include "Makefile.common"
 PKGREVISION=   1
@@ -31,10 +31,10 @@
 post-configure:
        cd ${WRKSRC}/man;                                       \
        for f in *.1m; do                                       \
-               ${MV} -f $${f} `${BASENAME} $${f} .1m`.1;       \
+               mv -f $${f} `${BASENAME} $${f} .1m`.1;  \
        done;                                                   \
        for f in *.3x; do                                       \
-               ${MV} -f $${f} `${BASENAME} $${f} .3x`.3;       \
+               mv -f $${f} `${BASENAME} $${f} .3x`.3;  \
        done
 
 post-install:
diff -r 42293b181271 -r 27327ea1a011 emulators/bochs/Makefile
--- a/emulators/bochs/Makefile  Tue Sep 25 08:49:03 2007 +0000
+++ b/emulators/bochs/Makefile  Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2007/09/25 08:49:05 hira Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/25 10:07:05 hira Exp $
 
 DISTNAME=              bochs-2.3
 CATEGORIES=            emulators
@@ -112,6 +112,6 @@
 
 pre-configure:
        ${SED} ${BOCHSRC_SUBST} <${WRKSRC}/.bochsrc >${WRKSRC}/.bochsrc.new
-       ${MV} ${WRKSRC}/.bochsrc.new ${WRKSRC}/.bochsrc
+       mv ${WRKSRC}/.bochsrc.new ${WRKSRC}/.bochsrc
 
 .include "../../mk/bsd.pkg.mk"
diff -r 42293b181271 -r 27327ea1a011 emulators/xm7/Makefile
--- a/emulators/xm7/Makefile    Tue Sep 25 08:49:03 2007 +0000
+++ b/emulators/xm7/Makefile    Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/09/25 08:49:05 hira Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/25 10:07:05 hira Exp $
 #
 
 DISTNAME=              xm71010s
@@ -27,7 +27,7 @@
 INSTALLATION_DIRS=     bin
 
 post-extract:
-       cd ${WRKDIR} && ${MV} linux/* vm
+       cd ${WRKDIR} && mv linux/* vm
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKDIR}/vm/xm7 ${PREFIX}/bin
diff -r 42293b181271 -r 27327ea1a011 games/asc/Makefile
--- a/games/asc/Makefile        Tue Sep 25 08:49:03 2007 +0000
+++ b/games/asc/Makefile        Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2007/09/25 08:49:05 hira Exp $
+# $NetBSD: Makefile,v 1.39 2007/09/25 10:07:06 hira Exp $
 
 DISTNAME=      asc-source-1.16.4.0
 PKGNAME=       ${DISTNAME:S/-source//}
@@ -30,7 +30,7 @@
 UNLIMIT_RESOURCES=     datasize
 
 post-extract:
-       ${MV} ${WRKDIR}/*.mp3 ${WRKSRC}/data/music
+       mv ${WRKDIR}/*.mp3 ${WRKSRC}/data/music
 
 # bug in 1.16.4.0, remove on update
 post-install:
diff -r 42293b181271 -r 27327ea1a011 games/craft/Makefile
--- a/games/craft/Makefile      Tue Sep 25 08:49:03 2007 +0000
+++ b/games/craft/Makefile      Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/25 10:03:52 hira Exp $
 
 DISTNAME=      craftcc35
 PKGNAME=       craft-3.5
@@ -28,7 +28,7 @@
 
 post-extract:
        find ${WRKSRC} -type f -name '*~' -print | xargs rm -f
-       ${LN} -fs ${FILESDIR}/Makefile ${WRKSRC}
+       ln -fs ${FILESDIR}/Makefile ${WRKSRC}
        for f in `find ${WRKSRC} -name "*.hc" -type f -print`; do       \
          ${ECHO} "" >>$$f;                                             \
        done
diff -r 42293b181271 -r 27327ea1a011 games/gtkballs/Makefile
--- a/games/gtkballs/Makefile   Tue Sep 25 08:49:03 2007 +0000
+++ b/games/gtkballs/Makefile   Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/09/25 08:49:05 hira Exp $
+# $NetBSD: Makefile,v 1.28 2007/09/25 10:07:06 hira Exp $
 
 DISTNAME=      gtkballs-3.1.5
 PKGREVISION=   5
@@ -24,7 +24,7 @@
                        ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
 
 post-install:
-       ${MV} ${PREFIX}/${PKGMANDIR}/man6/gtkballs.6x ${PREFIX}/${PKGMANDIR}/man6/gtkballs.6
+       mv ${PREFIX}/${PKGMANDIR}/man6/gtkballs.6x ${PREFIX}/${PKGMANDIR}/man6/gtkballs.6
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff -r 42293b181271 -r 27327ea1a011 graphics/gimp-fix-ca/Makefile
--- a/graphics/gimp-fix-ca/Makefile     Tue Sep 25 08:49:03 2007 +0000
+++ b/graphics/gimp-fix-ca/Makefile     Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/09/25 08:31:53 hira Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/25 10:03:53 hira Exp $
 #
 
 DISTNAME=              gimp-fix-ca-2.1.0
@@ -19,7 +19,7 @@
 USE_TOOLS+=            pkg-config
 
 pre-build:
-       ${LN} -sf ${LOCALBASE}/bin/gimptool-2.0 \
+       ln -sf ${LOCALBASE}/bin/gimptool-2.0 \
                ${BUILDLINK_DIR}/bin/gimptool
 
 do-build:
diff -r 42293b181271 -r 27327ea1a011 graphics/libscigraphica/Makefile
--- a/graphics/libscigraphica/Makefile  Tue Sep 25 08:49:03 2007 +0000
+++ b/graphics/libscigraphica/Makefile  Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/09/25 08:31:54 hira Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/25 10:03:53 hira Exp $
 #
 
 DISTNAME=      libscigraphica-2.1.1
@@ -18,7 +18,7 @@
 PKGCONFIG_OVERRIDE+=   libscigraphica-2.0.pc.in
 
 pre-configure:
-       ${LN} -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python
+       ln -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numarray/buildlink3.mk"
diff -r 42293b181271 -r 27327ea1a011 graphics/scigraphica/Makefile
--- a/graphics/scigraphica/Makefile     Tue Sep 25 08:49:03 2007 +0000
+++ b/graphics/scigraphica/Makefile     Tue Sep 25 10:03:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/09/25 08:31:54 hira Exp $
+# $NetBSD: Makefile,v 1.43 2007/09/25 10:03:53 hira Exp $
 #
 
 DISTNAME=      scigraphica-2.1.0
@@ -26,7 +26,7 @@