- Update to 1.5.2

- make LOCALBASE safe

PR:		35348
Submitted by:	maintainer

4 files changed, 14 insertions, 14 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 30d4c6bdf0c3..088ca4557355 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	1.5.1.1
+PORTVERSION=	1.5.2
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -36,7 +36,7 @@ PLIST_SUB+=             NETATALKPAM="@comment "
 .if defined(WITH_SRVLOC)
 # Enable Service Location Protocol support.  This allows MacOS X < 10.1 to
 # pickup afpd servers in the network.
-CONFIGURE_ARGS+=		--enable-srvloc
+CONFIGURE_ARGS+=		--enable-srvloc=${LOCALBASE}
 .endif
 .if defined(WITH_FLOCK_LOCKS)
 # Disable byte locking, and do full file locking.  This _may_ help with some
@@ -49,11 +49,11 @@ CONFIGURE_ARGS+=		--with-flock-locks
 # This should hopefully allow aliases to work between restarts of afpd.
 # This has been tested on MacOS 9.2.x and OS X.
 CONFIGURE_ARGS+=		--with-did=cnid \
-						--with-db3=/usr/local
+				--with-db3=${LOCALBASE}
 PLIST_SUB+=				NETATALKCNID=""
 .else
 # This method of DID calculation is not persistent, but has been tested to
-# work with MacOS X (10.0.3-10.1.1) as well as MacOS 7-9.2.2.
+# work with MacOS X (10.0.3-10.1.3) as well as MacOS 7-9.2.2.
 CONFIGURE_ARGS+=		--with-did=last
 PLIST_SUB+=             NETATALKCNID="@comment "
 .endif
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index ea2a1999cf65..a5cfc04d157a 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1 +1 @@
-MD5 (netatalk-1.5.1.1.tar.gz) = 8922f0ba49bcc1274f760b3a406e2fcc
+MD5 (netatalk-1.5.2.tar.gz) = 9355653d6b2c18f10d1be02624db65f6
diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure
index f50ca2940735..994d7e0f72ca 100644
--- a/net/netatalk/files/patch-configure
+++ b/net/netatalk/files/patch-configure
@@ -1,13 +1,13 @@
---- configure.orig	Sat Jan 26 16:25:38 2002
-+++ configure	Sat Jan 26 16:25:51 2002
-@@ -8250,14 +8250,14 @@
+--- configure.orig	Fri Feb 15 17:14:36 2002
++++ configure	Tue Feb 26 13:12:06 2002
+@@ -8421,14 +8421,14 @@
  			savedldflags="$LDFLAGS"
  			CFLAGS="$CFLAGS -I$db3dir"
  			LDFLAGS="-L$db3libdir $LDFLAGS"
 -			echo $ac_n "checking for main in -ldb""... $ac_c" 1>&6
--echo "configure:8255: checking for main in -ldb" >&5
+-echo "configure:8426: checking for main in -ldb" >&5
 +			echo $ac_n "checking for main in -ldb3""... $ac_c" 1>&6
-+echo "configure:8255: checking for main in -ldb3" >&5
++echo "configure:8426: checking for main in -ldb3" >&5
  ac_lib_var=`echo db'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -16,14 +16,14 @@
 -LIBS="-ldb  $LIBS"
 +LIBS="-ldb3  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 8263 "configure"
+ #line 8434 "configure"
  #include "confdefs.h"
-@@ -8284,7 +8284,7 @@
+@@ -8455,7 +8455,7 @@
    
  				db3found=yes
  				DB3_CFLAGS="-I$db3dir"
 -				DB3_LIBS="-L$db3libdir -ldb"
 +				DB3_LIBS="-L$db3libdir -ldb3"
+ 				DB3_PATH="`echo $db3dir | sed 's,include/db3$,,'`"
  			
  else
-   echo "$ac_t""no" 1>&6
diff --git a/net/netatalk/pkg-plist b/net/netatalk/pkg-plist
index 6bd78d5fa80f..d60fdaab509c 100644
--- a/net/netatalk/pkg-plist
+++ b/net/netatalk/pkg-plist
@@ -28,7 +28,7 @@ bin/megatron
 @exec cd %B && ln -s megatron macbinary
 @exec cd %B && ln -s megatron binheader
 @exec cd %B && ln -s megatron nadheader
-%%NETATALKCNID%%bin/cnid_didname_verify
+%%NETATALKCNID%%bin/cnid_maint
 bin/nbplkup
 bin/nbprgstr
 bin/nbpunrgstr