[pkgsrc/trunk]: pkgsrc/archivers/hpack + Add full DESTDIR support.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d38c94f3e4b8
branches:  trunk
changeset: 539190:d38c94f3e4b8
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Mar 01 03:58:10 2008 +0000

description:
+ Add full DESTDIR support.

+ Clean up the way that flags are passed to the compiler and linker
  through the make process.

diffstat:

 archivers/hpack/Makefile |  52 +++++++++++++++++++++++++++--------------------
 1 files changed, 30 insertions(+), 22 deletions(-)

diffs (84 lines):

diff -r 845db591042e -r d38c94f3e4b8 archivers/hpack/Makefile
--- a/archivers/hpack/Makefile  Sat Mar 01 03:09:35 2008 +0000
+++ b/archivers/hpack/Makefile  Sat Mar 01 03:58:10 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/10/03 19:48:43 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2008/03/01 03:58:10 jlam Exp $
 
 DISTNAME=      hpack79src
 PKGNAME=       hpack-0.79
@@ -10,45 +10,53 @@
 COMMENT=       Multi-System Archiver with open keys PGP-based security
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
-
-WRKSRC=                ${WRKDIR}
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 CRYPTO=                yes
 
+DIST_SUBDIR=   ${PKGNAME_NOREV}
+WRKSRC=                ${WRKDIR}
 MAKE_FILE=     makefile
+MAKE_FLAGS+=   CFLAGS=${HPACK_CFLAGS:Q} CMDL=${HPACK_LDFLAGS:Q}
 BUILD_TARGET=  hpack
 
-DIST_SUBDIR=   ${PKGNAME_NOREV}
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Linux"
-MAKE_FLAGS+=   CFLAGS='-c -DLINUX -D__UNIX__ -DPREFIX="\"${PREFIX}\"" -I. '${CFLAGS:Q}' -Icrypt'
+HPACK_CFLAGS=  -DLINUX
 .else
-MAKE_FLAGS+=   CFLAGS='-c -DBSD386 -D__UNIX__ -DPREFIX="\"${PREFIX}\"" -I. '${CFLAGS:Q}' -Icrypt'
+HPACK_CFLAGS=  -DBSD386
+.endif
+HPACK_CFLAGS+= -c -D__UNIX__ -DPREFIX="\"${PREFIX}\"" -I. -Icrypt
+HPACK_CFLAGS+= ${CPPFLAGS} ${CFLAGS}
+
+HPACK_LDFLAGS= ${LDFLAGS}
+.if ${OPSYS} == "Darwin"
+HPACK_LDFLAGS+=        -lcurses
+.else
+HPACK_LDFLAGS+=        -ltermcap
 .endif
 
-.if ${OPSYS} == "Darwin"
-MAKE_FLAGS+=   CMDL=${LDFLAGS:Q}' -lcurses'
-.else
-MAKE_FLAGS+=   CMDL=${LDFLAGS:Q}' -ltermcap'
-.endif
-
-CONF_FILES=    ${PREFIX}/share/hpack/hpack.cfg.example \
+CONF_FILES=    ${PREFIX}/share/hpack/hpack.cfg.example         \
                ${PKG_SYSCONFDIR}/hpack.cfg
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/hpack share/doc/hpack
 
 post-build:
-       cd ${WRKSRC}/keycvt && ${MAKE} CFLAGS="-c -D__UNIX__ "${CFLAGS:Q} \
-               -f ${MAKE_FILE} keycvt
+       cd ${WRKSRC}/keycvt && ${BUILD_MAKE_CMD} keycvt
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/hpack ${PREFIX}/bin/
-       ${INSTALL_PROGRAM} ${WRKSRC}/keycvt/keycvt ${PREFIX}/bin/
-       ${INSTALL_MAN} ${WRKSRC}/docs/hpack.1 ${PREFIX}/${PKGMANDIR}/man1/
-       ${INSTALL_DATA} ${WRKSRC}/language.dat ${PREFIX}/share/hpack/
-       ${INSTALL_DATA} ${WRKSRC}/docs/hpack.cfg ${PREFIX}/share/hpack/hpack.cfg.example
-       ${INSTALL_DATA} ${WRKSRC}/docs/hpackext.doc ${PREFIX}/share/doc/hpack/
+       ${INSTALL_PROGRAM} ${WRKSRC}/hpack \
+               ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/keycvt/keycvt \
+               ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/docs/hpack.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_DATA} ${WRKSRC}/language.dat \
+               ${DESTDIR}${PREFIX}/share/hpack
+       ${INSTALL_DATA} ${WRKSRC}/docs/hpack.cfg \
+               ${DESTDIR}${PREFIX}/share/hpack/hpack.cfg.example
+       ${INSTALL_DATA} ${WRKSRC}/docs/hpackext.doc \
+               ${DESTDIR}${PREFIX}/share/doc/hpack
 
 .include "../../mk/bsd.pkg.mk"