- MLINKS removed; they didn't work. Instead, +INSTALL will install symlinks

  itself.
- symlinks to libexec/psf are now in libexec/filters instead of
  share/filters.

6 files changed, 64 insertions, 118 deletions

diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index 0588520c9455..0b53efd07e8e 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         23 Jul 1997
 # Whom:                 stb
 #
-# $Id: Makefile,v 1.5 1998/02/27 00:05:23 stb Exp $
+# $Id: Makefile,v 1.6 1998/09/09 01:31:06 stb Exp $
 #
 
 DISTNAME=       netatalk-1.4b2
@@ -16,36 +16,11 @@ PATCHFILES=	afpd-macos8.diff afpd-bfree.diff
 MAINTAINER=	stb@freebsd.org
 
 MAN1=		aecho.1 getzones.1 megatron.1 nbp.1 pap.1 psorder.1
-MLINKS=		hqx2bin.1 megatron.1 \
-		macbinary.1 megatron.1 \
-		single2bin.1 megatron.1 \
-		unbin.1 megatron.1 \
-		unhex.1 megatron.1 \
-		unsingle.1 megatron.1 \
-		nbplkup.1 nbp.1 \
-		nbprgstr.1 nbp.1 \
-		nbpunrgstr.1 nbp.1 \
-		papstatus.1 pap.1
 MAN3=		atalk_aton.3 nbp_name.3
 MAN4=		atalk.4
 MAN8=		afpd.8 atalkd.8 papd.8 psf.8
 
 post-install:
