* Update to 1.5.5

* Add optional timelord support [1]

PR:		[1] 43608
Submitted by:	[1] Edwin Groothuis <edwin@mavetju.org>

6 files changed, 60 insertions, 40 deletions

diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index 860518f7170f..5a63eaa1822c 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	1.5.3.1
-PORTREVISION=	1
+PORTVERSION=	1.5.5
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -60,6 +59,7 @@ CONFIGURE_ARGS+=	--with-did=last
 PLIST_SUB+=	NETATALKCNID="@comment "
 .endif
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-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 d8df8e30b911..cba291c049a3 100644
--- a/net/netatalk-devel/distinfo
+++ b/net/netatalk-devel/distinfo
@@ -1 +1 @@
-MD5 (netatalk-1.5.3.1.tar.bz2) = 7d9fe0fce60bccb1264fdbb42fa1465b
+MD5 (netatalk-1.5.5.tar.bz2) = 93ec251d47f355c99daad19de0b40eb2
diff --git a/net/netatalk-devel/files/patch-configure b/net/netatalk-devel/files/patch-configure
index 0cf4f4db0187..fe0c2b710aa6 100644
--- a/net/netatalk-devel/files/patch-configure
+++ b/net/netatalk-devel/files/patch-configure
@@ -1,29 +1,39 @@
---- configure.orig	Wed Mar 27 17:20:55 2002
-+++ configure	Sun Mar 31 18:07:57 2002
-@@ -8483,14 +8483,14 @@
+--- configure.orig	Sun Sep  1 12:50:59 2002
++++ configure	Wed Oct  2 22:19:05 2002
+@@ -1499,10 +1499,6 @@
+ 
+ # The aliases save the names the user supplied, while $host etc.
+ # will get canonicalized.
+-test -n "$target_alias" &&
+-  test "$program_prefix$program_suffix$program_transform_name" = \
+-    NONENONEs,x,x, &&
+-  program_prefix=${target_alias}-
+ am__api_version="1.6"
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+@@ -12706,13 +12702,13 @@
  			savedldflags="$LDFLAGS"
  			CFLAGS="$CFLAGS -I$db3dir"
  			LDFLAGS="-L$db3libdir $LDFLAGS"
--			echo $ac_n "checking for main in -ldb""... $ac_c" 1>&6
--echo "configure:8488: checking for main in -ldb" >&5
-+			echo $ac_n "checking for main in -ldb3""... $ac_c" 1>&6
-+echo "configure:8488: 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
+-			echo "$as_me:$LINENO: checking for main in -ldb" >&5
+-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
++			echo "$as_me:$LINENO: checking for main in -ldb3" >&5
++echo $ECHO_N "checking for main in -ldb3... $ECHO_C" >&6
+ if test "${ac_cv_lib_db_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldb  $LIBS"
 +LIBS="-ldb3  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 8496 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
  #include "confdefs.h"
-@@ -8517,7 +8517,7 @@
-   
+@@ -12759,7 +12755,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
+ 
+ fi
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 860518f7170f..5a63eaa1822c 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	1.5.3.1
-PORTREVISION=	1
+PORTVERSION=	1.5.5
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -60,6 +59,7 @@ CONFIGURE_ARGS+=	--with-did=last
 PLIST_SUB+=	NETATALKCNID="@comment "
 .endif
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-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 d8df8e30b911..cba291c049a3 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1 +1 @@
-MD5 (netatalk-1.5.3.1.tar.bz2) = 7d9fe0fce60bccb1264fdbb42fa1465b
+MD5 (netatalk-1.5.5.tar.bz2) = 93ec251d47f355c99daad19de0b40eb2
diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure
index 0cf4f4db0187..fe0c2b710aa6 100644
--- a/net/netatalk/files/patch-configure
+++ b/net/netatalk/files/patch-configure
@@ -1,29 +1,39 @@
---- configure.orig	Wed Mar 27 17:20:55 2002
-+++ configure	Sun Mar 31 18:07:57 2002
-@@ -8483,14 +8483,14 @@
+--- configure.orig	Sun Sep  1 12:50:59 2002
++++ configure	Wed Oct  2 22:19:05 2002
+@@ -1499,10 +1499,6 @@
+ 
+ # The aliases save the names the user supplied, while $host etc.
+ # will get canonicalized.
+-test -n "$target_alias" &&
+-  test "$program_prefix$program_suffix$program_transform_name" = \
+-    NONENONEs,x,x, &&
+-  program_prefix=${target_alias}-
+ am__api_version="1.6"
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+@@ -12706,13 +12702,13 @@
  			savedldflags="$LDFLAGS"
  			CFLAGS="$CFLAGS -I$db3dir"
  			LDFLAGS="-L$db3libdir $LDFLAGS"
--			echo $ac_n "checking for main in -ldb""... $ac_c" 1>&6
--echo "configure:8488: checking for main in -ldb" >&5
-+			echo $ac_n "checking for main in -ldb3""... $ac_c" 1>&6
-+echo "configure:8488: 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
+-			echo "$as_me:$LINENO: checking for main in -ldb" >&5
+-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
++			echo "$as_me:$LINENO: checking for main in -ldb3" >&5
++echo $ECHO_N "checking for main in -ldb3... $ECHO_C" >&6
+ if test "${ac_cv_lib_db_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldb  $LIBS"
 +LIBS="-ldb3  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 8496 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
  #include "confdefs.h"
-@@ -8517,7 +8517,7 @@
-   
+@@ -12759,7 +12755,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
+ 
+ fi