DESTDIR support

8 files changed, 36 insertions, 50 deletions

diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 867b546122b..6b8aa612635 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:22 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/02/04 02:31:29 joerg Exp $
 #
 
 DISTNAME=	mpop-1.0.12
@@ -12,6 +12,8 @@ HOMEPAGE=	http://mpop.sourceforge.net/
 COMMENT=	Small, fast and portable POP3 client
 LICENSE=	gnu-gpl-v3
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config
@@ -20,13 +22,13 @@ INFO_FILES=		# PLIST
 CONFIGURE_ARGS+=	--enable-nls
 
 EGDIR=		${PREFIX}/share/examples/mpop
+INSTALLATION_DIRS+=	${EGDIR}
 
 .include "options.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libgetopt/buildlink3.mk"
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/mpoprc.example ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/mpoprc.example ${DESTDIR}${EGDIR}
 
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mush/Makefile b/mail/mush/Makefile
index 771dfbf00b7..90a5f67f3cf 100644
--- a/mail/mush/Makefile
+++ b/mail/mush/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:22 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/02/04 02:35:08 joerg Exp $
 
 DISTNAME=	mush-7.2.5
 PKGNAME=	mush-7.2.6.b4.pl1
@@ -21,6 +21,8 @@ MAINTAINER=	christos@NetBSD.org
 COMMENT=	Text-based mail client
 LICENSE=	mush-license
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 RESTRICTED=		Unmodified source may be distributed but not sold.
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -30,7 +32,7 @@ WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	mush
 BUILD_TARGET=	mush
 
-INSTALLATION_DIRS=	bin share/misc
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/misc
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/mush/distinfo b/mail/mush/distinfo
index e603ea2cc8a..31864387e84 100644
--- a/mail/mush/distinfo
+++ b/mail/mush/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2006/01/08 17:04:58 joerg Exp $
+$NetBSD: distinfo,v 1.11 2010/02/04 02:35:08 joerg Exp $
 
 SHA1 (mush/mush-7.2.5.tar.Z) = 1b9b54b368b9a748401b1baeb3b3eba5a9ed2c03
 RMD160 (mush/mush-7.2.5.tar.Z) = 32e010f544f79cc1a0f899d722d465975d552a4e
@@ -30,7 +30,7 @@ SHA1 (patch-ac) = 963ce2cc9e30a2cd5e7e63edbe09692a880d8d5b
 SHA1 (patch-ad) = 2bcbd8e6e052d1549d4eb5201ec10f5ff3fd3051
 SHA1 (patch-ae) = 2923fa751a0e3dba13bc711694285973225e21b6
 SHA1 (patch-af) = 1df2f9fb0b536cc30f94ba357a5de9fe11bbf941
-SHA1 (patch-ag) = dce8cf449bca506d2d478a9b925aa4b80b34f6d6
+SHA1 (patch-ag) = 19a580901c94dfc30deb7945050a45acd1d2b444
 SHA1 (patch-ah) = ddd684d8de13fd2f338c506254229fa63cca9e94
 SHA1 (patch-ai) = 5659b2d975f86e856d1bf6efb8909bc08ec2acf4
 SHA1 (patch-aj) = fee38b6e855a6494ecef0e41e2602850d1b58746
diff --git a/mail/mush/patches/patch-ag b/mail/mush/patches/patch-ag
index 9887f12edea..2fb6dc17766 100644
--- a/mail/mush/patches/patch-ag
+++ b/mail/mush/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.3 2006/01/08 17:04:58 joerg Exp $
+$NetBSD: patch-ag,v 1.4 2010/02/04 02:35:08 joerg Exp $
 
 *** /dev/null	Fri Sep  4 13:38:54 1998
 --- makefile.netbsd	Fri Sep  4 13:36:36 1998
 ***************
 *** 0 ****
---- 1,76 ----
+--- 1,71 ----
 + # makefile.netbsd
 + #
 + HDRS= mush.h config.h-dist strings.h bindings.h options.h version.h glob.h pop.h
@@ -26,7 +26,7 @@ $NetBSD: patch-ag,v 1.3 2006/01/08 17:04:58 joerg Exp $
 + 
 + MAKES= makefile.bsdi makefile.bsd makefile.xenix makefile.sys.v makefile.hpux makefile.sun makefile.solaris makefile.freebsd
 + 
-+ CFLAGS= -O2 -DPOSIX -DCURSES -DBSD -DBSD44 -DSIGRET=void -DBASENAME -DENV_MAIL -DMSGS_DYNAMIC
++ CFLAGS+= -DPOSIX -DCURSES -DBSD -DBSD44 -DSIGRET=void -DBASENAME -DENV_MAIL -DMSGS_DYNAMIC
 + LDFLAGS= 
 + LINTFLAGS= -bxah -Dlint -DCURSES -DBSD
 + LIBS= -lcurses -ltermlib
@@ -66,15 +66,10 @@ $NetBSD: patch-ag,v 1.3 2006/01/08 17:04:58 joerg Exp $
 + MANEXT= 1
 + 
 + install: mush
