? wip/hylafax/work
? wip/hylafax-devel/work
Index: wip/hylafax/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/hylafax/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- wip/hylafax/Makefile	18 Jan 2010 09:38:25 -0000	1.7
+++ wip/hylafax/Makefile	21 Oct 2010 07:41:44 -0000
@@ -20,6 +20,7 @@
 
 DEPENDS+=	mawk>=1.2.2:../../lang/mawk
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 DIST_SUBDIR=	hylafax
 
 CONFLICTS=	hylafax-devel-[0-9]* mgetty-[0-9]*
@@ -41,8 +42,16 @@
 FAXGROUP?=	dialer
 RCD_SCRIPTS=	hylafax
 
-SUID_EXES=	${PREFIX}/libexec/faxgetty ${PREFIX}/sbin/faxq \
-		${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
+PKG_GROUPS=	${FAXGROUP}
+PKG_USERS=	${FAXUSER}:${FAXGROUP}
+PKG_GECOS.uucp=	Unix to Unix Copy Program
+
+SETUID_UUCP_PERMS=	${FAXUSER} ${FAXGROUP} 4555
+
+SPECIAL_PERMS+=	libexec/faxgetty ${SETUID_UUCP_PERMS} \
+		sbin/faxq ${SETUID_UUCP_PERMS} \
+		bin/faxrm ${SETUID_UUCP_PERMS} \
+		bin/faxalter ${SETUID_UUCP_PERMS}
 
 INSTALLATION_DIRS = libdata
 
@@ -60,10 +69,6 @@
 CONFIGURE_ARGS+=	--disable-pam
 .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"
Index: wip/hylafax/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/hylafax/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- wip/hylafax/distinfo	21 Oct 2010 05:19:14 -0000	1.3
+++ wip/hylafax/distinfo	21 Oct 2010 07:41:44 -0000
@@ -8,7 +8,7 @@
 SHA1 (patch-ac) = 1f37405fd71840672f7f3916c8da9af4d3ff7333
 SHA1 (patch-ad) = 5a71bd74d37a1a532d0175a3762e83c1e158de67
 SHA1 (patch-ae) = 908379b9797ddf813c6cb6be3462328e4bf59427
-SHA1 (patch-af) = 317db8be24db4dda56a4ce288f0ab9278bdeead2
+SHA1 (patch-af) = c7dbe5a258d7e710fd5bd065bace337c6e9f585a
 SHA1 (patch-ag) = d23afb3285ccbd404647fe36bdab97e4c3e56554
 SHA1 (patch-ah) = ae7b9c79fcd54da311f1491bb4d8c2e17136acb6
 SHA1 (patch-ai) = a1a882f63c23ca9f05fc85b80887cf1e852b38c5
Index: wip/hylafax/patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/hylafax/patches/patch-af,v
retrieving revision 1.2
diff -u -r1.2 patch-af
--- wip/hylafax/patches/patch-af	4 Jun 2007 09:51:54 -0000	1.2
+++ wip/hylafax/patches/patch-af	21 Oct 2010 07:41:44 -0000
@@ -1,16 +1,30 @@
-$NetBSD: patch-af,v 1.7 2005/01/27 16:22:37 adam Exp $
+$NetBSD$
 
---- defs.in.orig	2006-01-31 20:03:34.000000000 +0100
-+++ defs.in
-@@ -44,6 +44,7 @@ SHELL		= @SCRIPT_SH@
+--- defs.in~	2006-02-01 04:03:34.000000000 +0900
++++ defs.in	2010-10-21 15:01:10.000000000 +0900
+@@ -44,13 +44,14 @@
  # 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@
-@@ -261,7 +262,7 @@ LDFLAGS		= ${LDOPTS} ${LDLIBS}
+-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 @@
  LDOPTS		= ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
  LDLIBS		= ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
  
@@ -19,3 +33,12 @@
  GLDLIBS		= ${SHDLIBC}
  
  #
+@@ -322,7 +323,7 @@
+ # MANSYS	subdirectory for server & server-related apps
+ # MANFILES	subdirectory for file format info 
+ #
+-MAN		= @MANDIR@
++MAN		= ${DESTDIR}@MANDIR@
+ MANAPPS		= @MANAPPS@
+ MANSYS		= @MANSYS@
+ MANFILES	= @MANFILES@
Index: wip/hylafax-devel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- wip/hylafax-devel/Makefile	18 Jan 2010 09:38:25 -0000	1.12
+++ wip/hylafax-devel/Makefile	21 Oct 2010 07:41:44 -0000
@@ -22,6 +22,7 @@
 
 DIST_SUBDIR=	hylafax
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=	hylafax-[0-9]* mgetty-[0-9]*
 
 USE_LANGUAGES=		c c++
@@ -41,8 +42,16 @@
 FAXGROUP?=	dialer
 RCD_SCRIPTS=	hylafax
 
-SUID_EXES=	${PREFIX}/libexec/faxgetty ${PREFIX}/sbin/faxq \
-		${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
+PKG_GROUPS=	${FAXGROUP}
+PKG_USERS=	${FAXUSER}:${FAXGROUP}
+PKG_GECOS.uucp=	Unix to Unix Copy Program
+
+SETUID_UUCP_PERMS=	${FAXUSER} ${FAXGROUP} 4555
+
+SPECIAL_PERMS+=	libexec/faxgetty ${SETUID_UUCP_PERMS} \
+		sbin/faxq ${SETUID_UUCP_PERMS} \
+		bin/faxrm ${SETUID_UUCP_PERMS} \
+		bin/faxalter ${SETUID_UUCP_PERMS}
 
 INSTALLATION_DIRS = libdata
 
@@ -60,10 +69,6 @@
 CONFIGURE_ARGS+=	--disable-pam
 .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"
Index: wip/hylafax-devel/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- wip/hylafax-devel/PLIST	21 Oct 2010 05:53:35 -0000	1.6
+++ wip/hylafax-devel/PLIST	21 Oct 2010 07:41:44 -0000
@@ -164,6 +164,7 @@
 share/hylafax/config_template/hayes
 share/hylafax/config_template/iaxmodem
 share/hylafax/config_template/intel-400e
+share/hylafax/config_template/ip568x
 share/hylafax/config_template/linux-isdn-2
 share/hylafax/config_template/lucent
 share/hylafax/config_template/lucent-isa
@@ -171,6 +172,8 @@
 share/hylafax/config_template/lucent-mt-2
 share/hylafax/config_template/lucent-mt-20
 share/hylafax/config_template/lucent-mt-21
+share/hylafax/config_template/mainpine-2
+share/hylafax/config_template/mainpine-21
 share/hylafax/config_template/moto-288
 share/hylafax/config_template/mt-1432
 share/hylafax/config_template/nuvo-voyager
Index: wip/hylafax-devel/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- wip/hylafax-devel/distinfo	21 Oct 2010 05:53:35 -0000	1.11
+++ wip/hylafax-devel/distinfo	21 Oct 2010 07:41:44 -0000
@@ -8,7 +8,7 @@
 SHA1 (patch-ac) = 1f37405fd71840672f7f3916c8da9af4d3ff7333
 SHA1 (patch-ad) = 5a71bd74d37a1a532d0175a3762e83c1e158de67
 SHA1 (patch-ae) = b40f2fffe2c1483b73b4e1ff63bee5332701a140
-SHA1 (patch-af) = 317db8be24db4dda56a4ce288f0ab9278bdeead2
+SHA1 (patch-af) = a1d729d7bf490cda99af347e57a2817c481f5108
 SHA1 (patch-ag) = d23afb3285ccbd404647fe36bdab97e4c3e56554
 SHA1 (patch-ah) = ae7b9c79fcd54da311f1491bb4d8c2e17136acb6
 SHA1 (patch-ai) = a1a882f63c23ca9f05fc85b80887cf1e852b38c5
Index: wip/hylafax-devel/patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/patches/patch-af,v
retrieving revision 1.2
diff -u -r1.2 patch-af
--- wip/hylafax-devel/patches/patch-af	7 Mar 2007 09:56:21 -0000	1.2
+++ wip/hylafax-devel/patches/patch-af	21 Oct 2010 07:41:44 -0000
@@ -1,21 +1,33 @@
-$NetBSD: patch-af,v 1.7 2005/01/27 16:22:37 adam Exp $
+$NetBSD$
 
---- defs.in.orig	2006-01-31 20:03:34.000000000 +0100
-+++ defs.in
-@@ -44,6 +44,7 @@ SHELL		= @SCRIPT_SH@
+--- defs.in.orig	2007-07-05 23:37:54.000000000 +0900
++++ defs.in	2010-10-21 15:31:40.000000000 +0900
+@@ -44,12 +44,13 @@
  # 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@
-@@ -261,7 +262,7 @@ LDFLAGS		= ${LDOPTS} ${LDLIBS}
- LDOPTS		= ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
- LDLIBS		= ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
- 
--GLDOPTS		= -L/usr/local/lib
-+GLDOPTS		= -L${PREFIX}/lib
- GLDLIBS		= ${SHDLIBC}
- 
+-SPOOL		= @SPOOL@
+-SBIN		= @SBIN@
+-BIN		= @BIN@
+-LIBDATA		= @LIBDATA@
+-LIBDIR		= @LIBDIR@
+-LIBEXEC		= @LIBEXEC@
++PREFIX		= ${DESTDIR}@PREFIX@
++SPOOL		= ${DESTDIR}@SPOOL@
++SBIN		= ${DESTDIR}@SBIN@
++BIN		= ${DESTDIR}@BIN@
++LIBDATA		= ${DESTDIR}@LIBDATA@
++LIBDIR		= ${DESTDIR}@LIBDIR@
++LIBEXEC		= ${DESTDIR}@LIBEXEC@
+ FONTMAP		= @FONTMAP@
+ FONTPATH	= @FONTPATH@
+ SENDMAIL	= @SENDMAIL@
+@@ -321,7 +322,7 @@
+ # MANSYS	subdirectory for server & server-related apps
+ # MANFILES	subdirectory for file format info 
  #
+-MAN		= @MANDIR@
++MAN		= ${DESTDIR}@MANDIR@
+ MANAPPS		= @MANAPPS@
+ MANSYS		= @MANSYS@
+ MANFILES	= @MANFILES@