netatalk1 package overhaul

- Adapt buildlink framework and fix compile problem with des.h header file.
- Proper dependency with openssl.
- Use subst framework for replacing path.
- Fix minor pkglint warning.

Bump PKGREVISION.

9 files changed, 77 insertions, 48 deletions

diff --git a/net/netatalk1/Makefile b/net/netatalk1/Makefile
index 6d1e1a8c647..a7a3e272ff7 100644
--- a/net/netatalk1/Makefile
+++ b/net/netatalk1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/02/19 16:30:31 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/08/17 13:57:23 taca Exp $
 
 DISTNAME=	netatalk-1.6.4a
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/} \
 		http://me.in-berlin.de/~jroger/netatalk/
@@ -11,13 +11,17 @@ HOMEPAGE=	http://sourceforge.net/projects/netatalk/
 COMMENT=	Netatalk appletalk file and print services
 
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake perl
-USE_LIBTOOL=		YES
+USE_TOOLS+=	gmake perl:run
+USE_LIBTOOL=	YES
+USE_OLD_DES_API=YES
+BUILDLINK_TRANSFORM+=	l:db-4.2:db4
 
 CONFLICTS=	netatalk-asun-[0-9]* netatalk-umich-[0-9]*
 
 RCD_SCRIPTS=	atalkd afpd papd timelord
 
+BUILD_DEFS+=	VARBASE
+
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=	--enable-netbsd \
@@ -28,7 +32,8 @@ CONFIGURE_ARGS+=	--enable-netbsd \
 			--sysconfdir=${PKG_SYSCONFDIR:Q} \
 			--localstatedir=${VARBASE}/netatalk \
 			--with-nls-dir=${PREFIX}/share/netatalk/nls \
-			--with-uams-path=${PREFIX}/libexec/netatalk/uams
+			--with-uams-path=${PREFIX}/libexec/netatalk/uams \
+			--with-ssl-dir=${BUILDLINK_PREFIX.openssl}
 
 #CONFIGURE_ARGS+=	--with-flock-locks	# broken
 #CONFIGURE_ARGS+=	--with-bdb=${PREFIX}	# still some known issues
@@ -38,24 +43,25 @@ CONFIGURE_ARGS+=	--enable-netbsd \
 CONF_FILES+=		${PREFIX}/share/examples/netatalk/${cf} ${PKG_SYSCONFDIR}/${cf}
 .endfor
 
-.include "options.mk"
+SUBST_CLASSES+=	paths
+SUBST_FILES.paths+=	${WRKSRC}/etc/psf/etc2ps.sh
+SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX:Q},g'
+SUBST_STAGE.paths=	pre-configure
 
-post-patch:
-	${MV} ${WRKSRC}/etc/psf/etc2ps.sh ${WRKSRC}/etc/psf/etc2ps.sh.tmp
-	${SED} -e "s,^\(DVIPS=\)\(/usr/local/tex\)\(/bin\),\1${PREFIX}\3," \
-		< ${WRKSRC}/etc/psf/etc2ps.sh.tmp > ${WRKSRC}/etc/psf/etc2ps.sh
+.include "options.mk"
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/libexec/psffilters
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/netatalk
-.for FILE in atalkd.conf netatalk.conf papd.conf AppleVolumes.default \
+.for file in atalkd.conf netatalk.conf papd.conf AppleVolumes.default \
 		AppleVolumes.system afpd.conf
-	@-( cd ${WRKSRC}/config; ${MAKE_PROGRAM} ${FILE} )
-	${INSTALL_DATA} ${WRKSRC}/config/${FILE} \
+	( cd ${WRKSRC}/config; ${MAKE_PROGRAM} ${file} || ${TRUE} )
+	${INSTALL_DATA} ${WRKSRC}/config/${file} \
 					${PREFIX}/share/examples/netatalk/
 .endfor
 
