pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/compat14 Convert to use bsd.pkg.install.mk.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/627959598408
branches:  trunk
changeset: 460456:627959598408
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 30 19:02:33 2003 +0000

description:
Convert to use bsd.pkg.install.mk.

diffstat:

 emulators/compat14/DEINSTALL |  22 +++++-----------------
 emulators/compat14/INSTALL   |  24 ++++++------------------
 emulators/compat14/Makefile  |  25 ++++++++-----------------
 3 files changed, 19 insertions(+), 52 deletions(-)

diffs (155 lines):

diff -r e7277f36d811 -r 627959598408 emulators/compat14/DEINSTALL
--- a/emulators/compat14/DEINSTALL      Sat Aug 30 19:02:17 2003 +0000
+++ b/emulators/compat14/DEINSTALL      Sat Aug 30 19:02:33 2003 +0000
@@ -1,13 +1,6 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 23:52:28 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
+# $NetBSD: DEINSTALL,v 1.2 2003/08/30 19:02:33 jlam Exp $
 
 case ${STAGE} in
-DEINSTALL)
-       ;;
 POST-DEINSTALL)
        MACHINE_ARCH=@MACHINE_ARCH@
        COMPAT_LIBDIR=@COMPAT_LIBDIR@
@@ -15,20 +8,15 @@
 
        if [ "${MACHINE_ARCH}" = "mipsel" ]
        then
-               rm -f ${PKG_PREFIX}/libexec/ld.so
-               rmdir -p ${PKG_PREFIX}/libexec 2>/dev/null || true
+               ${RM} -f ${PKG_PREFIX}/libexec/ld.so
+               ${RMDIR} -p ${PKG_PREFIX}/libexec 2>/dev/null || ${TRUE}
        fi
 
-       rmdir -p ${PKG_PREFIX}/${COMPAT_LIBDIR} ${PKG_PREFIX}/${COMPAT_XLIBDIR} 2>/dev/null || true
+       ${RMDIR} -p ${PKG_PREFIX}/${COMPAT_LIBDIR} ${PKG_PREFIX}/${COMPAT_XLIBDIR} 2>/dev/null || ${TRUE}
 
        # Regenerate the shared library cache.  This should work on either
        # a.out or on ELF with the 1.5 release.
        #
-       ( @LDCONFIG@ || true ) >/dev/null 2>&1
-       ;;
-*)
-       echo "Unexpected argument: ${STAGE}"
-       exit 1
+       ( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
        ;;
 esac
-exit 0
diff -r e7277f36d811 -r 627959598408 emulators/compat14/INSTALL
--- a/emulators/compat14/INSTALL        Sat Aug 30 19:02:17 2003 +0000
+++ b/emulators/compat14/INSTALL        Sat Aug 30 19:02:33 2003 +0000
@@ -1,20 +1,13 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/10/31 23:52:28 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
+# $NetBSD: INSTALL,v 1.2 2003/08/30 19:02:33 jlam Exp $
 
 case ${STAGE} in
-PRE-INSTALL)
-       ;;
 POST-INSTALL)
        MACHINE_ARCH=@MACHINE_ARCH@
        OBJECT_FMT=@OBJECT_FMT@
 
        if [ "${MACHINE_ARCH}" = "mipsel" ]
        then
-               ln -sf ld.elf_so /usr/libexec/ld.so
+               ${LN} -sf ld.elf_so /usr/libexec/ld.so
        fi
 
        # Only create the symlink on certain platform/object combinations.  Note
@@ -39,7 +32,7 @@
                        if [ -e /emul/$emul -o -L /emul/$emul ] || \
                           [ \( -e /emul -o -L /emul \) -a ! -d /emul ]
                        then
-                               cat <<EOF
+                               ${CAT} <<EOF
 ==============================================================================
        IMPORTANT:  You must create a symbolic link from /emul/$emul
        to ${PKG_PREFIX}/emul/$emul in order for this package to work
@@ -49,8 +42,8 @@
 ==============================================================================
 EOF
                        else
-                               mkdir -p /emul
-                               ln -sf ${PKG_PREFIX}/emul/$emul /emul/$emul
+                               ${MKDIR} -p /emul
+                               ${LN} -sf ${PKG_PREFIX}/emul/$emul /emul/$emul
                        fi
                fi
        fi
@@ -58,11 +51,6 @@
        # Regenerate the shared library cache.  This should work on either
        # a.out or on ELF with the 1.5 release.
        #
-       ( @LDCONFIG@ || true ) >/dev/null 2>&1
-       ;;
-*)
-       echo "Unexpected argument: ${STAGE}"
-       exit 1
+       ( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
        ;;
 esac
-exit 0
diff -r e7277f36d811 -r 627959598408 emulators/compat14/Makefile
--- a/emulators/compat14/Makefile       Sat Aug 30 19:02:17 2003 +0000
+++ b/emulators/compat14/Makefile       Sat Aug 30 19:02:33 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:35:24 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/30 19:02:33 jlam Exp $
 #
 
 DISTNAME=              compat14-${MACHINE_ARCH}-${VERSION}
@@ -18,10 +18,15 @@
 NOT_FOR_PLATFORM=      NetBSD-1.3*-* NetBSD-1.4*-*
 
 NO_MTREE=              # defined
+NO_BUILD=              # defined
 SHLIB_HANDLING=                NO
+USE_PKGINSTALL=                YES
 
-DEINSTALL_FILE=                ${WRKDIR}/DEINSTALL
-INSTALL_FILE=          ${WRKDIR}/INSTALL
+FILES_SUBST+=          COMPAT_LIBDIR=${COMPAT_LIBDIR}
+FILES_SUBST+=          COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
+FILES_SUBST+=          MACHINE_ARCH=${MACHINE_ARCH}
+FILES_SUBST+=          OBJECT_FMT=${OBJECT_FMT}
+FILES_SUBST+=          LDCONFIG=${LDCONFIG}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -44,17 +49,6 @@
 
 PLIST_SUBST+=          COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
 
-do-build:
-       ${SED}  -e "s,@MACHINE_ARCH@,${MACHINE_ARCH},g" \
-               -e "s,@COMPAT_LIBDIR@,${COMPAT_LIBDIR},g" \
-               -e "s,@COMPAT_XLIBDIR@,${COMPAT_XLIBDIR},g" \
-               -e "s,@LDCONFIG@,${LDCONFIG},g" \
-               < ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-       ${SED}  -e "s,@MACHINE_ARCH@,${MACHINE_ARCH},g" \
-               -e "s,@OBJECT_FMT@,${OBJECT_FMT},g" \
-               -e "s,@LDCONFIG@,${LDCONFIG},g" \
-               < ${PKGDIR}/INSTALL > ${INSTALL_FILE}
-
 # note that the INSTALL_DATA for the lib*.so symlinks will copy the file, not the symlink.
 # FIXME.
 do-install:
@@ -65,7 +59,4 @@
                ${INSTALL_DATA} ${WRKDIR}/X11R6/lib/lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \
        fi
 
-post-install:
-       PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index