From 7c78c2b589099ee44fc9a27418ec9eb3b773145e Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 30 Aug 2003 19:00:03 +0000 Subject: Convert to use bsd.pkg.install.mk. --- emulators/compat14-crypto/DEINSTALL | 22 +++++----------------- emulators/compat14-crypto/INSTALL | 24 ++++++------------------ emulators/compat14-crypto/Makefile | 25 ++++++++----------------- 3 files changed, 19 insertions(+), 52 deletions(-) diff --git a/emulators/compat14-crypto/DEINSTALL b/emulators/compat14-crypto/DEINSTALL index 5a7bec3a902..752c24352aa 100644 --- a/emulators/compat14-crypto/DEINSTALL +++ b/emulators/compat14-crypto/DEINSTALL @@ -1,13 +1,6 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1.1.1 2002/08/13 03:15:24 jdarrow Exp $ - -PKGNAME=$1 -STAGE=$2 +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 19:00:03 jlam Exp $ case ${STAGE} in -DEINSTALL) - ;; POST-DEINSTALL) MACHINE_ARCH=@MACHINE_ARCH@ COMPAT_LIBDIR=@COMPAT_LIBDIR@ @@ -15,20 +8,15 @@ POST-DEINSTALL) 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 --git a/emulators/compat14-crypto/INSTALL b/emulators/compat14-crypto/INSTALL index 61fa9896460..7e66f1e0e74 100644 --- a/emulators/compat14-crypto/INSTALL +++ b/emulators/compat14-crypto/INSTALL @@ -1,20 +1,13 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1.1.1 2002/08/13 03:15:24 jdarrow Exp $ - -PKGNAME=$1 -STAGE=$2 +# $NetBSD: INSTALL,v 1.2 2003/08/30 19:00:03 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 @@ POST-INSTALL) if [ -e /emul/$emul -o -L /emul/$emul ] || \ [ \( -e /emul -o -L /emul \) -a ! -d /emul ] then - cat </dev/null 2>&1 - ;; -*) - echo "Unexpected argument: ${STAGE}" - exit 1 + ( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1 ;; esac -exit 0 diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile index a6e94043139..a83428353b7 100644 --- a/emulators/compat14-crypto/Makefile +++ b/emulators/compat14-crypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/07/17 21:35:25 grant Exp $ +# $NetBSD: Makefile,v 1.4 2003/08/30 19:00:03 jlam Exp $ # DISTNAME= compat14-crypto-${MACHINE_ARCH}-${VERSION} @@ -20,10 +20,15 @@ NOT_FOR_PLATFORM= NetBSD-1.3*-* NetBSD-1.4*-* CRYPTO= YES 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" @@ -46,17 +51,6 @@ PLIST_SRC+= ${PKGDIR}/PLIST.${MACHINE_ARCH} 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: @@ -67,7 +61,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" -- cgit v1.2.3