8 files changed, 48 insertions, 18 deletions

diff --git a/net-p2p/fidelio/Makefile b/net-p2p/fidelio/Makefile
index ca327d415e56..03cbde09054e 100644
--- a/net-p2p/fidelio/Makefile
+++ b/net-p2p/fidelio/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	fidelio
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	matt@gsicomp.on.ca
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 
 XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
 
@@ -26,6 +27,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libxml2 \
 			  `${GLIB_CONFIG} --cflags gthread`" \
 		LDFLAGS="-L${LOCALBASE}/lib `${GLIB_CONFIG} --libs gthread`" \
 		XML_CONFIG="${XML_CONFIG}"
+CONFIGURE_ARGS=	--without-included-gettext
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/net-p2p/fidelio/distinfo b/net-p2p/fidelio/distinfo
index 4f6cdf07db04..46cdb2347107 100644
--- a/net-p2p/fidelio/distinfo
+++ b/net-p2p/fidelio/distinfo
@@ -1 +1 @@
-MD5 (fidelio-0.9.5.tar.gz) = 8699e299dcc73f2ed7688310b0cde011
+MD5 (fidelio-0.9.6.tar.gz) = 5991eb226b354abff4e424fbdfc1b786
diff --git a/net-p2p/fidelio/files/patch-aa b/net-p2p/fidelio/files/patch-aa
index 96bd414cf97b..74dee6e096ac 100644
--- a/net-p2p/fidelio/files/patch-aa
+++ b/net-p2p/fidelio/files/patch-aa
@@ -1,16 +1,16 @@
---- src/Makefile.in	2000/11/15 11:26:07	1.1
-+++ src/Makefile.in	2000/11/15 11:26:24
+--- src/Makefile.in.orig	Fri Dec 21 06:16:28 2001
++++ src/Makefile.in	Fri Dec 21 06:16:45 2001
 @@ -119,11 +119,11 @@
- fidelio_SOURCES =  	bookmarks.c bookmarks.h 	chat.c chat.h 	files.c files.h 	filelist.c filelist.h 	filetransfer.c filetransfer.h 	guiprefs.c guiprefs.h 	guiutils.c guiutils.h 	hldat.c hldat.h hotline.h 	login.c login.h 	main.c main.h 	network.c network.h 	news.c news.h 	news15.c news15.h 	pixmap.c pixmap.h 	privchat.c privchat.h 	privs.c privs.h 	protocol.c protocol.h         server.c server.h 	smalltrans.c smalltrans.h 	tasks.c tasks.h 	threads.c threads.h 	trackers.c 	users.c users.h         userlist.c userlist.h 	userwidget.c userwidget.h
+ fidelio_SOURCES =  	bookmarks.c bookmarks.h 	chat.c chat.h 	files.c files.h 	filelist.c filelist.h 	filetransfer.c filetransfer.h 	filethread.c filethread.h 	guiprefs.c guiprefs.h 	guiutils.c guiutils.h 	hldat.c hldat.h hotline.h 	login.c login.h 	main.c main.h 	network.c network.h 	news.c news.h 	news15.c news15.h 	pixmap.c pixmap.h 	privchat.c privchat.h 	privs.c privs.h 	protocol.c protocol.h         server.c server.h 	smalltrans.c smalltrans.h 	tasks.c tasks.h 	threads.c threads.h 	trackers.c 	users.c users.h         userlist.c userlist.h 	userwidget.c userwidget.h
  
  
 -fidelio_LDADD = -lgthread
-+fidelio_LDADD = 
++fidelio_LDADD =
  
  hlforw_SOURCES = hlforw.c threads.c protocol.c network.c tasks.c guiprefs.c hldat.c pixmap.c
  
 -hlforw_LDADD = -lgthread
-+hlforw_LDADD = 
++hlforw_LDADD =
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES = 
diff --git a/net-p2p/fidelio/pkg-plist b/net-p2p/fidelio/pkg-plist
index 5fe61892a5f1..44fbceb71a91 100644
--- a/net-p2p/fidelio/pkg-plist
+++ b/net-p2p/fidelio/pkg-plist
@@ -1,6 +1,19 @@
 bin/fidelio
 share/gnome/fidelio.default
+share/locale/de/LC_MESSAGES/fidelio.mo
 share/locale/el/LC_MESSAGES/fidelio.mo
 share/locale/fr/LC_MESSAGES/fidelio.mo
 share/locale/it/LC_MESSAGES/fidelio.mo
 share/locale/pt_BR/LC_MESSAGES/fidelio.mo
