user-destdir support

5 files changed, 85 insertions, 17 deletions

diff --git a/time/grdc/Makefile b/time/grdc/Makefile
index f7ca451ebd2..0cce9da2f25 100644
--- a/time/grdc/Makefile
+++ b/time/grdc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/30 00:47:22 zafer Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/07 20:11:57 joerg Exp $
 
 DISTNAME=		grdc-20031019
 CATEGORIES=		time
@@ -8,7 +8,10 @@ MAINTAINER=		mishka@NetBSD.org
 HOMEPAGE=		http://www.FreeBSD.org/
 COMMENT=		Grand digital clock from FreeBSD-current games
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS+=	bin man/man6
+INSTALL_MAKE_FLAGS=	PREFIX=${DESTDIR}${PREFIX}
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/ical/Makefile b/time/ical/Makefile
index 2c05194ec0e..13a09b530cb 100644
--- a/time/ical/Makefile
+++ b/time/ical/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/02/03 19:36:33 markd Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/07 20:12:01 joerg Exp $
 
 DISTNAME=	ical-2.3.1
 PKGREVISION=	3
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.annexia.org/freeware/ical
 COMMENT=	Calendar application
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	yes
diff --git a/time/ical/distinfo b/time/ical/distinfo
index bf6a670d8e8..96456d23457 100644
--- a/time/ical/distinfo
+++ b/time/ical/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2008/02/03 19:36:33 markd Exp $
+$NetBSD: distinfo,v 1.9 2009/07/07 20:12:01 joerg Exp $
 
 SHA1 (ical-2.3.1.tar.gz) = 98649b7e1fbad9c13356eb5dded693d81b2252f2
 RMD160 (ical-2.3.1.tar.gz) = 98642da1ef330ca3a5cf099508fb09dcdeb208be
 Size (ical-2.3.1.tar.gz) = 264576 bytes
-SHA1 (patch-aa) = 238d2d4ce21cc60ec0eaae854aa722ca0486701d
+SHA1 (patch-aa) = 29d06f928f67165f5579aa87487b88f1aa2e0031
 SHA1 (patch-ab) = ccfdc593988195128c837bac36d706150b5a7df6
diff --git a/time/ical/patches/patch-aa b/time/ical/patches/patch-aa
index 38c52be2d40..4205be04fc0 100644
--- a/time/ical/patches/patch-aa
+++ b/time/ical/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/10/02 20:14:23 tron Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/07 20:12:01 joerg Exp $
 
---- Makefile.in.orig	Sat Sep 12 17:57:48 1998
-+++ Makefile.in	Sat Sep 12 17:59:28 1998
-@@ -76,13 +76,13 @@
+--- Makefile.in.orig	2004-03-11 12:26:55.000000000 +0100
++++ Makefile.in
+@@ -76,13 +76,13 @@ OBJS = cal_tcl.o dateeditor.o dispatch.o
  all: $(CONFIGURED) ical
  
  ical: $(LIB3) $(LIB2) $(LIB1) $(OBJS) main.o
@@ -19,3 +19,64 @@ $NetBSD: patch-aa,v 1.2 2003/10/02 20:14:23 tron Exp $
  
  $(LIB1): FRC
  	@echo making in calendar
