7 files changed, 64 insertions, 154 deletions

diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index 27d281518fc4..cec5e7435ebf 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:   gnet-glib2
+# New ports collection makefile for:   gnet2
 # Date created:        15 February 2003
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnet
-PORTVERSION=	1.1.9
+PORTVERSION=	2.0.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.gnetlibrary.org/src/
-PKGNAMESUFFIX=	-glib2
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A simple network library built upon Glib-2
@@ -18,41 +18,5 @@ USE_REINPLACE=	yes
 USE_GNOME=	gnomehack glib20
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-glib2
-
-MAN1=	gnet-glib2-config.1
-
-post-patch:
-# remove "release" information from lib name
-	@${REINPLACE_CMD} -E -e 's|-release[ ]+\$$\(LT_RELEASE\)||g' \
-		${WRKSRC}/src/Makefile.in
-# don't install gnet-config script with odd name. We will install it ourselves
-	@${REINPLACE_CMD} -E -e 's|^(install-exec-am:).+$$|\1|' \
-		${WRKSRC}/Makefile.in
-# don't install any of the config files.  We will do it ourselves.
-	@${REINPLACE_CMD} -E -e 's|^(install-data-am:).+$$|\1|' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -E -e 's|^[[:space:]]+install-pkgconfigDATA$$||' \
-		${WRKSRC}/Makefile.in
-# don't install the manpage.  We will do it ourselves.
-	@${REINPLACE_CMD} -E -e 's|^(install-data-am:).+$$|\1 install-data-local|' \
-		${WRKSRC}/doc/Makefile.in
-# install configincludedir correctly
-	@${REINPLACE_CMD} -E -e 's|^(configincludedir).+$$|\1=\$$\(pkgincludedir\)-glib2|' \
-		${WRKSRC}/Makefile.in
-
-post-install:
-	@${MKDIR} ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/gnet-config ${PREFIX}/bin/gnet-glib2-config
-	@${MKDIR} ${PREFIX}/share/aclocal
-	@${INSTALL_DATA} ${WRKSRC}/gnet.m4 ${PREFIX}/share/aclocal/gnet-glib2.m4
-	@${INSTALL_DATA} ${WRKSRC}/gnetconfig.h \
-		${PREFIX}/include/gnet-glib2
-	@${MKDIR} ${PREFIX}/libdata/pkgconfig
-	@${INSTALL_DATA} ${WRKSRC}/gnet.pc \
-		${PREFIX}/libdata/pkgconfig/gnet-glib2.pc
-	@${MKDIR} ${PREFIX}/man/man1
-	@${INSTALL_DATA} ${WRKSRC}/doc/gnet-config.1 \
-		${PREFIX}/man/man1/gnet-glib2-config.1
 
 .include <bsd.port.mk>
