Convert to pkginstall framework. Bump PKGREVISION.

4 files changed, 31 insertions, 30 deletions

diff --git a/net/netatalk1/INSTALL b/net/netatalk1/INSTALL
deleted file mode 100644
index 15ac390215c..00000000000
--- a/net/netatalk1/INSTALL
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	ETCDIR=@PKG_SYSCONFDIR@/netatalk
-
-	${MKDIR} -p ${ETCDIR}
-
-	${ECHO} "Installing configuration files:"
-	for file in \
-		AppleVolumes.default AppleVolumes.system afpd.conf \
-		atalkd.conf netatalk.conf papd.conf
-	do
-		if [ -f ${ETCDIR}/${file} ]; then
-			${ECHO} "  ${ETCDIR}/${file} already exists"
-		else
-			${ECHO} "  ${ETCDIR}/${file}"
-			${CP} ${PKG_PREFIX}/share/examples/netatalk/${file} \
-				${ETCDIR}/${file}
-			${CHMOD} 644 ${ETCDIR}/${file}
-		fi
-	done
-	${ECHO} "done."
-	;;
-esac
diff --git a/net/netatalk1/Makefile b/net/netatalk1/Makefile
index 8ad86b673fc..6d1e1a8c647 100644
--- a/net/netatalk1/Makefile
+++ b/net/netatalk1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:10:27 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/19 16:30:31 wiz Exp $
 
 DISTNAME=	netatalk-1.6.4a
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/} \
 		http://me.in-berlin.de/~jroger/netatalk/
@@ -14,8 +14,6 @@ GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake perl
 USE_LIBTOOL=		YES
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
 CONFLICTS=	netatalk-asun-[0-9]* netatalk-umich-[0-9]*
 
 RCD_SCRIPTS=	atalkd afpd papd timelord
@@ -35,6 +33,11 @@ CONFIGURE_ARGS+=	--enable-netbsd \
 #CONFIGURE_ARGS+=	--with-flock-locks	# broken
 #CONFIGURE_ARGS+=	--with-bdb=${PREFIX}	# still some known issues
 
+.for cf in AppleVolumes.default AppleVolumes.system afpd.conf \
+	atalkd.conf netatalk.conf papd.conf
+CONF_FILES+=		${PREFIX}/share/examples/netatalk/${cf} ${PKG_SYSCONFDIR}/${cf}
+.endfor
+
 .include "options.mk"
 
 post-patch:
diff --git a/net/netatalk1/distinfo b/net/netatalk1/distinfo
index 72ddb2d35b3..f420534dd85 100644
--- a/net/netatalk1/distinfo
+++ b/net/netatalk1/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/06/05 23:40:56 taca Exp $
+$NetBSD: distinfo,v 1.5 2006/02/19 16:30:31 wiz Exp $
 
 SHA1 (netatalk-1.6.4a.tar.gz) = c3dec6d29524e316967bfdc7cab35cd95e53ec90
 RMD160 (netatalk-1.6.4a.tar.gz) = b34429f5ad0b83a72e343420aabfe8d8c1fe1ecc
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = 9bae8aef01e7b23fb26c9deddc53386b294d1e1c
 SHA1 (patch-af) = 386f493052a0325063b7ffe15879c09438eef8c4
 SHA1 (patch-ag) = 063b11af899f35b7030ad7c838866b68050c3b70
 SHA1 (patch-ah) = a36b7b32039b9fde4bcf395ce223c2bee2bd7b84
+SHA1 (patch-ai) = d2b3222ef460f07f0e19701f9892c7bb65ae1e7e
diff --git a/net/netatalk1/patches/patch-ai b/net/netatalk1/patches/patch-ai
new file mode 100644
index 00000000000..bb13c32f490
--- /dev/null
+++ b/net/netatalk1/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1 2006/02/19 16:30:31 wiz Exp $
+
+--- config/Makefile.in.orig	2003-12-02 20:19:05.000000000 +0000
++++ config/Makefile.in
+@@ -386,7 +386,7 @@ install-config-files: $(CONFFILES) $(GEN
+ 		fi; \
+ 	done
+ 
+-@USE_PAM_TRUE@install-data-local: install-config-files $(PAMFILES)
++@USE_PAM_TRUE@install-data-local: $(PAMFILES)
+ @USE_PAM_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pamdir)
+ @USE_PAM_TRUE@	if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pamdir)/netatalk; then \
+ @USE_PAM_TRUE@		echo "$(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk"; \
+@@ -396,7 +396,7 @@ install-config-files: $(CONFFILES) $(GEN
+ @USE_PAM_TRUE@		echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \
+ @USE_PAM_TRUE@	fi;
+ 
+-@USE_PAM_FALSE@install-data-local: install-config-files
++@USE_PAM_FALSE@install-data-local: 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: