Update to 2.0 Release Candidate 1. For a list of all the changes, see

https://sourceforge.net/project/shownotes.php?release_id=263866.

4 files changed, 11 insertions, 59 deletions

diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index 4f5bd807bf5f..3f04772e9bb7 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	2.0.b2
-PORTREVISION=	2
+PORTVERSION=	2.0.r1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	netatalk
-DISTNAME=	${PORTNAME}-2.0-beta2
+DISTNAME=	${PORTNAME}-2.0-rc1
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	File and print server for AppleTalk networks
@@ -47,7 +46,7 @@ PLIST_SUB+=		TIMELORD=""
 .else
 PLIST_SUB+=		TIMELORD="@comment "
 .endif
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -60,7 +59,7 @@ MAN1=		achfile.1 aecho.1 afile.1 afppasswd.1 getzones.1 \
 		nbplkup.1 nbprgstr.1 nbpunrgstr.1 papstatus.1 \
 		single2bin.1 unbin.1 unhex.1 unsingle.1 acleandir.1 \
 		netatalk-config.1 timeout.1 apple_cp.1 apple_mv.1 \
-		apple_rm.1 uniconv.1
+		apple_rm.1 uniconv.1 asip-status.pl.1
 MAN3=		atalk_aton.3 nbp_name.3
 MAN4=		atalk.4
 MAN5=		AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \
diff --git a/net/netatalk-devel/distinfo b/net/netatalk-devel/distinfo
index 42be2f332ba9..b767a086743b 100644
--- a/net/netatalk-devel/distinfo
+++ b/net/netatalk-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (netatalk-2.0-beta2.tar.bz2) = 2ba71194848020987cfc9edf9ea2a31a
-SIZE (netatalk-2.0-beta2.tar.bz2) = 1354226
+MD5 (netatalk-2.0-rc1.tar.bz2) = b3c746b9804d057e45a8badf510a5ea2
+SIZE (netatalk-2.0-rc1.tar.bz2) = 1444766
diff --git a/net/netatalk-devel/files/patch-configure b/net/netatalk-devel/files/patch-configure
index 465fac780fb9..d14d0f1f9714 100644
--- a/net/netatalk-devel/files/patch-configure
+++ b/net/netatalk-devel/files/patch-configure
@@ -1,24 +1,11 @@
---- configure.orig	Thu Jun 24 18:53:29 2004
-+++ configure	Tue Jun 29 01:48:40 2004
-@@ -15048,7 +15048,7 @@
+--- configure.orig	Sat Aug 28 03:20:01 2004
++++ configure	Sat Aug 28 03:20:14 2004
+@@ -15118,7 +15118,7 @@
  	trybdbdir=""
  	dobdbsearch=yes
  	bdb_search_dirs="/usr/local/include /usr/include"
--	search_subdirs="/db4.2 /db4.1 /db4 /"
-+	search_subdirs="/db4.2 /db41 /db4 /"
+-	search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /"
++	search_subdirs="/db4.1 /db41 /db4 /"
  
  	DB_MAJOR_REQ=4
  	DB_MINOR_REQ=1
-@@ -15178,10 +15178,10 @@
- 
- 			if test ${atalk_cv_bdbheader} != "no"; then
- 
--			  bdblibdir="`echo $bdbdir | sed 's/\/include\/db4\.*.*//'`"
-+			  bdblibdir="`echo $bdbdir | sed 's/\/include\/db4.*//'`"
- 			  bdblibdir="`echo $bdblibdir | sed 's/\/include$//'`"
- 			  bdblibdir="${bdblibdir}/${atalk_libname}"
--			  bdbbindir="`echo $bdbdir | sed 's/include\/db4\.*.*/bin/'`"
-+			  bdbbindir="`echo $bdbdir | sed 's/include\/db4.*/bin/'`"
- 			  bdbbindir="`echo $bdbbindir | sed 's/include$/bin/'`"
- 
- 			  CPPFLAGS="$CFLAGS -I${bdbdir}${subdir}"
diff --git a/net/netatalk-devel/files/patch-ltmain.sh b/net/netatalk-devel/files/patch-ltmain.sh
deleted file mode 100644
index 1e42429a224c..000000000000
--- a/net/netatalk-devel/files/patch-ltmain.sh
+++ /dev/null
@@ -1,34 +0,0 @@
---- ltmain.sh.orig	Mon Mar 22 19:21:52 2004
-+++ ltmain.sh	Sat Jun  5 21:54:11 2004
-@@ -1061,7 +1061,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
- 	    ;;
-@@ -2372,6 +2372,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=""
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -4302,10 +4305,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"