+@@ -153,39 +153,39 @@ install: instbin instman instlib instcon
+ 	@echo installation finished
+ 
+ instbin: ical
+-	-$(MKDIR) $(BINDIR)
+-	$(INSTALL) ical $(BINDIR)/ical-@ICAL_VERSION@
+-	$(RM) -f $(BINDIR)/ical
+-	$(LN_S) ical-@ICAL_VERSION@ $(BINDIR)/ical
++	-$(MKDIR) ${DESTDIR}$(BINDIR)
++	$(INSTALL) ical ${DESTDIR}$(BINDIR)/ical-@ICAL_VERSION@
++	$(RM) -f ${DESTDIR}$(BINDIR)/ical
++	$(LN_S) ical-@ICAL_VERSION@ ${DESTDIR}$(BINDIR)/ical
+ 
+ instman:
+-	-$(MKDIR) $(MANDIR)
+-	-$(MKDIR) $(MANDIR)/man1
+-	-$(INSTALL_DATA) $(srcdir)/doc/ical.man $(MANDIR)/man1/ical.1
++	-$(MKDIR) ${DESTDIR}$(MANDIR)
++	-$(MKDIR) ${DESTDIR}$(MANDIR)/man1
++	-$(INSTALL_DATA) $(srcdir)/doc/ical.man ${DESTDIR}$(MANDIR)/man1/ical.1
+ 
+ instlib:
+-	-$(MKDIR) $(LIBDIR)
+-	-$(MKDIR) $(LIBDIR)/ical
+-	-$(MKDIR) $(ILIBDIR)
+-	-$(MKDIR) $(ILIBDIR)/tcllib
++	-$(MKDIR) ${DESTDIR}$(LIBDIR)
++	-$(MKDIR) ${DESTDIR}$(LIBDIR)/ical
++	-$(MKDIR) ${DESTDIR}$(ILIBDIR)
++	-$(MKDIR) ${DESTDIR}$(ILIBDIR)/tcllib
+ 	@for f in $(LIB_FILES) $(srcdir)/tcllib/tclIndex ; do\
+-		echo $(INSTALL_DATA) $$f $(ILIBDIR)/tcllib/`basename $$f`;\
+-		$(INSTALL_DATA) $$f $(ILIBDIR)/tcllib/`basename $$f`;\
++		echo $(INSTALL_DATA) $$f ${DESTDIR}$(ILIBDIR)/tcllib/`basename $$f`;\
++		$(INSTALL_DATA) $$f ${DESTDIR}$(ILIBDIR)/tcllib/`basename $$f`;\
+ 	done
+ 	@for f in $(ICAL_FILES) $(srcdir)/tclIndex ; do\
+-		echo $(INSTALL_DATA) $$f $(ILIBDIR)/`basename $$f`;\
+-		$(INSTALL_DATA) $$f $(ILIBDIR)/`basename $$f`;\
++		echo $(INSTALL_DATA) $$f ${DESTDIR}$(ILIBDIR)/`basename $$f`;\
++		$(INSTALL_DATA) $$f ${DESTDIR}$(ILIBDIR)/`basename $$f`;\
+ 	done
+ 
+ instcontrib:
+-	-$(MKDIR) $(LIBDIR)
+-	-$(MKDIR) $(LIBDIR)/ical
+-	-$(MKDIR) $(ILIBDIR)
+-	-$(MKDIR) $(ILIBDIR)/contrib
++	-$(MKDIR) ${DESTDIR}$(LIBDIR)
++	-$(MKDIR) ${DESTDIR}$(LIBDIR)/ical
++	-$(MKDIR) ${DESTDIR}$(ILIBDIR)
++	-$(MKDIR) ${DESTDIR}$(ILIBDIR)/contrib
+ 	@for f in $(srcdir)/contrib/* ; do\
+ 		if test -f $$f ; then\
+-		echo $(INSTALL_DATA) $$f $(ILIBDIR)/contrib/`basename $$f`;\
+-		$(INSTALL_DATA) $$f $(ILIBDIR)/contrib/`basename $$f`;\
++		echo $(INSTALL_DATA) $$f ${DESTDIR}$(ILIBDIR)/contrib/`basename $$f`;\
++		$(INSTALL_DATA) $$f ${DESTDIR}$(ILIBDIR)/contrib/`basename $$f`;\
+ 		fi;\
+ 	done
+ 
diff --git a/time/jday/Makefile b/time/jday/Makefile
index ec1a2662044..ba5388164c1 100644
--- a/time/jday/Makefile
+++ b/time/jday/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:30:53 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/07 20:10:32 joerg Exp $
 #
 
 DISTNAME=		jday-1.3
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://jday.sourceforge.net/
 COMMENT=		Julian date calculator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
@@ -16,14 +18,15 @@ do-test:
 	@(cd ${WRKSRC} && ./RunTest)
 	@(cd ${WRKSRC} && ./Testdbd)
 
+INSTALLATION_DIRS=	share/jday
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/jday
-	${INSTALL_DATA} ${WRKSRC}/CalDate.inc ${PREFIX}/share/jday
-	${INSTALL_DATA} ${WRKSRC}/CalDate.pm ${PREFIX}/share/jday
-	${INSTALL_DATA} ${WRKSRC}/J2D.pl ${PREFIX}/share/jday
-	${INSTALL_DATA} ${WRKSRC}/Jday.php ${PREFIX}/share/jday
-	${INSTALL_DATA} ${WRKSRC}/Jday.pl ${PREFIX}/share/jday
-	${INSTALL_DATA} ${WRKSRC}/dbd.awk ${PREFIX}/share/jday
-	${INSTALL_DATA} ${WRKSRC}/jday.awk ${PREFIX}/share/jday
+	${INSTALL_DATA} ${WRKSRC}/CalDate.inc ${DESTDIR}${PREFIX}/share/jday
+	${INSTALL_DATA} ${WRKSRC}/CalDate.pm ${DESTDIR}${PREFIX}/share/jday
+	${INSTALL_DATA} ${WRKSRC}/J2D.pl ${DESTDIR}${PREFIX}/share/jday
+	${INSTALL_DATA} ${WRKSRC}/Jday.php ${DESTDIR}${PREFIX}/share/jday
+	${INSTALL_DATA} ${WRKSRC}/Jday.pl ${DESTDIR}${PREFIX}/share/jday
+	${INSTALL_DATA} ${WRKSRC}/dbd.awk ${DESTDIR}${PREFIX}/share/jday
+	${INSTALL_DATA} ${WRKSRC}/jday.awk ${DESTDIR}${PREFIX}/share/jday
 
 .include "../../mk/bsd.pkg.mk"