diff options
| -rw-r--r-- | emulators/netbsd32_compat14/DEINSTALL | 20 | ||||
| -rw-r--r-- | emulators/netbsd32_compat14/INSTALL | 22 | ||||
| -rw-r--r-- | emulators/netbsd32_compat14/Makefile | 25 | ||||
| -rw-r--r-- | emulators/netbsd32_compat15/DEINSTALL | 20 | ||||
| -rw-r--r-- | emulators/netbsd32_compat15/INSTALL | 22 | ||||
| -rw-r--r-- | emulators/netbsd32_compat15/Makefile | 27 | ||||
| -rw-r--r-- | emulators/netbsd32_compat16/DEINSTALL | 20 | ||||
| -rw-r--r-- | emulators/netbsd32_compat16/INSTALL | 22 | ||||
| -rw-r--r-- | emulators/netbsd32_compat16/Makefile | 23 |
9 files changed, 51 insertions, 150 deletions
diff --git a/emulators/netbsd32_compat14/DEINSTALL b/emulators/netbsd32_compat14/DEINSTALL index 63c3ab1a552..9e432e1c8c7 100644 --- a/emulators/netbsd32_compat14/DEINSTALL +++ b/emulators/netbsd32_compat14/DEINSTALL @@ -1,31 +1,19 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/10/31 23:53:00 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 19:07:10 jlam Exp $ case ${STAGE} in -DEINSTALL) - ;; POST-DEINSTALL) MACHINE_ARCH=@MACHINE_ARCH@ COMPAT_LIBDIR=@COMPAT_LIBDIR@ COMPAT_XLIBDIR=@COMPAT_XLIBDIR@ - 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} # clean up the symlink - rm -f /emul/aout + ${RM} -f /emul/aout # 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 --git a/emulators/netbsd32_compat14/INSTALL b/emulators/netbsd32_compat14/INSTALL index 8906de8829d..2cd1fa2f9cd 100644 --- a/emulators/netbsd32_compat14/INSTALL +++ b/emulators/netbsd32_compat14/INSTALL @@ -1,13 +1,6 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/10/31 23:53:01 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 +# $NetBSD: INSTALL,v 1.2 2003/08/30 19:07:10 jlam Exp $ case ${STAGE} in -PRE-INSTALL) - ;; POST-INSTALL) MACHINE_ARCH=@MACHINE_ARCH@ OBJECT_FMT=@OBJECT_FMT@ @@ -33,7 +26,7 @@ POST-INSTALL) 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 @@ -43,8 +36,8 @@ POST-INSTALL) ============================================================================== 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 @@ -52,11 +45,6 @@ EOF # 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 --git a/emulators/netbsd32_compat14/Makefile b/emulators/netbsd32_compat14/Makefile index c9c274b56bb..ad00dd97fd2 100644 --- a/emulators/netbsd32_compat14/Makefile +++ b/emulators/netbsd32_compat14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 21:35:37 grant Exp $ +# $NetBSD: Makefile,v 1.7 2003/08/30 19:07:10 jlam Exp $ # DISTNAME= compat14-${MACHINE32_ARCH}-${VERSION} @@ -22,10 +22,15 @@ MACHINE32_ARCH= ${MACHINE_ARCH} ONLY_FOR_PLATFORM= NetBSD-*-sparc64 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" @@ -35,17 +40,6 @@ COMPAT_XLIBDIR= ${EMULSUBDIR}/usr/X11R6/lib 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} - do-install: ${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR} ${INSTALL_DATA} ${WRKDIR}/lib/lib*.so* ${PREFIX}/${COMPAT_LIBDIR} @@ -54,7 +48,4 @@ do-install: ${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" diff --git a/emulators/netbsd32_compat15/DEINSTALL b/emulators/netbsd32_compat15/DEINSTALL index 0676fb1bb66..ce3a679ff7a 100644 --- a/emulators/netbsd32_compat15/DEINSTALL +++ b/emulators/netbsd32_compat15/DEINSTALL @@ -1,32 +1,20 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/10/31 23:53:05 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 19:09:38 jlam Exp $ case ${STAGE} in -DEINSTALL) - ;; POST-DEINSTALL) MACHINE_ARCH=@MACHINE_ARCH@ COMPAT_LIBDIR=@COMPAT_LIBDIR@ COMPAT_LIBEXECDIR=@COMPAT_LIBEXECDIR@ COMPAT_XLIBDIR=@COMPAT_XLIBDIR@ - rmdir -p ${PKG_PREFIX}/${COMPAT_LIBDIR} ${PKG_PREFIX}/${COMPAT_LIBEXECDIR} ${PKG_PREFIX}/${COMPAT_XLIBDIR} 2>/dev/null || true + ${RMDIR} -p ${PKG_PREFIX}/${COMPAT_LIBDIR} ${PKG_PREFIX}/${COMPAT_LIBEXECDIR} ${PKG_PREFIX}/${COMPAT_XLIBDIR} 2>/dev/null || ${TRUE} # clean up the symlink - rm -f /emul/netbsd32 + ${RM} -f /emul/netbsd32 # 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 --git a/emulators/netbsd32_compat15/INSTALL b/emulators/netbsd32_compat15/INSTALL index 8bee6bc40fb..aa33aa31b15 100644 --- a/emulators/netbsd32_compat15/INSTALL +++ b/emulators/netbsd32_compat15/INSTALL @@ -1,13 +1,6 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/10/31 23:53:05 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 +# $NetBSD: INSTALL,v 1.2 2003/08/30 19:09:38 jlam Exp $ case ${STAGE} in -PRE-INSTALL) - ;; POST-INSTALL) MACHINE_ARCH=@MACHINE_ARCH@ OBJECT_FMT=@OBJECT_FMT@ @@ -33,7 +26,7 @@ POST-INSTALL) 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 @@ -43,8 +36,8 @@ POST-INSTALL) ============================================================================== 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 @@ -52,11 +45,6 @@ EOF # 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 --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile index abcee698f80..aba7d946e19 100644 --- a/emulators/netbsd32_compat15/Makefile +++ b/emulators/netbsd32_compat15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/17 21:35:38 grant Exp $ +# $NetBSD: Makefile,v 1.8 2003/08/30 19:09:38 jlam Exp $ # .if ${MACHINE_ARCH} == "sparc64" @@ -21,10 +21,16 @@ CONFLICTS= netbsd32_compat16-[0-9]* ONLY_FOR_PLATFORM= NetBSD-*-sparc64 NO_MTREE= # defined +NO_BUILD= # defined SHLIB_HANDLING= NO +USE_PKGINSTALL= YES -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL +FILES_SUBST+= COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR} +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" @@ -35,18 +41,6 @@ COMPAT_XLIBDIR= ${EMULSUBDIR}/usr/X11R6/lib PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR} -do-build: - ${SED} -e "s,@MACHINE_ARCH@,${MACHINE_ARCH},g" \ - -e "s,@COMPAT_LIBDIR@,${COMPAT_LIBDIR},g" \ - -e "s,@COMPAT_LIBEXECDIR@,${COMPAT_LIBEXECDIR},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} - # XXX using pax to copy symlinks properly. do-install: ${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR} @@ -66,7 +60,4 @@ do-install: chmod 555 ${PREFIX}/${COMPAT_LIBEXECDIR}/ld.*so ) \ fi -post-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL - .include "../../mk/bsd.pkg.mk" diff --git a/emulators/netbsd32_compat16/DEINSTALL b/emulators/netbsd32_compat16/DEINSTALL index caab4d81b15..bdf500b2920 100644 --- a/emulators/netbsd32_compat16/DEINSTALL +++ b/emulators/netbsd32_compat16/DEINSTALL @@ -1,30 +1,18 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1.1.1 2002/11/08 16:23:02 mrg Exp $ - -PKGNAME=$1 -STAGE=$2 +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 19:11:57 jlam Exp $ case ${STAGE} in -DEINSTALL) - ;; POST-DEINSTALL) MACHINE_ARCH=@MACHINE_ARCH@ COMPAT_EMULSUBDIR=@COMPAT_EMULSUBDIR@ - rmdir -p ${PKG_PREFIX}/${COMPAT_EMULSUBDIR} 2>/dev/null || true + ${RMDIR} -p ${PKG_PREFIX}/${COMPAT_EMULSUBDIR} 2>/dev/null || ${TRUE} # clean up the symlink - rm -f /emul/netbsd32 + ${RM} -f /emul/netbsd32 # 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 --git a/emulators/netbsd32_compat16/INSTALL b/emulators/netbsd32_compat16/INSTALL index 5fc4f06cd99..06722471f67 100644 --- a/emulators/netbsd32_compat16/INSTALL +++ b/emulators/netbsd32_compat16/INSTALL @@ -1,13 +1,6 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1.1.1 2002/11/08 16:23:02 mrg Exp $ - -PKGNAME=$1 -STAGE=$2 +# $NetBSD: INSTALL,v 1.2 2003/08/30 19:11:57 jlam Exp $ case ${STAGE} in -PRE-INSTALL) - ;; POST-INSTALL) MACHINE_ARCH=@MACHINE_ARCH@ OBJECT_FMT=@OBJECT_FMT@ @@ -33,7 +26,7 @@ POST-INSTALL) 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 @@ -43,8 +36,8 @@ POST-INSTALL) ============================================================================== 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 @@ -52,11 +45,6 @@ EOF # 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 --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile index 0a283f6bcfd..c49f343bebd 100644 --- a/emulators/netbsd32_compat16/Makefile +++ b/emulators/netbsd32_compat16/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/17 21:35:39 grant Exp $ +# $NetBSD: Makefile,v 1.5 2003/08/30 19:11:58 jlam Exp $ # .if ${MACHINE_ARCH} == "sparc64" @@ -22,10 +22,14 @@ CONFLICTS= netbsd32_compat15-[0-9]* ONLY_FOR_PLATFORM= NetBSD-*-sparc64 NO_MTREE= # defined +NO_BUILD= # defined SHLIB_HANDLING= NO +USE_PKGINSTALL= YES -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL +FILES_SUBST+= COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR} +FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH} +FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT} +FILES_SUBST+= LDCONFIG=${LDCONFIG} .include "../../mk/bsd.prefs.mk" @@ -36,16 +40,6 @@ COMPAT_XLIBDIR= ${PREFIX}/${EMULSUBDIR}/usr/X11R6/lib PLIST_SUBST+= COMPAT_EMULSUBDIR=${EMULSUBDIR} -do-build: - ${SED} -e "s,@MACHINE_ARCH@,${MACHINE_ARCH},g" \ - -e "s,@COMPAT_EMULSUBDIR@,${COMPAT_EMULSUBDIR},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} - # XXX using pax to copy symlinks properly. do-install: ${INSTALL_DATA_DIR} ${COMPAT_LIBDIR} @@ -60,7 +54,4 @@ do-install: chmod 555 ${COMPAT_LIBDIR}/lib*.so* ${COMPAT_LIBDIR}/i18n/lib*.so* \ ${COMPAT_XLIBDIR}/lib*.so* ${COMPAT_LIBEXECDIR}/ld.*so -post-install: - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL - .include "../../mk/bsd.pkg.mk" |