-#.include "../../databases/db3/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../devel/rx/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk1/buildlink3.mk b/net/netatalk1/buildlink3.mk
index 1a7a8f7bd3d..d59a034cd52 100644
--- a/net/netatalk1/buildlink3.mk
+++ b/net/netatalk1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/08/17 13:57:23 taca Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	netatalk
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGESNnetatalk}
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetatalk}
 BUILDLINK_PACKAGES+=	netatalk
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}netatalk
 
diff --git a/net/netatalk1/distinfo b/net/netatalk1/distinfo
index 2e655f0a408..04174e2cb9a 100644
--- a/net/netatalk1/distinfo
+++ b/net/netatalk1/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/06/12 15:24:08 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/08/17 13:57:23 taca Exp $
 
 SHA1 (netatalk-1.6.4a.tar.gz) = c3dec6d29524e316967bfdc7cab35cd95e53ec90
 RMD160 (netatalk-1.6.4a.tar.gz) = b34429f5ad0b83a72e343420aabfe8d8c1fe1ecc
@@ -8,9 +8,10 @@ SHA1 (patch-ab) = e05e4c59d4be48be53a2597e38c6ab638587a831
 SHA1 (patch-ac) = 81feb8c1fae68a661afd23a06825334bc6544677
 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
 SHA1 (patch-ae) = 9bae8aef01e7b23fb26c9deddc53386b294d1e1c
-SHA1 (patch-af) = 386f493052a0325063b7ffe15879c09438eef8c4
-SHA1 (patch-ag) = 063b11af899f35b7030ad7c838866b68050c3b70
-SHA1 (patch-ah) = a36b7b32039b9fde4bcf395ce223c2bee2bd7b84
+SHA1 (patch-af) = 7bf5a8b785052325c0fc7b30e02dd37314b178b9
 SHA1 (patch-ai) = d2b3222ef460f07f0e19701f9892c7bb65ae1e7e
 SHA1 (patch-aj) = 53b75cb1aa363d8997f4ca9de45eb5b66d8f1c87
 SHA1 (patch-ak) = f1dbeb119cf648aff96b6e32ebd2d258367224ff
+SHA1 (patch-al) = e8f453569db891100221f27bf579c66a18a650b7
+SHA1 (patch-am) = a01ab55a793c5249cc6fa0a4d98d61e43f173021
+SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
diff --git a/net/netatalk1/patches/patch-af b/net/netatalk1/patches/patch-af
index aeaf4efd1df..9afafd6634e 100644
--- a/net/netatalk1/patches/patch-af
+++ b/net/netatalk1/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2005/06/05 23:40:56 taca Exp $
+$NetBSD: patch-af,v 1.3 2006/08/17 13:57:23 taca Exp $
 
 --- etc/psf/etc2ps.sh.orig	2004-10-28 07:54:53.000000000 +0900
 +++ etc/psf/etc2ps.sh
@@ -7,7 +7,8 @@ $NetBSD: patch-af,v 1.2 2005/06/05 23:40:56 taca Exp $
  #
  
 -DVIPSPATH=/usr/local/tex/bin
- DVIPS=/usr/local/tex/bin/dvips
+-DVIPS=/usr/local/tex/bin/dvips
++DVIPS="@PREFIX@/bin/dvips"
  DVIPSARGS="-f -q"
  
 -TROFF2PS=/usr/local/psroff/troff2/troff2ps