diff --git a/net/gnet2/distinfo b/net/gnet2/distinfo
index 500a1f74f31a..988348a978e9 100644
--- a/net/gnet2/distinfo
+++ b/net/gnet2/distinfo
@@ -1 +1 @@
-MD5 (gnet-1.1.9.tar.gz) = 381b5c6d4031806fc4c3e6b28dc752ec
+MD5 (gnet-2.0.3.tar.gz) = 547e36985eabcd931d8ee63449bd04ad
diff --git a/net/gnet2/files/patch-configure b/net/gnet2/files/patch-configure
index d3f96b2a7338..8520e176cae3 100644
--- a/net/gnet2/files/patch-configure
+++ b/net/gnet2/files/patch-configure
@@ -1,15 +1,6 @@
---- configure.orig	Mon Apr 28 23:00:52 2003
-+++ configure	Fri Jul  4 17:13:31 2003
-@@ -1880,7 +1880,7 @@
- 
- fi;
- if test "x$with_html_dir" = "x" ; then
--  HTML_DIR=$datadir/doc/libgnet$GNET_MAJOR_VERSION.$GNET_MINOR_VERSION-dev/html
-+  HTML_DIR=$prefix/share/doc/libgnet$GNET_MAJOR_VERSION.$GNET_MINOR_VERSION-glib2-dev/html
- else
-   HTML_DIR=$with_html_dir
- fi
-@@ -7905,6 +7905,7 @@
+--- configure	2002/07/20 11:29:10	1.1
++++ configure	2002/07/20 11:29:19
+@@ -6725,6 +6725,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/net/gnet2/files/patch-gnet-config.in b/net/gnet2/files/patch-gnet-config.in
deleted file mode 100644
index 4b3b6b698ce7..000000000000
--- a/net/gnet2/files/patch-gnet-config.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- gnet-config.in.orig	Sun Feb 16 15:14:23 2003
-+++ gnet-config.in	Sun Feb 16 15:15:25 2003
-@@ -9,13 +9,13 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- exec_prefix_set=no
--cflags="-I@includedir@/gnet -I@libdir@/gnet/include"
--libs="-L@libdir@ -lgnet"
-+cflags="-I@includedir@/gnet-glib2 -I@libdir@/gnet-glib2/include"
-+libs="-L@libdir@ -lgnet-glib2"
- 
- usage()
- {
- 	cat <<EOF
--Usage: gnet-config [OPTIONS] [LIBRARIES]
-+Usage: gnet-glib2-config [OPTIONS] [LIBRARIES]
- Options:
- 	[--prefix[=DIR]]
- 	[--exec-prefix[=DIR]]
diff --git a/net/gnet2/files/patch-gnet.pc.in b/net/gnet2/files/patch-gnet.pc.in
deleted file mode 100644
index 8c14119fa770..000000000000
--- a/net/gnet2/files/patch-gnet.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnet.pc.in.orig	Sun Feb 16 15:17:15 2003
-+++ gnet.pc.in	Sun Feb 16 15:17:39 2003
-@@ -6,5 +6,5 @@
- Name: Gnet
- Description: A network compatibility layer library
- Version: @VERSION@
--Libs: -L${libdir} -lgnet @GLIB_LIBS@ @GTHREAD_LIBS@
--Cflags: -I${includedir}/gnet -I${libdir}/gnet/include/ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@
-+Libs: -L${libdir} -lgnet-glib2 @GLIB_LIBS@ @GTHREAD_LIBS@
-+Cflags: -I${includedir}/gnet-glib2 -I${libdir}/gnet-glib2/include/ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@
diff --git a/net/gnet2/files/patch-src_Makefile.in b/net/gnet2/files/patch-src_Makefile.in
deleted file mode 100644
index d19e720f7552..000000000000
--- a/net/gnet2/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/Makefile.in.orig	Sun Feb 16 15:07:57 2003
-+++ src/Makefile.in	Sun Feb 16 15:09:08 2003
-@@ -97,9 +97,9 @@
- INCLUDES = -DG_LOG_DOMAIN=\"GNet\" @GNET_DEBUG_FLAGS@ 	$(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
- 
- 
--gnetincludedir = $(includedir)/gnet
-+gnetincludedir = $(includedir)/gnet-glib2
- 
--lib_LTLIBRARIES = libgnet.la
-+lib_LTLIBRARIES = libgnet-glib2.la
- 
- libgnet_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	 	$(GLIB_LIBS) $(GTHREAD_LIBS)
- 
-@@ -220,7 +220,7 @@
- 
- maintainer-clean-libtool:
- 
--libgnet.la: $(libgnet_la_OBJECTS) $(libgnet_la_DEPENDENCIES)
-+libgnet-glib2.la: $(libgnet_la_OBJECTS) $(libgnet_la_DEPENDENCIES)
- 	$(LINK) -rpath $(libdir) $(libgnet_la_LDFLAGS) $(libgnet_la_OBJECTS) $(libgnet_la_LIBADD) $(LIBS)
- 
- install-gnetincludeHEADERS: $(gnetinclude_HEADERS)
diff --git a/net/gnet2/pkg-plist b/net/gnet2/pkg-plist
index f37cf9c6686e..2d762729a000 100644
--- a/net/gnet2/pkg-plist
+++ b/net/gnet2/pkg-plist
@@ -1,50 +1,57 @@
-bin/gnet-glib2-config
-include/gnet-glib2/conn.h
-include/gnet-glib2/gnet.h
-include/gnet-glib2/gnetconfig.h
-include/gnet-glib2/inetaddr.h
-include/gnet-glib2/iochannel.h
-include/gnet-glib2/mcast.h
-include/gnet-glib2/md5.h
-include/gnet-glib2/pack.h
-include/gnet-glib2/server.h
-include/gnet-glib2/sha.h
-include/gnet-glib2/socks.h
-include/gnet-glib2/tcp.h
-include/gnet-glib2/udp.h
-include/gnet-glib2/unix.h
-include/gnet-glib2/url.h
-lib/libgnet-glib2.a
-lib/libgnet-glib2.so
-lib/libgnet-glib2.so.7
-libdata/pkgconfig/gnet-glib2.pc
-share/aclocal/gnet-glib2.m4
-share/doc/libgnet1.1-glib2-dev/html/book1.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-conn.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-developers-tips.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-developers.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-examples.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-gnet.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-inetaddr.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-iochannel.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-mcast.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-md5.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-overview.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-pack.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-server.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-sha.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-socks.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-tcp.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-udp.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-unix.html
-share/doc/libgnet1.1-glib2-dev/html/gnet-url.html
-share/doc/libgnet1.1-glib2-dev/html/hfetch.html
-share/doc/libgnet1.1-glib2-dev/html/index.html
-share/doc/libgnet1.1-glib2-dev/html/index.sgml
-share/doc/libgnet1.1-glib2-dev/html/libgnet-reference.html
-share/doc/libgnet1.1-glib2-dev/html/sdr.html
-share/doc/libgnet1.1-glib2-dev/html/tests.html
-@dirrm share/doc/libgnet1.1-glib2-dev/html
-@dirrm share/doc/libgnet1.1-glib2-dev
-@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
-@dirrm include/gnet-glib2
+include/gnet-2.0/base64.h
+include/gnet-2.0/conn.h
+include/gnet-2.0/gnet.h
+include/gnet-2.0/inetaddr.h
+include/gnet-2.0/iochannel.h
+include/gnet-2.0/ipv6.h
+include/gnet-2.0/mcast.h
+include/gnet-2.0/md5.h
+include/gnet-2.0/pack.h
+include/gnet-2.0/server.h
+include/gnet-2.0/sha.h
+include/gnet-2.0/socks.h
+include/gnet-2.0/tcp.h
+include/gnet-2.0/udp.h
+include/gnet-2.0/unix.h
+include/gnet-2.0/uri.h
+lib/gnet-2.0/include/gnetconfig.h
+lib/libgnet-2.0.a
+lib/libgnet-2.0.so
+lib/libgnet-2.0.so.0
+libdata/pkgconfig/gnet-2.0.pc
+share/aclocal/gnet-2.0.m4
+share/doc/libgnet2.0-dev/html/gnet/book1.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-base64.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-conn.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-developers-async.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-developers-tips.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-developers.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-examples-other.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-examples.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-gnet.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-inetaddr.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-iochannel.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-ipv6.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-mcast.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-md5.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-overview.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-pack.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-server.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-sha.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-socks.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-tcp.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-udp.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-unix.html
+share/doc/libgnet2.0-dev/html/gnet/gnet-uri.html
+share/doc/libgnet2.0-dev/html/gnet/home.png
+share/doc/libgnet2.0-dev/html/gnet/index.sgml
+share/doc/libgnet2.0-dev/html/gnet/left.png
+share/doc/libgnet2.0-dev/html/gnet/libgnet-reference.html
+share/doc/libgnet2.0-dev/html/gnet/right.png
+share/doc/libgnet2.0-dev/html/gnet/up.png
+@dirrm share/doc/libgnet2.0-dev/html/gnet
+@dirrm share/doc/libgnet2.0-dev/html
+@dirrm share/doc/libgnet2.0-dev
+@dirrm lib/gnet-2.0/include
+@dirrm lib/gnet-2.0
+@dirrm include/gnet-2.0