-+ 	cp mush $(BINDIR)
-+ 	strip $(BINDIR)/mush
-+ 	chmod 0755 $(BINDIR)/mush
-+ 	cp cmd_help $(LIBDIR)
-+ 	chmod 0644 $(LIBDIR)/cmd_help
-+ 	cp Mushrc $(MRCDIR)/Mushrc
-+ 	chmod 0644 $(MRCDIR)/Mushrc
-+ 	cp mush.1 $(MANDIR)/mush.$(MANEXT)
-+ 	chmod 0644 $(MANDIR)/mush.$(MANEXT)
++ 	${BSD_INSTALL_PROGRAM} mush ${DESTDIR}$(BINDIR)
++ 	${BSD_INSTALL_DATA} cmd_help ${DESTDIR}$(LIBDIR)
++ 	${BSD_INSTALL_DATA} Mushrc ${DESTDIR}$(MRCDIR)/Mushrc
++ 	${BSD_INSTALL_MAN} mush.1 ${DESTDIR}$(MANDIR)/mush.$(MANEXT)
 + 
 + 
 + glob: glob.c
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index f6def18c8cb..7d8ecd67923 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/04/25 20:39:10 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2010/02/04 02:36:28 joerg Exp $
 #
 
 DISTNAME=	offlineimap_${_OFFLINEIMAP_VER}
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://software.complete.org/offlineimap
 COMMENT=	Powerful IMAP/Maildir synchronization and reader support
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/offlineimap
 
 # This is only to placate pkglint
@@ -23,9 +25,9 @@ INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/examples/offlineimap
 
 post-install:
 .for _f_ in offlineimap.conf offlineimap.conf.minimal
-	${INSTALL_DATA} ${WRKSRC}/${_f_} ${PREFIX}/share/examples/offlineimap/${_f_}
+	${INSTALL_DATA} ${WRKSRC}/${_f_} ${DESTDIR}${PREFIX}/share/examples/offlineimap/${_f_}
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${PREFIX}/${PKGMANDIR}/man1/offlineimap.1
+	${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/offlineimap.1
 
 .include "../../devel/py-cursespanel/buildlink3.mk"
 .include "../../devel/py-curses/buildlink3.mk"
diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile
index 51f95a2e68c..0ed8e65930b 100644
--- a/mail/ripmime/Makefile
+++ b/mail/ripmime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/06/30 00:07:19 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/02/04 02:39:54 joerg Exp $
 #
 
 DISTNAME=	ripmime-1.4.0.2
@@ -9,10 +9,13 @@ MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://www.pldaniels.com/ripmime/
 COMMENT=	Extract the attached files out of a MIME encoded email package
 
-PKGMANDIR?=	man
-MAKE_ENV+=	PKGMANDIR=${PKGMANDIR:Q}
-INSTALLATION_DIRS=	bin ${PKGMANDIR}
-
+PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/ripmime ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/ripmime.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ripmime/distinfo b/mail/ripmime/distinfo
index e5a10d3d09e..2f113c0d3e6 100644
--- a/mail/ripmime/distinfo
+++ b/mail/ripmime/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:28 agc Exp $
+$NetBSD: distinfo,v 1.4 2010/02/04 02:39:54 joerg Exp $
 
 SHA1 (ripmime-1.4.0.2.tar.gz) = c1d939b7cc311e538513a7eea10cb03f36d5969b
 RMD160 (ripmime-1.4.0.2.tar.gz) = 4d0b54d661f3690dd0da43f7a235f8995411b8c2
 Size (ripmime-1.4.0.2.tar.gz) = 157535 bytes
-SHA1 (patch-aa) = 2f3ca62a3a3921ee7407cc97c2f72efadd95dc08
+SHA1 (patch-aa) = 5c8ddb663a0ebf476449819bd9923a7607654535
diff --git a/mail/ripmime/patches/patch-aa b/mail/ripmime/patches/patch-aa
index 0c1514c0cce..2d7b7e96000 100644
--- a/mail/ripmime/patches/patch-aa
+++ b/mail/ripmime/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2004/11/27 07:41:06 reed Exp $
+$NetBSD: patch-aa,v 1.3 2010/02/04 02:39:54 joerg Exp $
 
 --- Makefile.orig	Fri Nov 26 17:14:55 2004
 +++ Makefile
-@@ -3,7 +3,7 @@
- #
- # 0.1.13: Added -I.
- 
--LOCATION=/usr/local
-+LOCATION=$(PREFIX)
- VERSION=0.1.14
- # VERSION changes
- #---------------------
 @@ -15,7 +15,7 @@ VERSION=0.1.14
  #	use our recommended settings.
  #CFLAGS ?= -Wall -g -O2 -Werror $(CPU_OPTS)
@@ -20,12 +11,3 @@ $NetBSD: patch-aa,v 1.2 2004/11/27 07:41:06 reed Exp $
  
  # OLE decoding is still considered to be 'beta' mode - so it 
  #	disabled in the stable release of ripMIME for now
-@@ -74,7 +74,7 @@ riptest: ${OFILES}
- install: ${OBJ}
- 	strip ripmime
- 	cp ripmime ${LOCATION}/bin/
--	cp ripmime.1  ${LOCATION}/man/man1
-+	cp ripmime.1  ${LOCATION}/$(PKGMANDIR)/man1
- 
- clean:
- 	rm -f *.o *core ${OBJ} buildcodes.h