diff --git a/net/netatalk1/patches/patch-ag b/net/netatalk1/patches/patch-ag
deleted file mode 100644
index 06e466b01ad..00000000000
--- a/net/netatalk1/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/06/05 23:40:56 taca Exp $
-
---- bin/afppasswd/Makefile.in.orig	2003-12-03 05:18:37.000000000 +0900
-+++ bin/afppasswd/Makefile.in
-@@ -201,7 +201,7 @@ pkgconfdir = @PKGCONFDIR@
- afppasswd_SOURCES = afppasswd.c
- afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la @SSL_LIBS@
- 
--INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys @SSL_CFLAGS@ \
-+CFLAGS = @CFLAGS@ @SSL_CFLAGS@ -I$(top_srcdir)/sys \
- 	-D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
- 
- subdir = bin/afppasswd
diff --git a/net/netatalk1/patches/patch-ah b/net/netatalk1/patches/patch-ah
deleted file mode 100644
index 3fd0ec5cee2..00000000000
--- a/net/netatalk1/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/06/05 23:40:56 taca Exp $
-
---- etc/uams/Makefile.in.orig	2003-12-03 05:19:36.000000000 +0900
-+++ etc/uams/Makefile.in
-@@ -230,7 +230,7 @@ uams_dhx_pam_la_SOURCES = uams_dhx_pam.c
- #
- # flags
- #
--INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys @SSL_CFLAGS@
-+CFLAGS = @CFLAGS@ @SSL_CFLAGS@ -I$(top_srcdir)/sys
- 
- uams_guest_la_CFLAGS = @CFLAGS@
- uams_randnum_la_CFLAGS = @CFLAGS@ @SSL_CFLAGS@
diff --git a/net/netatalk1/patches/patch-al b/net/netatalk1/patches/patch-al
new file mode 100644
index 00000000000..ef22138f2cf
--- /dev/null
+++ b/net/netatalk1/patches/patch-al
@@ -0,0 +1,21 @@
+$NetBSD: patch-al,v 1.1 2006/08/17 13:57:23 taca Exp $
+
+--- distrib/initscripts/rc.afpd.netbsd.tmpl.orig	2002-01-17 19:04:35.000000000 +1300
++++ distrib/initscripts/rc.afpd.netbsd.tmpl
+@@ -2,6 +2,7 @@
+ #
+ # PROVIDE: afpd
+ # REQUIRE: atalkd
++# KEYWORD: shutdown
+ #
+ # AppleTalk daemons. Make sure not to start atalkd in the background:
+ # its data structures must have time to stablize before running the
+@@ -15,7 +16,7 @@ rcvar=$name
+ command=":SBINDIR:/afpd"
+ etcdir=":ETCDIR:"
+ pidfile="/var/run/${name}.pid"
+-required_files="$etcdir/papd.conf $etcdir/AppleVolumes.default $etcdir/AppleVolumes.system"
++required_files="$etcdir/afpd.conf $etcdir/AppleVolumes.default $etcdir/AppleVolumes.system"
+ 
+ load_rc_config $name
+ run_rc_command "$1"
diff --git a/net/netatalk1/patches/patch-am b/net/netatalk1/patches/patch-am
new file mode 100644
index 00000000000..08e67fe2e0e
--- /dev/null
+++ b/net/netatalk1/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2006/08/17 13:57:23 taca Exp $
+
+--- bin/afppasswd/afppasswd.c.orig	2005-02-10 14:23:07.000000000 +1300
++++ bin/afppasswd/afppasswd.c
+@@ -42,7 +42,7 @@
+ 
+ #include <netatalk/endian.h>
+ 
+-#include <des.h>
++#include <openssl/des.h>
+ 
+ #ifdef USE_CRACKLIB
+ #include <crack.h>
diff --git a/net/netatalk1/patches/patch-an b/net/netatalk1/patches/patch-an
new file mode 100644
index 00000000000..92066759f00
--- /dev/null
+++ b/net/netatalk1/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2006/08/17 13:57:23 taca Exp $
+
+--- etc/uams/uams_randnum.c.orig	2005-05-26 17:24:26.000000000 +1200
++++ etc/uams/uams_randnum.c
+@@ -47,7 +47,7 @@ char *strchr (), *strrchr ();
+ #include <atalk/uam.h>
+ 
+ 
+-#include <des.h>
++#include <openssl/des.h>
+ 
+ #ifdef USE_CRACKLIB
+ #include <crack.h>