+@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/it 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/el 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/share/locale 2>/dev/null || true
+@unexec rmdir %D/share/gnome 2>/dev/null || true
diff --git a/net/fidelio/Makefile b/net/fidelio/Makefile
index ca327d415e56..03cbde09054e 100644
--- a/net/fidelio/Makefile
+++ b/net/fidelio/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	fidelio
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	matt@gsicomp.on.ca
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 
 XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
 
@@ -26,6 +27,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libxml2 \
 			  `${GLIB_CONFIG} --cflags gthread`" \
 		LDFLAGS="-L${LOCALBASE}/lib `${GLIB_CONFIG} --libs gthread`" \
 		XML_CONFIG="${XML_CONFIG}"
+CONFIGURE_ARGS=	--without-included-gettext
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/net/fidelio/distinfo b/net/fidelio/distinfo
index 4f6cdf07db04..46cdb2347107 100644
--- a/net/fidelio/distinfo
+++ b/net/fidelio/distinfo
@@ -1 +1 @@
-MD5 (fidelio-0.9.5.tar.gz) = 8699e299dcc73f2ed7688310b0cde011
+MD5 (fidelio-0.9.6.tar.gz) = 5991eb226b354abff4e424fbdfc1b786
diff --git a/net/fidelio/files/patch-aa b/net/fidelio/files/patch-aa
index 96bd414cf97b..74dee6e096ac 100644
--- a/net/fidelio/files/patch-aa
+++ b/net/fidelio/files/patch-aa
@@ -1,16 +1,16 @@
---- src/Makefile.in	2000/11/15 11:26:07	1.1
-+++ src/Makefile.in	2000/11/15 11:26:24
+--- src/Makefile.in.orig	Fri Dec 21 06:16:28 2001
++++ src/Makefile.in	Fri Dec 21 06:16:45 2001
 @@ -119,11 +119,11 @@
- fidelio_SOURCES =  	bookmarks.c bookmarks.h 	chat.c chat.h 	files.c files.h 	filelist.c filelist.h 	filetransfer.c filetransfer.h 	guiprefs.c guiprefs.h 	guiutils.c guiutils.h 	hldat.c hldat.h hotline.h 	login.c login.h 	main.c main.h 	network.c network.h 	news.c news.h 	news15.c news15.h 	pixmap.c pixmap.h 	privchat.c privchat.h 	privs.c privs.h 	protocol.c protocol.h         server.c server.h 	smalltrans.c smalltrans.h 	tasks.c tasks.h 	threads.c threads.h 	trackers.c 	users.c users.h         userlist.c userlist.h 	userwidget.c userwidget.h
+ fidelio_SOURCES =  	bookmarks.c bookmarks.h 	chat.c chat.h 	files.c files.h 	filelist.c filelist.h 	filetransfer.c filetransfer.h 	filethread.c filethread.h 	guiprefs.c guiprefs.h 	guiutils.c guiutils.h 	hldat.c hldat.h hotline.h 	login.c login.h 	main.c main.h 	network.c network.h 	news.c news.h 	news15.c news15.h 	pixmap.c pixmap.h 	privchat.c privchat.h 	privs.c privs.h 	protocol.c protocol.h         server.c server.h 	smalltrans.c smalltrans.h 	tasks.c tasks.h 	threads.c threads.h 	trackers.c 	users.c users.h         userlist.c userlist.h 	userwidget.c userwidget.h
  
  
 -fidelio_LDADD = -lgthread
-+fidelio_LDADD = 
++fidelio_LDADD =
  
  hlforw_SOURCES = hlforw.c threads.c protocol.c network.c tasks.c guiprefs.c hldat.c pixmap.c
  
 -hlforw_LDADD = -lgthread
-+hlforw_LDADD = 
++hlforw_LDADD =
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES = 
diff --git a/net/fidelio/pkg-plist b/net/fidelio/pkg-plist
index 5fe61892a5f1..44fbceb71a91 100644
--- a/net/fidelio/pkg-plist
+++ b/net/fidelio/pkg-plist
@@ -1,6 +1,19 @@
 bin/fidelio
 share/gnome/fidelio.default
+share/locale/de/LC_MESSAGES/fidelio.mo
 share/locale/el/LC_MESSAGES/fidelio.mo
 share/locale/fr/LC_MESSAGES/fidelio.mo
 share/locale/it/LC_MESSAGES/fidelio.mo
 share/locale/pt_BR/LC_MESSAGES/fidelio.mo
+@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/it 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/el 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/share/locale 2>/dev/null || true
+@unexec rmdir %D/share/gnome 2>/dev/null || true