-	@PKG_PREFIX=${PREFIX} FAKE_PKG_INSTALL=yes \
-		${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-#	@if [ -f ${PREFIX}/etc/AppleVolumes.system ]; then \
-#		echo "*** Make sure ${PREFIX}/etc/AppleVolumes.system is in sync with this version"; \
-#		echo "    of the port.  See ${PREFIX}/etc/AppleVolumes.system.dist for details."; \
-#	else \
-#		${INSTALL_DATA} ${PREFIX}/etc/AppleVolumes.system.dist \
-#			${PREFIX}/etc/AppleVolumes.system ; \
-#	fi
-#	@if [ -f ${PREFIX}/etc/AppleVolumes.default ]; then \
-#		echo "*** Make sure ${PREFIX}/etc/AppleVolumes.default is in sync with this version"; \
-#		echo "    of the port.  See ${PREFIX}/etc/AppleVolumes.default.dist for details."; \
-#	else \
-#		${INSTALL_DATA} ${PREFIX}/etc/AppleVolumes.default.dist \
-#			${PREFIX}/etc/AppleVolumes.default ; \
-#	fi
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/net/netatalk-devel/pkg-install b/net/netatalk-devel/pkg-install
index b4b6c55892ad..e17a582f1265 100644
--- a/net/netatalk-devel/pkg-install
+++ b/net/netatalk-devel/pkg-install
@@ -27,17 +27,15 @@ case $2 in
 
 		# install man page aliases
 		cd man
-		if [ "x${FAKE_PKG_INSTALL}" = "x" ]; then
-			if [ -f man1/megatron.1.gz ]; then
-				MANEXT=.gz
-			fi
-			for i in hqx2bin macbinary single2bin unbin unhex unsingle; do
-				ln -f man1/megatron.1${MANEXT} man1/$i.1${MANEXT}
-			done
-			for i in nbplkup nbprgstr nbpunrgstr; do
-				ln -f man1/nbp.1${MANEXT} man1/$i.1${MANEXT}
-			done
-			ln -f man1/pap.1${MANEXT} man1/papstatus.1${MANEXT}
+		if [ -f man1/megatron.1.gz ]; then
+			MANEXT=.gz
 		fi
+		for i in hqx2bin macbinary single2bin unbin unhex unsingle; do
+			ln -f man1/megatron.1${MANEXT} man1/$i.1${MANEXT}
+		done
+		for i in nbplkup nbprgstr nbpunrgstr; do
+			ln -f man1/nbp.1${MANEXT} man1/$i.1${MANEXT}
+		done
+		ln -f man1/pap.1${MANEXT} man1/papstatus.1${MANEXT}
 		;;
 esac
diff --git a/net/netatalk-devel/pkg-plist b/net/netatalk-devel/pkg-plist
index 9eacf9250cda..843370baa515 100644
--- a/net/netatalk-devel/pkg-plist
+++ b/net/netatalk-devel/pkg-plist
@@ -37,30 +37,30 @@ libexec/etc2ps
 libexec/papd
 libexec/psa
 libexec/psf
+libexec/filters/ifmpap
+libexec/filters/ifmpaprev
+libexec/filters/ifpap
+libexec/filters/ifpaprev
+libexec/filters/ifwmpap
+libexec/filters/ifwmpaprev
+libexec/filters/ifwpap
+libexec/filters/ifwpaprev
+libexec/filters/ofmpap
+libexec/filters/ofpap
+libexec/filters/ofwmpap
+libexec/filters/ofwpap
+libexec/filters/tfmpap
+libexec/filters/tfmpaprev
+libexec/filters/tfpap
+libexec/filters/tfpaprev
+libexec/filters/tfwmpap
+libexec/filters/tfwmpaprev
+libexec/filters/tfwpap
+libexec/filters/tfwpaprev
+@dirrm libexec/filters
 share/examples/netatalk/atalkd.conf
 share/examples/netatalk/papd.conf
 @dirrm share/examples/netatalk
-share/filters/ifmpap
-share/filters/ifmpaprev
-share/filters/ifpap
-share/filters/ifpaprev
-share/filters/ifwmpap
-share/filters/ifwmpaprev
-share/filters/ifwpap
-share/filters/ifwpaprev
-share/filters/ofmpap
-share/filters/ofpap
-share/filters/ofwmpap
-share/filters/ofwpap
-share/filters/tfmpap
-share/filters/tfmpaprev
-share/filters/tfpap
-share/filters/tfpaprev
-share/filters/tfwmpap
-share/filters/tfwmpaprev
-share/filters/tfwpap
-share/filters/tfwpaprev
-@dirrm share/filters
 share/pagecount.ps
 @comment	Remove man page aliases
 @unexec rm -f %D/man/man1/hqx2bin.1*
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 0588520c9455..0b53efd07e8e 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -3,7 +3,7 @@
 # Date created:         23 Jul 1997
 # Whom:                 stb
 #
-# $Id: Makefile,v 1.5 1998/02/27 00:05:23 stb Exp $
+# $Id: Makefile,v 1.6 1998/09/09 01:31:06 stb Exp $
 #
 
 DISTNAME=       netatalk-1.4b2
@@ -16,36 +16,11 @@ PATCHFILES=	afpd-macos8.diff afpd-bfree.diff
 MAINTAINER=	stb@freebsd.org
 
 MAN1=		aecho.1 getzones.1 megatron.1 nbp.1 pap.1 psorder.1
-MLINKS=		hqx2bin.1 megatron.1 \
-		macbinary.1 megatron.1 \
-		single2bin.1 megatron.1 \
-		unbin.1 megatron.1 \
-		unhex.1 megatron.1 \
-		unsingle.1 megatron.1 \
-		nbplkup.1 nbp.1 \
-		nbprgstr.1 nbp.1 \
-		nbpunrgstr.1 nbp.1 \
-		papstatus.1 pap.1
 MAN3=		atalk_aton.3 nbp_name.3
 MAN4=		atalk.4
 MAN8=		afpd.8 atalkd.8 papd.8 psf.8
 
 post-install:
-	@PKG_PREFIX=${PREFIX} FAKE_PKG_INSTALL=yes \
-		${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-#	@if [ -f ${PREFIX}/etc/AppleVolumes.system ]; then \
-#		echo "*** Make sure ${PREFIX}/etc/AppleVolumes.system is in sync with this version"; \
-#		echo "    of the port.  See ${PREFIX}/etc/AppleVolumes.system.dist for details."; \
-#	else \
-#		${INSTALL_DATA} ${PREFIX}/etc/AppleVolumes.system.dist \
-#			${PREFIX}/etc/AppleVolumes.system ; \
-#	fi
-#	@if [ -f ${PREFIX}/etc/AppleVolumes.default ]; then \
-#		echo "*** Make sure ${PREFIX}/etc/AppleVolumes.default is in sync with this version"; \
-#		echo "    of the port.  See ${PREFIX}/etc/AppleVolumes.default.dist for details."; \
-#	else \
-#		${INSTALL_DATA} ${PREFIX}/etc/AppleVolumes.default.dist \
-#			${PREFIX}/etc/AppleVolumes.default ; \
-#	fi
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/net/netatalk/pkg-install b/net/netatalk/pkg-install
index b4b6c55892ad..e17a582f1265 100644
--- a/net/netatalk/pkg-install
+++ b/net/netatalk/pkg-install
@@ -27,17 +27,15 @@ case $2 in
 
 		# install man page aliases
 		cd man
-		if [ "x${FAKE_PKG_INSTALL}" = "x" ]; then
-			if [ -f man1/megatron.1.gz ]; then
-				MANEXT=.gz
-			fi
-			for i in hqx2bin macbinary single2bin unbin unhex unsingle; do
-				ln -f man1/megatron.1${MANEXT} man1/$i.1${MANEXT}
-			done
-			for i in nbplkup nbprgstr nbpunrgstr; do
-				ln -f man1/nbp.1${MANEXT} man1/$i.1${MANEXT}
-			done
-			ln -f man1/pap.1${MANEXT} man1/papstatus.1${MANEXT}
+		if [ -f man1/megatron.1.gz ]; then
+			MANEXT=.gz
 		fi
+		for i in hqx2bin macbinary single2bin unbin unhex unsingle; do
+			ln -f man1/megatron.1${MANEXT} man1/$i.1${MANEXT}
+		done
+		for i in nbplkup nbprgstr nbpunrgstr; do
+			ln -f man1/nbp.1${MANEXT} man1/$i.1${MANEXT}
+		done
+		ln -f man1/pap.1${MANEXT} man1/papstatus.1${MANEXT}
 		;;
 esac
diff --git a/net/netatalk/pkg-plist b/net/netatalk/pkg-plist
index 9eacf9250cda..843370baa515 100644
--- a/net/netatalk/pkg-plist
+++ b/net/netatalk/pkg-plist
@@ -37,30 +37,30 @@ libexec/etc2ps
 libexec/papd
 libexec/psa
 libexec/psf
+libexec/filters/ifmpap
+libexec/filters/ifmpaprev
+libexec/filters/ifpap
+libexec/filters/ifpaprev
+libexec/filters/ifwmpap
+libexec/filters/ifwmpaprev
+libexec/filters/ifwpap
+libexec/filters/ifwpaprev
+libexec/filters/ofmpap
+libexec/filters/ofpap
+libexec/filters/ofwmpap
+libexec/filters/ofwpap
+libexec/filters/tfmpap
+libexec/filters/tfmpaprev
+libexec/filters/tfpap
+libexec/filters/tfpaprev
+libexec/filters/tfwmpap
+libexec/filters/tfwmpaprev
+libexec/filters/tfwpap
+libexec/filters/tfwpaprev
+@dirrm libexec/filters
 share/examples/netatalk/atalkd.conf
 share/examples/netatalk/papd.conf
 @dirrm share/examples/netatalk
-share/filters/ifmpap
-share/filters/ifmpaprev
-share/filters/ifpap
-share/filters/ifpaprev
-share/filters/ifwmpap
-share/filters/ifwmpaprev
-share/filters/ifwpap
-share/filters/ifwpaprev
-share/filters/ofmpap
-share/filters/ofpap
-share/filters/ofwmpap
-share/filters/ofwpap
-share/filters/tfmpap
-share/filters/tfmpaprev
-share/filters/tfpap
-share/filters/tfpaprev
-share/filters/tfwmpap
-share/filters/tfwmpaprev
-share/filters/tfwpap
-share/filters/tfwpaprev
-@dirrm share/filters
 share/pagecount.ps
 @comment	Remove man page aliases
 @unexec rm -f %D/man/man1/hqx2bin.1*