DESTDIR support.

jsonn · Feb 12, 2009 · 8c6cfac · 8c6cfac
1 parent 23dd1b1
commit 8c6cfac
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 5 deletions.
diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2008/12/20 10:31:21 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2009/02/12 16:06:32 joerg Exp $
 #
 
 DISTNAME=	ispell-3.3.02
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ficus-www.cs.ucla.edu/geoff/ispell.html
 COMMENT=	Interactive spelling checker
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	ispell-[0-9]*
 
 USE_TOOLS+=	mktemp:run yacc

diff --git a/textproc/ispell-base/patches/patch-ab b/textproc/ispell-base/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2005/07/07 12:42:20 markd Exp $
+$NetBSD: patch-ab,v 1.5 2009/02/12 16:06:32 joerg Exp $
 
---- Makefile.orig	2005-05-26 01:57:02.000000000 +1200
+--- Makefile.orig	2005-05-25 15:57:02.000000000 +0200
 +++ Makefile
 @@ -373,13 +373,10 @@ install-dictbuild:
  	    rm -f fixispell-a$$MAN1EXT
@@ -17,7 +17,34 @@ $NetBSD: patch-ab,v 1.4 2005/07/07 12:42:20 markd Exp $
  	@. ./config.sh; \
  	  set -x; \
  	  cd $$MAN1DIR; \
-@@ -636,7 +633,7 @@ local.h:
+@@ -506,10 +503,10 @@ defhash.h:  config.X local.h Makefile
+
+ config.sh:  config.X defhash.h local.h Makefile
+ 	set $(SHELLDEBUG); \
+-	for var in BAKEXT BINDIR CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \
++	for var in BAKEXT CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \
+ 	  DEFLANG EXEEXT HASHSUFFIX INSTALL \
+-	  LANGUAGES LIBDIR LIBES LINK LINT LINTFLAGS LOOK_XREF \
+-	  MAKE_SORTTMP MAN1DIR MAN1EXT MAN45DIR MAN45EXT MAN45SECT MASTERHASH \
++	  LANGUAGES LIBES LINK LINT LINTFLAGS LOOK_XREF \
++	  MAKE_SORTTMP MAN1EXT MAN45EXT MAN45SECT MASTERHASH \
+ 	  MSGLANG POUNDBANG REGLIB STATSUFFIX \
+ 	  SPELL_XREF TERMLIB TIB_XREF WORDS YACC \
+ 	  ; do \
+@@ -518,6 +515,12 @@ config.sh:  config.X defhash.h local.h M
+ 	      | sed -e 's/"[^"]*$$/'"'/" -e "s/=/='/" -e 's/\\"/"/g' \
+ 	      | sed -n -e '$$p'; \
+ 	  done > config.sh; \
++	for var in BINDIR LIBDIR MAN1DIR MAN45DIR; do \
++	    cat config.X defhash.h local.h \
++	      | sed -n -e "s/^#define[ 	]*$$var[ 	]*"'"'"/$$var=/p" \
++	      | sed -e 's/"[^"]*$$/'"'/" -e "s/=/=\$${DESTDIR}'/" -e 's/\\"/"/g' \
++	      | sed -n -e '$$p'; \
++	  done >> config.sh; \
+ 	echo 'case "$$MAKE_SORTTMP" in "") \
+ 	  SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \
+ 	  >> config.sh
+@@ -636,7 +639,7 @@ local.h:
  	set +e; \
  	  [ -r local.h ]  ||  (cp local.h.generic local.h; chmod u+w local.h)
 
@@ -26,7 +53,7 @@ $NetBSD: patch-ab,v 1.4 2005/07/07 12:42:20 markd Exp $
  	@. ./config.sh; \
  	  set $(SHELLDEBUG); \
  	  set +e; \
-@@ -650,7 +647,8 @@ msgs.h:	config.sh FRC
+@@ -650,7 +653,8 @@ msgs.h:	config.sh FRC
  	  else \
  	    set -x; \
  	    rm -f msgs.h; $$LINK $$msgs msgs.h  ||  cp $$msgs msgs.h; \