Update to 1.6.4.

8 files changed, 62 insertions, 36 deletions

diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index 4df4867774e2..fa57b488e2e7 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	1.6.3
+PORTVERSION=	1.6.4
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -61,7 +61,7 @@ PLIST_SUB+=		TIMELORD="@comment "
 CONFIGURE_ARGS+=	--with-mangling
 .endif
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=       --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_PERL5=	yes
 FILES=		AppleVolumes.default AppleVolumes.system afpd.conf \
diff --git a/net/netatalk-devel/distinfo b/net/netatalk-devel/distinfo
index b6d3dbbb2adf..977f397c5d71 100644
--- a/net/netatalk-devel/distinfo
+++ b/net/netatalk-devel/distinfo
@@ -1 +1 @@
-MD5 (netatalk-1.6.3.tar.bz2) = fa3d0e08499525d9a627fe17a2d93d1b
+MD5 (netatalk-1.6.4.tar.bz2) = 8bed0582d51deef7a31da1b6ae5df2e6
diff --git a/net/netatalk-devel/files/patch-config_Makefile.in b/net/netatalk-devel/files/patch-config_Makefile.in
index 52b01fbd1280..54f7d74bb764 100644
--- a/net/netatalk-devel/files/patch-config_Makefile.in
+++ b/net/netatalk-devel/files/patch-config_Makefile.in
@@ -1,6 +1,6 @@
---- config/Makefile.in.orig	Mon Nov 25 22:12:52 2002
-+++ config/Makefile.in	Sun Dec 15 16:57:43 2002
-@@ -244,19 +244,11 @@
+--- config/Makefile.in.orig	Tue Dec  2 15:19:05 2003
++++ config/Makefile.in	Sun Dec  7 13:29:53 2003
+@@ -378,23 +378,11 @@
  install-config-files: $(CONFFILES) $(GENFILES)
  	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
  	for f in $(CONFFILES) $(GENFILES); do \
@@ -16,9 +16,13 @@
  
  @USE_PAM_TRUE@install-data-local: install-config-files $(PAMFILES)
 -@USE_PAM_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pamdir)
--@USE_PAM_TRUE@	for f in $(PAMFILES); do					\
--@USE_PAM_TRUE@		$(INSTALL_DATA) $$f $(DESTDIR)$(pamdir)/netatalk || echo "WARNING: Can't install PAM files";		\
--@USE_PAM_TRUE@	done
+-@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"; \
+-@USE_PAM_TRUE@		$(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk || \
+-@USE_PAM_TRUE@		echo "WARNING: Can't install PAM file";            \
+-@USE_PAM_TRUE@	else \
+-@USE_PAM_TRUE@		echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \
+-@USE_PAM_TRUE@	fi;
  
  @USE_PAM_FALSE@install-data-local: install-config-files
- 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/netatalk-devel/files/patch-ltmain.sh b/net/netatalk-devel/files/patch-ltmain.sh
index 2ac052749556..786e33b951ac 100644
--- a/net/netatalk-devel/files/patch-ltmain.sh
+++ b/net/netatalk-devel/files/patch-ltmain.sh
@@ -1,16 +1,25 @@
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
+--- ltmain.sh.orig	Sat Nov 29 08:54:27 2003
++++ ltmain.sh	Sun Dec  7 13:32:36 2003
+@@ -1286,7 +1286,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1913,6 +1913,9 @@
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    fi
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+ 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+ 	    ;;
+@@ -5474,10 +5477,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 4df4867774e2..fa57b488e2e7 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	1.6.3
+PORTVERSION=	1.6.4
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -61,7 +61,7 @@ PLIST_SUB+=		TIMELORD="@comment "
 CONFIGURE_ARGS+=	--with-mangling
 .endif
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=       --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_PERL5=	yes
 FILES=		AppleVolumes.default AppleVolumes.system afpd.conf \
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index b6d3dbbb2adf..977f397c5d71 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1 +1 @@
-MD5 (netatalk-1.6.3.tar.bz2) = fa3d0e08499525d9a627fe17a2d93d1b
+MD5 (netatalk-1.6.4.tar.bz2) = 8bed0582d51deef7a31da1b6ae5df2e6
diff --git a/net/netatalk/files/patch-config_Makefile.in b/net/netatalk/files/patch-config_Makefile.in
index 52b01fbd1280..54f7d74bb764 100644
--- a/net/netatalk/files/patch-config_Makefile.in
+++ b/net/netatalk/files/patch-config_Makefile.in
@@ -1,6 +1,6 @@
---- config/Makefile.in.orig	Mon Nov 25 22:12:52 2002
-+++ config/Makefile.in	Sun Dec 15 16:57:43 2002
-@@ -244,19 +244,11 @@
+--- config/Makefile.in.orig	Tue Dec  2 15:19:05 2003
++++ config/Makefile.in	Sun Dec  7 13:29:53 2003
+@@ -378,23 +378,11 @@
  install-config-files: $(CONFFILES) $(GENFILES)
  	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
  	for f in $(CONFFILES) $(GENFILES); do \
@@ -16,9 +16,13 @@
  
  @USE_PAM_TRUE@install-data-local: install-config-files $(PAMFILES)
 -@USE_PAM_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pamdir)
--@USE_PAM_TRUE@	for f in $(PAMFILES); do					\
--@USE_PAM_TRUE@		$(INSTALL_DATA) $$f $(DESTDIR)$(pamdir)/netatalk || echo "WARNING: Can't install PAM files";		\
--@USE_PAM_TRUE@	done
+-@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"; \
+-@USE_PAM_TRUE@		$(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk || \
+-@USE_PAM_TRUE@		echo "WARNING: Can't install PAM file";            \
+-@USE_PAM_TRUE@	else \
+-@USE_PAM_TRUE@		echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \
+-@USE_PAM_TRUE@	fi;
  
  @USE_PAM_FALSE@install-data-local: install-config-files
- 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/netatalk/files/patch-ltmain.sh b/net/netatalk/files/patch-ltmain.sh
index 2ac052749556..786e33b951ac 100644
--- a/net/netatalk/files/patch-ltmain.sh
+++ b/net/netatalk/files/patch-ltmain.sh
@@ -1,16 +1,25 @@
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
+--- ltmain.sh.orig	Sat Nov 29 08:54:27 2003
++++ ltmain.sh	Sun Dec  7 13:32:36 2003
+@@ -1286,7 +1286,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1913,6 +1913,9 @@
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    fi
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+ 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+ 	    ;;
+@@ -5474,10 +5477,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.