[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Convert to use libnbcompat/inplac...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/edbf22bcf410
branches:  trunk
changeset: 479416:edbf22bcf410
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 14 02:33:51 2004 +0000

description:
Convert to use libnbcompat/inplace.mk.

diffstat:

 pkgtools/pkg_install/Makefile |  19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)

diffs (49 lines):

diff -r e1cb63434d25 -r edbf22bcf410 pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Sat Aug 14 02:33:32 2004 +0000
+++ b/pkgtools/pkg_install/Makefile     Sat Aug 14 02:33:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2004/08/09 06:21:24 jlam Exp $
+# $NetBSD: Makefile,v 1.103 2004/08/14 02:33:51 jlam Exp $
 
 # Notes to package maintainers:
 #
@@ -45,13 +45,6 @@
 PLIST_SUBST+=          MANDIR=${MANDIR}
 PLIST_SUBST+=          PKG_TOOLS_BIN=${PKG_TOOLS_BIN}
 
-LIBNBCOMPAT_FILESDIR=  ${.CURDIR}/../../pkgtools/libnbcompat/files
-LIBNBCOMPAT_SRCDIR=    ${WRKDIR}/libnbcompat
-
-CPPFLAGS+=             -I${LIBNBCOMPAT_SRCDIR}
-LDFLAGS+=              -L${LIBNBCOMPAT_SRCDIR}
-LIBS+=                 -lnbcompat
-
 CPPFLAGS+=             -DDEF_UMASK=${DEF_UMASK}
 
 MAKE_ENV+=             MACHINE_ARCH="${MACHINE_ARCH}"
@@ -67,17 +60,8 @@
                        ${FILESDIR}/lib/version.h
 
 do-extract:
-       @${CP} -Rp ${LIBNBCOMPAT_FILESDIR} ${LIBNBCOMPAT_SRCDIR}
        @${CP} -Rp ${FILESDIR} ${WRKSRC}
 
-pre-configure:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
-       cd ${LIBNBCOMPAT_SRCDIR} && ${SETENV}                           \
-               AWK="${AWK}" CC="${CC}" CFLAGS="${CFLAGS:M*}"           \
-               CPPFLAGS="${CPPFLAGS:M*}"                               \
-               ${CONFIGURE_ENV:NLIBS=*} ${CONFIG_SHELL}                \
-               ${CONFIGURE_SCRIPT} && ${MAKE_PROGRAM}
-
 post-install:
        if [ ! -f ${PKG_DBDIR}/pkgdb.byfile.db ]; then                  \
                if [ ! -d ${PKG_DBDIR} ]; then                          \
@@ -86,6 +70,7 @@
                ${PKG_ADMIN} rebuild;                                   \
        fi
 
+.include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"
 
 PREFIX:=               ${PKG_TOOLS_BIN:C|/[^/]?bin$||}