Support staged installation.

4 files changed, 32 insertions, 11 deletions

diff --git a/math/graphopt/Makefile b/math/graphopt/Makefile
index 72c2d704822..983dd2974f7 100644
--- a/math/graphopt/Makefile
+++ b/math/graphopt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:35 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2009/12/11 17:52:01 asau Exp $
 #
 
 DISTNAME=	graphopt-0.4.1
@@ -11,12 +11,14 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/graphopt/
 COMMENT=	Optimize graph layouts
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/graphopt
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/graphopt
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/graphopt
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/graphopt
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/xfractint/Makefile b/math/xfractint/Makefile
index 4c8c07722db..63c89a059ef 100644
--- a/math/xfractint/Makefile
+++ b/math/xfractint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/03/04 11:02:25 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2009/12/11 17:47:28 asau Exp $
 #
 
 DISTNAME=		xfrac310
@@ -12,6 +12,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://spanky.triumf.ca/pub/fractals/programs/unix/
 COMMENT=		Fractint for X11
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 USE_LIBTOOL=		yes
 
@@ -21,7 +23,7 @@ MAKE_FLAGS+=		SRCDIR=${PREFIX}/share/xfractint
 BUILD_TARGET=		xfractint
 BUILDLINK_TRANSFORM+=	l:ncurses:curses
 
-INSTALLATION_DIRS=	share/xfractint
+INSTALLATION_DIRS=	bin $(PKGMANDIR)/man1 share/xfractint
 
 MAKE_ENV+=	X11_LDFLAGS=${X11_LDFLAGS:Q}
 
diff --git a/math/xfractint/distinfo b/math/xfractint/distinfo
index 581059c1638..a159cdd34a0 100644
--- a/math/xfractint/distinfo
+++ b/math/xfractint/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2007/07/28 01:42:50 joerg Exp $
+$NetBSD: distinfo,v 1.8 2009/12/11 17:47:28 asau Exp $
 
 SHA1 (xfrac310.zip) = 420de4ca20623b4fe6b6367a269e5525b6bff3af
 RMD160 (xfrac310.zip) = ede481d77f8f5b71a6cef9d7ec4b2e09d9662f5b
 Size (xfrac310.zip) = 1074760 bytes
 SHA1 (patch-aa) = 43815e2af79a7b438992169fa5f0b9afe30d9b2e
-SHA1 (patch-ab) = 4bde32376bc1fac3a620e5be0900c4c640277f73
+SHA1 (patch-ab) = d9e793dfe453cb097d671eb764cdf71f95a87eb8
 SHA1 (patch-ac) = 443495aed2e6b7ca8f4659b298b4b789d681c847
 SHA1 (patch-ad) = 9e337c7bff36aee223630bbc1585c91bb1961325
 SHA1 (patch-ae) = 6a7c39bafa4832e920f2cb1458a94b817f1832e5
diff --git a/math/xfractint/patches/patch-ab b/math/xfractint/patches/patch-ab
index 91b68e938e6..1758d3984a2 100644
--- a/math/xfractint/patches/patch-ab
+++ b/math/xfractint/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2007/04/16 14:48:31 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2009/12/11 17:47:28 asau Exp $
 
---- Makefile.orig	2007-04-16 14:22:01.000000000 +0000
-+++ Makefile
-@@ -68,7 +68,7 @@ CC = cc
+--- Makefile.orig	1999-09-11 20:32:16.000000000 +0400
++++ Makefile	2009-12-11 20:42:24.000000000 +0300
+@@ -68,7 +68,7 @@
  # For Apollo, change -lX11 to -L/usr/X11/libX11
  # For Solaris, add -L/usr/openwin/lib
  # For Linux, use  
@@ -11,3 +11,20 @@ $NetBSD: patch-ab,v 1.3 2007/04/16 14:48:31 joerg Exp $
  #LIBS = -L/usr/X11R6/lib -lX11 -lm -lcurses -ltermcap
  #LIBS = -lX11 -lm -lcurses -ltermcap
  
+@@ -180,13 +180,9 @@
+ 	rm -f $(OBJS) $(HOBJS) fractint.doc fractint.hlp hc xfractint helpdefs.h
+ 
+ install: xfractint fractint.hlp
+-	cp xfractint $(BINDIR)/xfractint
+-	strip $(BINDIR)/xfractint
+-	chmod a+x $(BINDIR)/xfractint
+-	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) $(SRCDIR)
+-	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) )
+-	cp xfractint.man $(MANDIR)/xfractint.1
+-	chmod a+r $(MANDIR)/xfractint.1
++	$(BSD_INSTALL_PROGRAM) xfractint $(DESTDIR)$(BINDIR)/xfractint
++	$(BSD_INSTALL_DATA) fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) $(DESTDIR)$(SRCDIR)
++	$(BSD_INSTALL_MAN) xfractint.man $(DESTDIR)$(MANDIR)/xfractint.1
+ 
+ fractint.hlp: hc $(HELP)
+ 	./hc /c