From afcc06cf9d3584703e5b10040bb800c06a54405d Mon Sep 17 00:00:00 2001
From: marcus <marcus@FreeBSD.org>
Date: Wed, 7 Jul 2010 05:36:06 +0000
Subject: Update to 2.1.2.

Feature safe:	yes
---
 net/netatalk/Makefile                           |  3 +--
 net/netatalk/distinfo                           |  6 +++---
 net/netatalk/files/patch-configure              | 10 +++++-----
 net/netatalk/files/patch-etc-uams_Makefile.in   | 11 -----------
 net/netatalk/files/patch-etc_afpd_afp_options.c | 13 -------------
 5 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 net/netatalk/files/patch-etc-uams_Makefile.in
 delete mode 100644 net/netatalk/files/patch-etc_afpd_afp_options.c

(limited to 'net')

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index f3e2d506a0d3..bfaf529f72ca 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.1.2
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	SF
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 14af516c2bcc..c7712f92acb5 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,3 +1,3 @@
-MD5 (netatalk-2.1.1.tar.bz2) = d91913958970b4bcd72577aa52aa31be
-SHA256 (netatalk-2.1.1.tar.bz2) = 2445ee2a009768fa889235ff8ad1c55cc9575fe1be0d5fdc48d0e4d56646255f
-SIZE (netatalk-2.1.1.tar.bz2) = 1121436
+MD5 (netatalk-2.1.2.tar.bz2) = 94d4ea19fc48c37e28f02062e25046ea
+SHA256 (netatalk-2.1.2.tar.bz2) = c342995a612dd34e9a0a00975131794159c71e53c88abf25dfcc233c06cdb9d9
+SIZE (netatalk-2.1.2.tar.bz2) = 1122683
diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure
index ff1e6b364410..c74638649ad6 100644
--- a/net/netatalk/files/patch-configure
+++ b/net/netatalk/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	2010-04-22 07:59:58.000000000 +0000
-+++ configure	2010-05-20 19:17:21.000000000 +0000
-@@ -30958,7 +30958,7 @@
+--- configure.orig	2010-06-08 11:19:27.000000000 -0400
++++ configure	2010-07-06 21:13:02.000000000 -0400
+@@ -30958,7 +30958,7 @@ if test "x$bdb_required" = "xyes"; then
      trybdbdir=""
      dobdbsearch=yes
      bdb_search_dirs="/usr/local /usr"
--    search_subdirs="/ /db4.7 /db47 /db4.6 /db46 /db4.5 /db45 /db4.4 /db44 /db4"
-+    search_subdirs="/%%DB_NAME%% / /db4.7 /db47 /db4.6 /db46 /db4.5 /db45 /db4.4 /db44 /db4"
+-    search_subdirs="/ /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
++    search_subdirs="/%%DB_NAME%% / /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
  
      bdbfound=no
      savedcflags="$CFLAGS"
diff --git a/net/netatalk/files/patch-etc-uams_Makefile.in b/net/netatalk/files/patch-etc-uams_Makefile.in
deleted file mode 100644
index abcc0a2b5d69..000000000000
--- a/net/netatalk/files/patch-etc-uams_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/uams/Makefile.in.orig	2010-05-22 10:15:34.000000000 +0000
-+++ etc/uams/Makefile.in	2010-05-22 10:15:51.000000000 +0000
-@@ -402,7 +402,7 @@
- AM_CFLAGS = @SSL_CFLAGS@ @LIBGCRYPT_CFLAGS@
- uams_pam_la_CFLAGS = @PAM_CFLAGS@
- uams_dhx_pam_la_CFLAGS = @PAM_CFLAGS@
--uams_dhx2_pam_la_CFLAGS = @PAM_CFLAGS@
-+uams_dhx2_pam_la_CFLAGS = @PAM_CFLAGS@ @LIBGCRYPT_CFLAGS@
- uams_gss_la_CFLAGS = @GSSAPI_CFLAGS@
- uams_guest_la_LDFLAGS = -module -avoid-version
- uams_randnum_la_LDFLAGS = -module -avoid-version @SSL_LIBS@
diff --git a/net/netatalk/files/patch-etc_afpd_afp_options.c b/net/netatalk/files/patch-etc_afpd_afp_options.c
deleted file mode 100644
index 041f4a25a2f1..000000000000
--- a/net/netatalk/files/patch-etc_afpd_afp_options.c
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/etc/afpd/afp_options.c etc/afpd/afp_options.c
-index ebc9a65..057a1a3 100644
---- a/etc/afpd/afp_options.c
-+++ etc/afpd/afp_options.c
-@@ -137,8 +137,6 @@ void afp_options_free(struct afp_options *opt,
-         free(opt->passwdfile);
-     if (opt->signatureopt && (opt->signatureopt != save->signatureopt))
- 	free(opt->signatureopt);
--    if (opt->signature && (opt->signature != save->signature))
--        free(opt->signature);
-     if (opt->k5service && (opt->k5service != save->k5service))
- 	free(opt->k5service);
-     if (opt->k5realm && (opt->k5realm != save->k5realm))
-- 
cgit