- integrate COMMENT

- bump NEED_VERSION
- hardcoded /etc/netatalk -> ${SYSCONFDIR}
--
Ok'd by: maintainer

net/netatalk/Makefile

@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2000/10/23 16:08:13 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2001/04/18 13:00:26 brad Exp $
+
+COMMENT=	"File and Print Services for AppleTalk Networks"
 
 DISTNAME=       netatalk-990130
 CATEGORIES=	net
-NEED_VERSION=	1.310
-MASTER_SITES=   ftp://terminator.rs.itd.umich.edu/unix/netatalk/ \
+NEED_VERSION=	1.384
+MASTER_SITES=	ftp://terminator.rs.itd.umich.edu/unix/netatalk/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/terminator.rs.itd.umich.edu/unix/netatalk/
 
 HOMEPAGE=	http://www.umich.edu/~rsug/netatalk/
@@ -15,8 +17,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MAKE_FLAGS=	CC="${CC}" OPTOPTS="${CFLAGS} -Wall"
-FAKE_FLAGS=	${MAKE_FLAGS} PREFIX="${PREFIX}" DESTDIR="${WRKINST}"
+MAKE_FLAGS=	CC="${CC}" OPTOPTS="${CFLAGS} -Wall" \
+		PREFIX="${PREFIX}" SYSCONFDIR="${SYSCONFDIR}"
+FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR="${WRKINST}"
+
+SYSCONFDIR=	/etc/netatalk
 
 # NOTES:
 # Will compile with kerberos support in apfd and papd.

net/netatalk/patches/patch-makefile

@@ -1,10 +1,7 @@
 --- Makefile.orig	Wed Dec 17 12:25:39 1997
-+++ Makefile	Wed Aug  9 10:43:40 2000
-@@ -1,22 +1,22 @@
- # Root of installation. Subdirectories will be ${DESTDIR}/etc,
- # ${DESTDIR}/bin, and ${DESTDIR}/lib.
--DESTDIR=/usr/local/atalk
-+DESTDIR= 
++++ Makefile	Sat Apr 14 20:26:14 2001
+@@ -3,20 +3,20 @@
+ DESTDIR=/usr/local/atalk
  
  # for system-level binaries
 -SBINDIR=$(DESTDIR)/etc
@@ -20,7 +17,7 @@
 +RESDIR=${PREFIX}/share/netatalk
  # for configuration files (AppleVolumes.system, etc.)
 -ETCDIR=$(DESTDIR)/etc
-+ETCDIR=/etc/netatalk
++ETCDIR=${SYSCONFDIR}
  # for include files
 -INCDIR=$(DESTDIR)/include
 +INCDIR=${PREFIX}/include
@@ -42,11 +39,3 @@
  
  ##########################################################################
  
-@@ -55,6 +55,7 @@
- 	esac; \
- 	echo "Making $@ for $$ARCH..."; \
- 	cd sys/$$ARCH && ${MAKE} ${MFLAGS} \
-+	    CC="${CC}" OPTOPTS="${OPTOPTS}" \
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \

net/netatalk/pkg/COMMENT

@@ -1 +0,0 @@
-File and Print Services for AppleTalk Networks

net/netatalk/pkg/DEINSTALL

@@ -1,12 +1,12 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.3 2000/08/10 17:53:34 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.4 2001/04/18 13:00:28 brad Exp $
 #
 # netatalk de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=/etc/netatalk
+CONFIG_DIR=${SYSCONFDIR}
 
 if [ -d $CONFIG_DIR ]; then
     echo
@@ -14,7 +14,7 @@ if [ -d $CONFIG_DIR ]; then
     echo "| To completely deinstall the $1 package you need to perform"
     echo "| this step as root:"
     echo "|"
-    echo "|           rm -rf ${CONFIG_DIR}"
+    echo "|           rm -rf $CONFIG_DIR"
     echo "|"
     echo "| Do not do this if you plan on re-installing $1"
     echo "| at some future time."

net/netatalk/pkg/INSTALL

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.5 2000/08/10 17:53:35 brad Exp $
+# $OpenBSD: INSTALL,v 1.6 2001/04/18 13:00:28 brad Exp $
 #
 # Pre/post-installation setup of netatalk
 
@@ -8,7 +8,7 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=/etc/netatalk
+CONFIG_DIR=${SYSCONFDIR}
 SAMPLE_CONFIG_DIR=$PREFIX/share/examples/netatalk
 
 do_notice()