DESTDIR support.

6 files changed, 114 insertions, 41 deletions

diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile
index 217ed8f48a2..63521ff0ea4 100644
--- a/chat/ircd-hybrid/Makefile
+++ b/chat/ircd-hybrid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2010/02/04 20:14:00 adrianp Exp $
+# $NetBSD: Makefile,v 1.42 2011/08/29 01:24:02 dholland Exp $
 
 DISTNAME=	ircd-hybrid-7.2.3
 PKGREVISION=	3
@@ -12,6 +12,8 @@ COMMENT=	IRC server with many options
 
 CONFLICTS+=	ircu-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	pax
 
 GNU_CONFIGURE=	YES
@@ -23,10 +25,16 @@ BUILD_DEFS+=	IRCD_HYBRID_SYSLOG_FACILITY IRCD_HYBRID_NICLEN \
 .include "../../mk/bsd.prefs.mk"
 
 PKG_SYSCONFSUBDIR=	ircd-hybrid
-HYBRID_EG=		${PREFIX}/share/examples/ircd-hybrid
-HYBRID_DOC=		${PREFIX}/share/doc/ircd-hybrid
 RCD_SCRIPTS=		ircd-hybrid
 
+HYBRID_EG_PLACE=	share/examples/ircd-hybrid
+HYBRID_DOC_PLACE=	share/doc/ircd-hybrid
+HYBRID_EG=		${PREFIX}/${HYBRID_EG_PLACE}
+HYBRID_DOC=		${PREFIX}/${HYBRID_DOC_PLACE}
+
+INSTALLATION_DIRS+=	${HYBRID_EG_PLACE} ${HYBRID_DOC_PLACE}/doc
+INSTALLATION_DIRS+=	share/ircd-hybrid/messages
+
 CONF_FILES_PERMS=	${HYBRID_EG}/example.conf ${PKG_SYSCONFDIR}/ircd.conf \
 			${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 0640
 OWN_DIRS_PERMS+=	${VARBASE}/log/ircd-hybrid \
@@ -85,37 +93,31 @@ CONFIGURE_ARGS+=	--with-maxconn=${IRCD_HYBRID_MAXCONN:Q}
 .include "options.mk"
 
 post-install:
-	${INSTALL_DATA_DIR} ${HYBRID_EG}
-	${INSTALL_DATA_DIR} ${HYBRID_DOC}
-	${INSTALL_DATA_DIR} ${HYBRID_DOC}/doc
-	${INSTALL_DATA_DIR} ${PREFIX}/share/ircd-hybrid
-	${INSTALL_DATA_DIR} ${PREFIX}/share/ircd-hybrid/messages
-
-	${INSTALL_DATA} ${WRKSRC}/etc/example.conf ${HYBRID_EG}
-	${INSTALL_DATA} ${WRKSRC}/etc/example.efnet.conf ${HYBRID_EG}
-	${INSTALL_DATA} ${WRKSRC}/etc/example.conf.quick ${HYBRID_EG}
-	${INSTALL_DATA} ${WRKSRC}/etc/simple.conf ${HYBRID_EG}
-
-	${INSTALL_DATA} ${WRKSRC}/BUGS ${HYBRID_DOC}
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${HYBRID_DOC}
-	${INSTALL_DATA} ${WRKSRC}/README.FIRST ${HYBRID_DOC}
-	${INSTALL_DATA} ${WRKSRC}/README.PLATFORMS ${HYBRID_DOC}
-	${INSTALL_DATA} ${WRKSRC}/RELNOTES ${HYBRID_DOC}
+	${INSTALL_DATA} ${WRKSRC}/etc/example.conf ${DESTDIR}${HYBRID_EG}
+	${INSTALL_DATA} ${WRKSRC}/etc/example.efnet.conf ${DESTDIR}${HYBRID_EG}
+	${INSTALL_DATA} ${WRKSRC}/etc/example.conf.quick ${DESTDIR}${HYBRID_EG}
+	${INSTALL_DATA} ${WRKSRC}/etc/simple.conf ${DESTDIR}${HYBRID_EG}
+
+	${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${HYBRID_DOC}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${HYBRID_DOC}
+	${INSTALL_DATA} ${WRKSRC}/README.FIRST ${DESTDIR}${HYBRID_DOC}
+	${INSTALL_DATA} ${WRKSRC}/README.PLATFORMS ${DESTDIR}${HYBRID_DOC}
+	${INSTALL_DATA} ${WRKSRC}/RELNOTES ${DESTDIR}${HYBRID_DOC}
 	${INSTALL_DATA} ${WRKSRC}/messages/README \
-		${HYBRID_DOC}/README.messages
+		${DESTDIR}${HYBRID_DOC}/README.messages
 	${INSTALL_DATA} ${WRKSRC}/tools/README.mkpasswd \
-		${HYBRID_DOC}/README.ircd-hybrid-mkpasswd
+		${DESTDIR}${HYBRID_DOC}/README.ircd-hybrid-mkpasswd
 
 	${RM} ${WRKSRC}/doc/Makefile
 	${RM} ${WRKSRC}/doc/Makefile.in
-	cd ${WRKSRC}/doc && pax -rwppm . ${HYBRID_DOC}/doc
+	cd ${WRKSRC}/doc && pax -rwppm . ${DESTDIR}${HYBRID_DOC}/doc
 
 	cd ${WRKSRC}/messages && \
-		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install
+		${SETENV} ${INSTALL_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install
 
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/encspeed \
-		${PREFIX}/bin/encspeed
+		${DESTDIR}${PREFIX}/bin/encspeed
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/mkpasswd \
-		${PREFIX}/bin/ircd-hybrid-mkpasswd
+		${DESTDIR}${PREFIX}/bin/ircd-hybrid-mkpasswd
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/ircd-hybrid/distinfo b/chat/ircd-hybrid/distinfo
index 20067542769..99c283d4fdf 100644
--- a/chat/ircd-hybrid/distinfo
+++ b/chat/ircd-hybrid/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2011/08/29 00:36:05 dholland Exp $
+$NetBSD: distinfo,v 1.13 2011/08/29 01:24:02 dholland Exp $
 
 SHA1 (ircd-hybrid-7.2.3.tgz) = f8a61e5500d28a4b4cded5f096c3627c2e5f01a0
 RMD160 (ircd-hybrid-7.2.3.tgz) = 58bec65da2492480b9a4e86777c6c19a4b568408
 Size (ircd-hybrid-7.2.3.tgz) = 1010625 bytes
-SHA1 (patch-aa) = 5ffdd9e30835e026ac900b1d83469c205b9d1bac
+SHA1 (patch-aa) = 05d1b2a8372650d5eefb92cc674c3b985b945ace
 SHA1 (patch-ab) = fde28c63ac049475ce1c4035958d430ac3b6934c
-SHA1 (patch-ac) = 14707da3e2418be7c3e42e61854b662aeda097fb
+SHA1 (patch-ac) = 09bab43df924da90cc6c19bbdbf9431d444475cf
 SHA1 (patch-ad) = 04cb6e2339f2ac0be734510a9040985a3d57ba54
 SHA1 (patch-ae) = 888cfb10f3637daac29f7e9a71865a5d2ed93024
 SHA1 (patch-af) = 98f8e425e935f468de1ae3b29e4a81e8188f90a8
@@ -13,3 +13,5 @@ SHA1 (patch-ag) = 34e4e1d6af0398f893916b8daef666103cb4d005
 SHA1 (patch-ah) = 398bff5e39ce04eccd959b612c84282c26e02224
 SHA1 (patch-ai) = 85e2f0650e22d8b948f65f66c6f35a9465f07b53
 SHA1 (patch-include_memory_h) = dbfa0d3987716e70464054d4f67facd42f3b1973
+SHA1 (patch-servlink_makefile_in) = d8f3b2d5877b0851a9e10fb1ebb201f9cfcfb162
+SHA1 (patch-src_makefile_in) = d92326eb9bcc9db84add691561a2319881e118b3
diff --git a/chat/ircd-hybrid/patches/patch-aa b/chat/ircd-hybrid/patches/patch-aa
index 1b6cddb0d52..28cb14523a3 100644
--- a/chat/ircd-hybrid/patches/patch-aa
+++ b/chat/ircd-hybrid/patches/patch-aa
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2006/01/03 13:09:25 adrianp Exp $
+$NetBSD: patch-aa,v 1.4 2011/08/29 01:24:03 dholland Exp $
 
---- Makefile.in.orig	2005-12-22 00:01:36.000000000 +0000
+- configure installation for pkgsrc
+- fix usage of $(DESTDIR) with @prefix@
+
+--- Makefile.in.orig	2007-02-28 04:17:54.000000000 +0000
 +++ Makefile.in
-@@ -25,7 +25,7 @@ RM          = @RM@
+@@ -25,12 +25,12 @@ RM          = @RM@
  #MFLAGS   = -j 4
  DEPEND_DIRS  = lib modules src servlink
  BUILD_DIRS   = ${DEPEND_DIRS} tools
@@ -11,3 +14,9 @@ $NetBSD: patch-aa,v 1.3 2006/01/03 13:09:25 adrianp Exp $
  CLEAN_DIRS   = ${BUILD_DIRS} contrib
  # Anywhere that we can make install, we obviously can rm -f Makefile
  DISTCLEAN_DIRS = ${INSTALL_DIRS} contrib messages
+ 
+-prefix		= $(DESTDIR)@prefix@
++prefix		= @prefix@
+ datarootdir	= $(DESTDIR)@datarootdir@
+ 
+ # The make used HAS to set $(MAKE). But then, if we don't do it this
diff --git a/chat/ircd-hybrid/patches/patch-ac b/chat/ircd-hybrid/patches/patch-ac
index 1a915dd83a5..82fa3dd76f4 100644
--- a/chat/ircd-hybrid/patches/patch-ac
+++ b/chat/ircd-hybrid/patches/patch-ac
@@ -1,6 +1,9 @@
-$NetBSD: patch-ac,v 1.6 2006/08/15 11:16:41 adrianp Exp $
+$NetBSD: patch-ac,v 1.7 2011/08/29 01:24:03 dholland Exp $
 
---- help/Makefile.in.orig	2006-07-17 07:31:26.000000000 +0100
+- configure paths for pkgsrc
+- DESTDIR support
+
+--- help/Makefile.in.orig	2007-02-28 04:17:47.000000000 +0000
 +++ help/Makefile.in
 @@ -8,8 +8,8 @@ RM		= @RM@
  prefix		= @prefix@
@@ -13,7 +16,7 @@ $NetBSD: patch-ac,v 1.6 2006/08/15 11:16:41 adrianp Exp $
  
  SYMLINKS	= topic accept cmode admin names links away whowas \
  		version kick who invite quit join list nick oper part \
-@@ -22,13 +22,13 @@ depend:
+@@ -22,27 +22,27 @@ depend:
  
  install: 
  	@echo installing help files...
@@ -24,13 +27,31 @@ $NetBSD: patch-ac,v 1.6 2006/08/15 11:16:41 adrianp Exp $
 -		mkdir $(prefix)/help/users; \
 -		echo "mkdir $(prefix)/help/opers"; \
 -		mkdir $(prefix)/help/opers; \
-+	-@if test ! -d $(prefix)/share/ircd-hybrid/help; then \
-+		echo "mkdir $(prefix)/share/ircd-hybrid/help"; \
-+		mkdir $(prefix)/share/ircd-hybrid/help; \
-+		echo "mkdir $(prefix)/share/ircd-hybrid/help/users"; \
-+		mkdir $(prefix)/share/ircd-hybrid/help/users; \
-+		echo "mkdir $(prefix)/share/ircd-hybrid/help/opers"; \
-+		mkdir $(prefix)/share/ircd-hybrid/help/opers; \
++	-@if test ! -d $(DESTDIR)$(prefix)/share/ircd-hybrid/help; then \
++		echo "mkdir $(DESTDIR)$(prefix)/share/ircd-hybrid/help"; \
++		mkdir $(DESTDIR)$(prefix)/share/ircd-hybrid/help; \
++		echo "mkdir $(DESTDIR)$(prefix)/share/ircd-hybrid/help/users"; \
++		mkdir $(DESTDIR)$(prefix)/share/ircd-hybrid/help/users; \
++		echo "mkdir $(DESTDIR)$(prefix)/share/ircd-hybrid/help/opers"; \
++		mkdir $(DESTDIR)$(prefix)/share/ircd-hybrid/help/opers; \
  	fi
  	@for help in opers/*; do \
  	if [ -f $$help ]; then \
+-		${INSTALL_DATA} $$help $(ohelpdir); \
++		${INSTALL_DATA} $$help $(DESTDIR)$(ohelpdir); \
+ 	fi \
+ 	done
+ 	@for help in users/*; do \
+ 	if [ -f $$help ]; then \
+-		$(INSTALL_DATA) $$help $(uhelpdir); \
++		$(INSTALL_DATA) $$help $(DESTDIR)$(uhelpdir); \
+ 	fi \
+ 	done
+ 	@for link in $(SYMLINKS); do \
+-		rm -f $(uhelpdir)/$$link; \
+-		ln -s $(ohelpdir)/$$link $(uhelpdir); \
++		rm -f $(DESTDIR)$(uhelpdir)/$$link; \
++		ln -s $(ohelpdir)/$$link $(DESTDIR)$(uhelpdir); \
+ 	done
+ 
+ distclean:
diff --git a/chat/ircd-hybrid/patches/patch-servlink_makefile_in b/chat/ircd-hybrid/patches/patch-servlink_makefile_in
new file mode 100644
index 00000000000..bf7d12a9cf2
--- /dev/null
+++ b/chat/ircd-hybrid/patches/patch-servlink_makefile_in
@@ -0,0 +1,15 @@
+$NetBSD: patch-servlink_makefile_in,v 1.1 2011/08/29 01:24:03 dholland Exp $
+
+- fix DESTDIR support
+
+--- servlink/Makefile.in~	2007-02-28 04:17:47.000000000 +0000
++++ servlink/Makefile.in
+@@ -15,7 +15,7 @@ MV              = @MV@
+ RM              = @RM@
+ SED		= @SED@
+ prefix          = @prefix@
+-exec_prefix     = $(DESTDIR)@exec_prefix@
++exec_prefix     = @exec_prefix@
+ bindir          = $(DESTDIR)@bindir@
+ datarootdir	= $(DESTDIR)@datarootdir@
+ 
diff --git a/chat/ircd-hybrid/patches/patch-src_makefile_in b/chat/ircd-hybrid/patches/patch-src_makefile_in
new file mode 100644
index 00000000000..e8919746506
--- /dev/null
+++ b/chat/ircd-hybrid/patches/patch-src_makefile_in
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_makefile_in,v 1.1 2011/08/29 01:24:03 dholland Exp $
+
+- fix DESTDIR support
+
+--- src/Makefile.in~	2007-02-28 04:17:46.000000000 +0000
++++ src/Makefile.in
+@@ -18,7 +18,7 @@ RM		= @RM@
+ SED		= @SED@
+ 
+ prefix		= @prefix@
+-exec_prefix	= $(DESTDIR)@exec_prefix@
++exec_prefix	= @exec_prefix@
+ bindir		= $(DESTDIR)@bindir@
+ sysconfdir	= $(DESTDIR)@sysconfdir@
+ localstatedir	= $(DESTDIR)@localstatedir@
+@@ -120,7 +120,7 @@ ircd: @MODULES_LIBS@ ../lib/libpcre.a $(
+ 	cd ../lib/pcre && ${MAKE} ${MFLAGS}
+ 
+ install-mkdirs:
+-	mkdir -p $(DESTDIR)$(prefix) $(exec_prefix) $(bindir) $(sysconfdir) \
++	mkdir -p $(DESTDIR)$(prefix) $(DESTDIR)$(exec_prefix) $(bindir) $(sysconfdir) \
+ 		$(localstatedir)/logs
+ 
+ install: install-mkdirs build