update net/fidelio: 0.9.6 --> 1.0.b1

PR:		53770
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

10 files changed, 40 insertions, 100 deletions

diff --git a/net-p2p/fidelio/Makefile b/net-p2p/fidelio/Makefile
index 9c4e818ef55c..149e4e021ffb 100644
--- a/net-p2p/fidelio/Makefile
+++ b/net-p2p/fidelio/Makefile
@@ -6,42 +6,24 @@
 #
 
 PORTNAME=	fidelio
-PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTVERSION=	1.0.b1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GNOME client for Hotline
 
-LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
-		xml2.5:${PORTSDIR}/textproc/libxml2
-
-XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
-
-USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
-USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libxml2 \
-			  -I${LOCALBASE}/include \
-			  `${GLIB_CONFIG} --cflags gthread`" \
-		LDFLAGS="-L${LOCALBASE}/lib `${GLIB_CONFIG} --libs gthread`" \
-		XML_CONFIG="${XML_CONFIG}"
-CONFIGURE_ARGS=	--without-included-gettext
-CFLAGS+=	-DHAVE_STRCASESTR
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \
-		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
-	@${REINPLACE_CMD} -e 's|-lxml|-lxml2|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|extern int strcasestr|//extern int strcasestr|' \
-		${WRKSRC}/src/trackers.c
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|<xmlversion.h>|<libxml/xmlversion.h>|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net-p2p/fidelio/distinfo b/net-p2p/fidelio/distinfo
index 46cdb2347107..eda5339630e1 100644
--- a/net-p2p/fidelio/distinfo
+++ b/net-p2p/fidelio/distinfo
@@ -1 +1 @@
-MD5 (fidelio-0.9.6.tar.gz) = 5991eb226b354abff4e424fbdfc1b786
+MD5 (fidelio-1.0b1.tar.gz) = f6963b36400e172279494b022fb065ce
diff --git a/net-p2p/fidelio/files/patch-ab b/net-p2p/fidelio/files/patch-ab
deleted file mode 100644
index 5240086937b2..000000000000
--- a/net-p2p/fidelio/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bookmarks.c.orig       Sun Mar 31 22:03:02 2002
-+++ src/bookmarks.c    Sun Mar 31 22:03:07 2002
-@@ -52,7 +52,7 @@
- #if FXML2
- #define xmlChildNode children
- #else
--#definf xmlChildNode childs
-+#define xmlChildNode childs
- #endif
- #endif
- 
diff --git a/net-p2p/fidelio/files/patch-src::trackers.c b/net-p2p/fidelio/files/patch-src::trackers.c
new file mode 100644
index 000000000000..37a2b774d4a6
--- /dev/null
+++ b/net-p2p/fidelio/files/patch-src::trackers.c
@@ -0,0 +1,11 @@
+--- src/trackers.c.orig	Wed Feb 21 00:25:03 2001
++++ src/trackers.c	Tue Jun 24 22:07:41 2003
+@@ -134,8 +134,6 @@
+   }
+   return 0;
+ }
+-#else
+-extern int strcasestr(const char *a, const char*b);
+ #endif
+ 
+ static void show_servers(){
diff --git a/net-p2p/fidelio/pkg-plist b/net-p2p/fidelio/pkg-plist
index 44fbceb71a91..823d88297311 100644
--- a/net-p2p/fidelio/pkg-plist
+++ b/net-p2p/fidelio/pkg-plist
@@ -5,15 +5,3 @@ 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 9c4e818ef55c..149e4e021ffb 100644
--- a/net/fidelio/Makefile
+++ b/net/fidelio/Makefile
@@ -6,42 +6,24 @@
 #
 
 PORTNAME=	fidelio
-PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTVERSION=	1.0.b1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GNOME client for Hotline
 
-LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
-		xml2.5:${PORTSDIR}/textproc/libxml2
-
-XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
-
-USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
-USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libxml2 \
-			  -I${LOCALBASE}/include \
-			  `${GLIB_CONFIG} --cflags gthread`" \
-		LDFLAGS="-L${LOCALBASE}/lib `${GLIB_CONFIG} --libs gthread`" \
-		XML_CONFIG="${XML_CONFIG}"
-CONFIGURE_ARGS=	--without-included-gettext
-CFLAGS+=	-DHAVE_STRCASESTR
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \
-		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
-	@${REINPLACE_CMD} -e 's|-lxml|-lxml2|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|extern int strcasestr|//extern int strcasestr|' \
-		${WRKSRC}/src/trackers.c
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|<xmlversion.h>|<libxml/xmlversion.h>|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net/fidelio/distinfo b/net/fidelio/distinfo
index 46cdb2347107..eda5339630e1 100644
--- a/net/fidelio/distinfo
+++ b/net/fidelio/distinfo
@@ -1 +1 @@
-MD5 (fidelio-0.9.6.tar.gz) = 5991eb226b354abff4e424fbdfc1b786
+MD5 (fidelio-1.0b1.tar.gz) = f6963b36400e172279494b022fb065ce
diff --git a/net/fidelio/files/patch-ab b/net/fidelio/files/patch-ab
deleted file mode 100644
index 5240086937b2..000000000000
--- a/net/fidelio/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bookmarks.c.orig       Sun Mar 31 22:03:02 2002
-+++ src/bookmarks.c    Sun Mar 31 22:03:07 2002
-@@ -52,7 +52,7 @@
- #if FXML2
- #define xmlChildNode children
- #else
--#definf xmlChildNode childs
-+#define xmlChildNode childs
- #endif
- #endif
- 
diff --git a/net/fidelio/files/patch-src::trackers.c b/net/fidelio/files/patch-src::trackers.c
new file mode 100644
index 000000000000..37a2b774d4a6
--- /dev/null
+++ b/net/fidelio/files/patch-src::trackers.c
@@ -0,0 +1,11 @@
+--- src/trackers.c.orig	Wed Feb 21 00:25:03 2001
++++ src/trackers.c	Tue Jun 24 22:07:41 2003
+@@ -134,8 +134,6 @@
+   }
+   return 0;
+ }
+-#else
+-extern int strcasestr(const char *a, const char*b);
+ #endif
+ 
+ static void show_servers(){
diff --git a/net/fidelio/pkg-plist b/net/fidelio/pkg-plist
index 44fbceb71a91..823d88297311 100644
--- a/net/fidelio/pkg-plist
+++ b/net/fidelio/pkg-plist
@@ -5,15 +5,3 @@ 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