DESTDIR support

7 files changed, 59 insertions, 24 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index ad7dbb92a2d..bfae15b087f 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2010/01/18 09:58:41 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2010/01/29 16:44:13 joerg Exp $
 
 VERS=		4.2.5
 DISTNAME=	hylafax-${VERS}
@@ -8,6 +8,8 @@ MASTER_SITES_BETA=	ftp://ftp.hylafax.org/source/BETA/
 MASTER_SITES_RELEASE=	ftp://ftp.hylafax.org/source/
 MASTER_SITES=	${MASTER_SITES_RELEASE}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAINTAINER=	hallmann@ahatec.de
 HOMEPAGE=	http://www.hylafax.org/
 COMMENT=	Telecommunication and fax server system
@@ -38,8 +40,10 @@ MAKE_JOBS_SAFE=	NO
 
 INSTALLATION_DIRS=	libdata/hylafax
 
-SUID_EXES=	${PREFIX}/libexec/faxgetty ${PREFIX}/sbin/faxq \
-		${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
+SPECIAL_PERMS+=	bin/faxalter ${SETUID_ROOT_PERMS} \
+		bin/faxrm ${SETUID_ROOT_PERMS} \
+		libexec/faxgetty ${SETUID_ROOT_PERMS} \
+		sbin/faxq ${SETUID_ROOT_PERMS}
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.hylafax
 PKG_SUPPORTED_OPTIONS=	pam
@@ -59,10 +63,6 @@ CONFIGURE_ARGS+=	--disable-pam
 CONFIGURE_ENV+=		MACHDEPLIBS=-lrt
 .endif
 
-post-install:
-	chown ${FAXUSER} ${SUID_EXES}
-	chmod 4555 ${SUID_EXES}
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo
index 34d3a95fc4b..448e7d29f4a 100644
--- a/comms/hylafax/distinfo
+++ b/comms/hylafax/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2009/08/27 17:09:55 wiz Exp $
+$NetBSD: distinfo,v 1.21 2010/01/29 16:44:13 joerg Exp $
 
 SHA1 (hylafax-4.2.5.tar.gz) = b3bfd492dcb85e8aa1ddff9e6dcec3c31e00fccc
 RMD160 (hylafax-4.2.5.tar.gz) = aef5e7a8ff32bafa43b5efc431b9fd8c334ddb3a
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 5ee930814178223fa66dd308f365ff400559fd1d
 SHA1 (patch-ac) = 6f89cc0c9e7a0e789c23b0dfc604376e457091b7
 SHA1 (patch-ad) = a7e361980c94a025be0b326c1cf694cce3cbff72
 SHA1 (patch-ae) = c6720fa1ddd3b733827847e7f57b6c807641c5a7
-SHA1 (patch-af) = 5c2429d08f2f4c6f5af19dd4775277434abc7ac4
+SHA1 (patch-af) = cb76c429c01e05ceeee7664a09344dc9d27f972d
 SHA1 (patch-ag) = e1a38918cadf1d1cca7765ee2c050e99dfed0b7f
 SHA1 (patch-ah) = 084a99cfe21d7090fca33d9e068036e19707f441
 SHA1 (patch-ai) = d45bb9e224b18999489314aa1c1c74fc62a77328
diff --git a/comms/hylafax/patches/patch-af b/comms/hylafax/patches/patch-af
index 7b137c63c33..bbf16210a70 100644
--- a/comms/hylafax/patches/patch-af
+++ b/comms/hylafax/patches/patch-af
@@ -1,15 +1,29 @@
-$NetBSD: patch-af,v 1.7 2005/01/27 16:22:37 adam Exp $
+$NetBSD: patch-af,v 1.8 2010/01/29 16:44:13 joerg Exp $
 
---- defs.in.orig	2004-04-27 20:16:15.000000000 +0000
+--- defs.in.orig	2005-09-27 18:38:24.000000000 +0000
 +++ defs.in
-@@ -44,6 +44,7 @@ SHELL		= @SCRIPT_SH@
+@@ -44,13 +44,14 @@ SHELL		= @SCRIPT_SH@
  # to insufficient; you are better off rerunning the
  # configure script so that all uses are set correctly.
  #
-+PREFIX		= @PREFIX@
- SPOOL		= @SPOOL@
- SBIN		= @SBIN@
- BIN		= @BIN@
+-SPOOL		= @SPOOL@
+-SBIN		= @SBIN@
+-BIN		= @BIN@
+-LIBDATA		= @LIBDATA@
+-LIBDIR		= @LIBDIR@
+-LIBEXEC		= @LIBEXEC@
+-HTMLDIR		= @HTMLDIR@
++PREFIX		= ${DESTDIR}@PREFIX@
++SPOOL		= ${DESTDIR}@SPOOL@
++SBIN		= ${DESTDIR}@SBIN@
++BIN		= ${DESTDIR}@BIN@
++LIBDATA		= ${DESTDIR}@LIBDATA@
++LIBDIR		= ${DESTDIR}@LIBDIR@
++LIBEXEC		= ${DESTDIR}@LIBEXEC@
++HTMLDIR		= ${DESTDIR}@HTMLDIR@
+ FONTMAP		= @FONTMAP@
+ FONTPATH	= @FONTPATH@
+ SENDMAIL	= @SENDMAIL@
 @@ -261,7 +262,7 @@ LDFLAGS		= ${LDOPTS} ${LDLIBS}
  LDOPTS		= ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
  LDLIBS		= ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
@@ -19,3 +33,12 @@ $NetBSD: patch-af,v 1.7 2005/01/27 16:22:37 adam Exp $
  GLDLIBS		= ${SHDLIBC}
  
  #
+@@ -322,7 +323,7 @@ INCLDIR		= /usr/include
+ # MANSYS	subdirectory for server & server-related apps
+ # MANFILES	subdirectory for file format info 
+ #
+-MAN		= @MANDIR@
++MAN		= ${DESTDIR}@MANDIR@
+ MANAPPS		= @MANAPPS@
+ MANSYS		= @MANSYS@
+ MANFILES	= @MANFILES@
diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile
index 6fc3ef64587..7b2c5a452e0 100644
--- a/comms/qpage/Makefile
+++ b/comms/qpage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:05 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2010/01/29 16:38:20 joerg Exp $
 #
 
 DISTNAME=	qpage-3.3
@@ -10,8 +10,16 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.qpage.org/
 COMMENT=	Simple and efficient paging (SNPP) client and server
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV+=	MKDIR_PATH=${MKDIR:Q}
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/qpage ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/qpage.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/qpage.1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index 2eaac59e37d..7c4b63d80b1 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/12/01 23:48:41 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/01/29 16:39:49 joerg Exp $
 
 DISTNAME=	tkhylafax-3.1
 PKGREVISION=	4
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.elgro.demon.co.uk/resources.html
 COMMENT=	Tcl/tk interface to Sam Leffler's fax package
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	gv>=3.5.8nb1:../../print/gv
 DEPENDS+=	hylafax>=4.1:../../comms/hylafax
 DEPENDS+=	tk>=8.3.2:../../x11/tk
@@ -19,4 +21,6 @@ WRKSRC=		${WRKDIR}/tkhylafax
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/tkhylafax/distinfo b/comms/tkhylafax/distinfo
index 3fc05633fc7..cfd83be863d 100644
--- a/comms/tkhylafax/distinfo
+++ b/comms/tkhylafax/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 16:05:31 agc Exp $
+$NetBSD: distinfo,v 1.4 2010/01/29 16:39:49 joerg Exp $
 
 SHA1 (tkhylafax-3.1.tar.gz) = d26dae62369c1421fbfd27785c0af0a1a4f174d1
 RMD160 (tkhylafax-3.1.tar.gz) = d89207bfa630ae09866be8a73039f05c62251c3f
 Size (tkhylafax-3.1.tar.gz) = 26696 bytes
-SHA1 (patch-aa) = 52ec8fc2fcd0b065c1623878962bfe8404335ceb
+SHA1 (patch-aa) = 22d9f34518f0087077e0f43335b0d6866c4e0a6b
 SHA1 (patch-ab) = 5e0603062d97086fd0df469eb838c8f6342839c6
diff --git a/comms/tkhylafax/patches/patch-aa b/comms/tkhylafax/patches/patch-aa
index b688416372f..64497bb2019 100644
--- a/comms/tkhylafax/patches/patch-aa
+++ b/comms/tkhylafax/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2000/08/31 23:21:44 jwise Exp $
+$NetBSD: patch-aa,v 1.4 2010/01/29 16:39:49 joerg Exp $
 --- Makefile.orig	Sun Jan  4 23:47:29 1998
 +++ Makefile	Tue Dec 29 18:38:29 1998
 @@ -5,19 +5,19 @@
@@ -6,15 +6,15 @@ $NetBSD: patch-aa,v 1.3 2000/08/31 23:21:44 jwise Exp $
  ### EDIT THE NEXT FIVE LINES ONLY ###
  # The directory where the tkhylafax library will be installed
 -TCLLIB_DEST = /usr/local/lib/tkhylafax-3.1
-+TCLLIB_DEST = ${PREFIX}/share/tkhylafax-3.1
++TCLLIB_DEST = ${DESTDIR}${PREFIX}/share/tkhylafax-3.1
  
  # The directory where the tkhylafax command will be installed
 -TCLPRG_DEST = /usr/local/bin
-+TCLPRG_DEST = ${PREFIX}/bin
++TCLPRG_DEST = ${DESTDIR}${PREFIX}/bin
  
  # The directory where the man page will be installed
 -TCLMAN_DEST = /usr/local/man/man1
-+TCLMAN_DEST = ${PREFIX}/man/man1
++TCLMAN_DEST = ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
  
  # The full path to tclsh
 -TCLSH = /usr/local/bin/tclsh