- Update to 2.2.0

- Add WITHOUT_NLS knob

4 files changed, 37 insertions, 19 deletions

diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index b47c2ae30c68..887dd45573b9 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnubiff
-PORTVERSION=	2.1.9
+PORTVERSION=	2.2.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -35,6 +35,15 @@ INFO=		gnubiff
 CONFIGURE_ARGS+=	--with-password
 .endif
 
+.ifndef(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--enable-nls
+PLIST_SUB+=		NLS=""
+USE_GETTEXT=		yes
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.endif
+
 # This application can dock in the GNOME panel, or it can not.
 # Only install support if gnomepanel is already installed.
 WANT_GNOME=	yes
diff --git a/mail/gnubiff/distinfo b/mail/gnubiff/distinfo
index 39b2bedb3d64..dab9dc6d6590 100644
--- a/mail/gnubiff/distinfo
+++ b/mail/gnubiff/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnubiff-2.1.9.tar.gz) = d6548bda35c656eb5eecc45e409fc72c
-SHA256 (gnubiff-2.1.9.tar.gz) = 55457065fd7719e497002461ba37c29834c02719ee67d1f33323b19cd66d168b
-SIZE (gnubiff-2.1.9.tar.gz) = 777299
+MD5 (gnubiff-2.2.0.tar.gz) = a99a0294e8b53420be3c28389306c824
+SHA256 (gnubiff-2.2.0.tar.gz) = 2789ce73d65e529aec6589bb1c85114f79c6212bf7a3f5b4e1e919b05f4d0a68
+SIZE (gnubiff-2.2.0.tar.gz) = 795635
diff --git a/mail/gnubiff/files/patch-configure b/mail/gnubiff/files/patch-configure
new file mode 100644
index 000000000000..72b8d2f85c08
--- /dev/null
+++ b/mail/gnubiff/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	Sun Apr 16 18:58:03 2006
++++ ./configure	Sun Apr 16 18:58:06 2006
+@@ -4207,7 +4207,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lssl  $LIBS"
++LIBS="-lssl -lcrypto  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
index d1ed2f328689..3472a484a00e 100644
--- a/mail/gnubiff/pkg-plist
+++ b/mail/gnubiff/pkg-plist
@@ -1,25 +1,23 @@
 bin/gnubiff
-share/locale/cs/LC_MESSAGES/gnubiff.mo
-share/locale/de/LC_MESSAGES/gnubiff.mo
-share/locale/es/LC_MESSAGES/gnubiff.mo
-share/locale/fr/LC_MESSAGES/gnubiff.mo
-share/locale/fr_CA/LC_MESSAGES/gnubiff.mo
-share/locale/fr_FR/LC_MESSAGES/gnubiff.mo
-share/locale/hu/LC_MESSAGES/gnubiff.mo
-share/locale/it/LC_MESSAGES/gnubiff.mo
-share/locale/nl/LC_MESSAGES/gnubiff.mo
-share/locale/ro/LC_MESSAGES/gnubiff.mo
-share/locale/rw/LC_MESSAGES/gnubiff.mo
-share/locale/sv/LC_MESSAGES/gnubiff.mo
-share/locale/vi/LC_MESSAGES/gnubiff.mo
-%%SHAREDIR%%/gnubiff/applet-gnome.glade
+%%NLS%%share/locale/cs/LC_MESSAGES/gnubiff.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gnubiff.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gnubiff.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gnubiff.mo
+%%NLS%%share/locale/fr_CA/LC_MESSAGES/gnubiff.mo
+%%NLS%%share/locale/fr_FR/LC_MESSAGES/gnubiff.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/gnubiff.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gnubiff.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gnubiff.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/gnubiff.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/gnubiff.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gnubiff.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/gnubiff.mo
 %%SHAREDIR%%/gnubiff/applet-gtk.glade
 %%SHAREDIR%%/gnubiff/authentication.glade
 %%SHAREDIR%%/gnubiff/certificate.glade
 %%SHAREDIR%%/gnubiff/coin.wav
 %%SHAREDIR%%/gnubiff/envelopes.png
 %%SHAREDIR%%/gnubiff/gnubiff.png
-%%SHAREDIR%%/gnubiff/logo.png
 %%SHAREDIR%%/gnubiff/mail.wav
 %%SHAREDIR%%/gnubiff/popup.glade
 %%SHAREDIR%%/gnubiff/preferences.glade