DESTDIR support.

4 files changed, 78 insertions, 4 deletions

diff --git a/devel/py-pqueue/Makefile b/devel/py-pqueue/Makefile
index 316aec445b0..eddc71ea61b 100644
--- a/devel/py-pqueue/Makefile
+++ b/devel/py-pqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:28 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2009/02/11 19:19:00 joerg Exp $
 #
 
 DISTNAME=		PQueue-0.2
@@ -12,6 +12,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.csse.monash.edu.au/hons/projects/1999/Andrew.Snare/
 COMMENT=		Priority-queues using fibonacci heaps
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/PQueue
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-python=${PYTHONBIN:Q}
@@ -22,9 +24,10 @@ PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX:Q}
 
 PYQ_DOCDIR=	${PREFIX}/share/doc/${PYPKGPREFIX}-PQueue
 
+INSTALLATION_DIRS+=	${PYQ_DOCDIR} ${PYSITELIB}
+
 post-install:
-	${INSTALL_DATA_DIR} ${PYQ_DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${PYQ_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PYQ_DOCDIR}
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-pqueue/distinfo b/devel/py-pqueue/distinfo
index 5036e729430..561fc03eebd 100644
--- a/devel/py-pqueue/distinfo
+++ b/devel/py-pqueue/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:31 agc Exp $
+$NetBSD: distinfo,v 1.3 2009/02/11 19:19:00 joerg Exp $
 
 SHA1 (PQueue-0.2.tar.bz2) = 3da4fb4b8bd9b944893323930d1cb7819122a22d
 RMD160 (PQueue-0.2.tar.bz2) = 47584234a678b6b6d26da350e9ca26e0b5b43142
 Size (PQueue-0.2.tar.bz2) = 51021 bytes
+SHA1 (patch-aa) = 5bfd9353201622bb90b9bbbd9c387c5b58d5d65f
+SHA1 (patch-ab) = 72659a7ddb4982baecfdafcfe59d39eed2c5e9aa
diff --git a/devel/py-pqueue/patches/patch-aa b/devel/py-pqueue/patches/patch-aa
new file mode 100644
index 00000000000..7ad7cd27dc3
--- /dev/null
+++ b/devel/py-pqueue/patches/patch-aa
@@ -0,0 +1,41 @@
+$NetBSD: patch-aa,v 1.1 2009/02/11 19:19:00 joerg Exp $
+
+--- Makefile.pre.in.orig	1999-07-09 12:18:20.000000000 +0200
++++ Makefile.pre.in
+@@ -118,6 +118,7 @@ RANLIB=		@RANLIB@
+ MACHDEP=	@MACHDEP@
+ SO=		@SO@
+ LDSHARED=	@LDSHARED@
++BLDSHARED=	@BLDSHARED@
+ CCSHARED=	@CCSHARED@
+ LINKFORSHARED=	@LINKFORSHARED@
+ @SET_CCC@
+@@ -170,8 +171,8 @@ install-shmods: $(SHAREDMODS)
+ 	@echo 'Installing shared modules...'
+ 	@if [ -n "$(SHAREDMODS)" ]; then \
+ 	  for mod in $(SHAREDMODS); do \
+-	    echo "  install -m 555 $$mod $(PY_MOD_DIR)"; \
+-	    $(INSTALL) -m 555 $$mod $(PY_MOD_DIR); \
++	    echo "  install -m 555 $$mod ${DESTDIR}$(PY_MOD_DIR)"; \
++	    $(INSTALL) -m 555 $$mod ${DESTDIR}$(PY_MOD_DIR); \
+ 	  done; \
+ 	fi
+ 
+@@ -181,14 +182,14 @@ install-scripts: $(SCRIPTS)
+ 	  for script in $(SCRIPTS); do \
+ 	    dir=`dirname $$script`; \
+ 	    if [ ! -d $(PY_LIB_DIR)/$$dir ]; then \
+-	      $(INSTALL) -d $(PY_LIB_DIR)/$$dir; \
++	      $(INSTALL) -d ${DESTDIR}$(PY_LIB_DIR)/$$dir; \
+ 	    fi; \
+ 	    echo "  install -m 644 $$script $(PY_LIB_DIR)/$$dir"; \
+-	    $(INSTALL) -m 644 $$script $(PY_LIB_DIR)/$$dir; \
++	    $(INSTALL) -m 644 $$script ${DESTDIR}$(PY_LIB_DIR)/$$dir; \
+ 	  done; \
+ 	  echo "Compiling..."; \
+ 	  for script in $(SCRIPTS); do \
+-	    $(PYTHON) -c "import py_compile; py_compile.compile(\"$(PY_LIB_DIR)/$$script\")"; \
++	    $(PYTHON) -c "import py_compile; py_compile.compile(\"${DESTDIR}$(PY_LIB_DIR)/$$script\")"; \
+ 	  done; \
+ 	fi
+ 
diff --git a/devel/py-pqueue/patches/patch-ab b/devel/py-pqueue/patches/patch-ab
new file mode 100644
index 00000000000..8cd7ac2ff95
--- /dev/null
+++ b/devel/py-pqueue/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2009/02/11 19:19:00 joerg Exp $
+
+--- configure.orig	1999-07-13 15:12:30.000000000 +0200
++++ configure
+@@ -700,6 +700,7 @@ eval `sed -n \
+ -e '/^MACHDEP=/ s/MACHDEP=[ 	]*\(.*\)/py_cv_python_makefile_MACHDEP='\''\1'\''/p' \
+ -e '/^SO=/ s/SO=[ 	]*\(.*\)/py_cv_python_makefile_SO='\''\1'\''/p' \
+ -e '/^LDSHARED=/ s/LDSHARED=[ 	]*\(.*\)/py_cv_python_makefile_LDSHARED='\''\1'\''/p' \
++-e '/^BLDSHARED=/ s/BLDSHARED=[ 	]*\(.*\)/py_cv_python_makefile_BLDSHARED='\''\1'\''/p' \
+ -e '/^CCSHARED=/ s/CCSHARED=[ 	]*\(.*\)/py_cv_python_makefile_CCSHARED='\''\1'\''/p' \
+ -e '/^LINKFORSHARED=/ s/LINKFORSHARED=[ 	]*\(.*\)/py_cv_python_makefile_LINKFORSHARED='\''\1'\''/p' \
+ -e '/^prefix=/ s/prefix=[ 	]*\(.*\)/py_cv_python_makefile_PREFIX='\''\1'\''/p' \
+@@ -725,6 +726,7 @@ RANLIB="$py_cv_python_makefile_RANLIB"
+ MACHDEP="$py_cv_python_makefile_MACHDEP"
+ SO="$py_cv_python_makefile_SO"
+ LDSHARED="$py_cv_python_makefile_LDSHARED"
++BLDSHARED="$py_cv_python_makefile_BLDSHARED"
+ CCSHARED="$py_cv_python_makefile_CCSHARED"
+ LINKFORSHARED="$py_cv_python_makefile_LINKFORSHARED"
+ PREFIX="$py_cv_python_makefile_PREFIX"
+@@ -1228,6 +1230,7 @@ s%@RANLIB@%$RANLIB%g
+ s%@MACHDEP@%$MACHDEP%g
+ s%@SO@%$SO%g
+ s%@LDSHARED@%$LDSHARED%g
++s%@BLDSHARED@%$BLDSHARED%g
+ s%@CCSHARED@%$CCSHARED%g
+ s%@LINKFORSHARED@%$LINKFORSHARED%g
+ s%@PREFIX@%$PREFIX%g