4 files changed, 15 insertions, 28 deletions

diff --git a/x11-toolkits/gigi/Makefile b/x11-toolkits/gigi/Makefile
index 2ffd4721423d..69ec537826ad 100644
--- a/x11-toolkits/gigi/Makefile
+++ b/x11-toolkits/gigi/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gigi
-PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTVERSION=	0.6.0.20070726
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
@@ -16,11 +15,9 @@ MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	OpenGL Graphic User Interface Library
 
 LIB_DEPENDS=	IL.1:${PORTSDIR}/graphics/devil \
-		boost_filesystem.4:${PORTSDIR}/devel/boost \
+		boost_python.4:${PORTSDIR}/devel/boost-python \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-BROKEN=		Does not build
-
 USE_BZIP2=	yes
 USE_SCONS=	yes
 SCONS_ARGS=	prefix=""
@@ -32,12 +29,12 @@ SHLIB_VER=	0
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 
 post-build:
-.for f in GiGi GiGiNet GiGiSDL
+.for f in GiGi GiGiSDL
 	@cd ${WRKSRC} && ${SED} -e \
 		's|%(prefix)s|${PREFIX}|; s|%(libdir)s|${PREFIX}/lib|; \
 		 s|%(incdir)s|${PREFIX}/include|; \
-		 s|%(version)s|${PORTVERSION}|; s|%(gigi_libs)s||; \
-		 s|%(boost_include)s||; s|%(gigi_net_libs)s||; \
+		 s|%(version)s|${PORTVERSION}|; \
+		 s|%(boost_include)s||; s|%(gigi_libs)s||; \
 		 s|%(gigi_sdl_libs)s||; s|%(sdl_include)s||' \
 		 ${f}.pc.in > ${f}.pc
 .endfor
@@ -45,7 +42,7 @@ post-build:
 do-install:
 	${MKDIR} ${PREFIX}/include/GG
 	${CP} -R ${WRKSRC}/GG/* ${PREFIX}/include/GG
-.for lib in GiGi GiGiNet GiGiSDL
+.for lib in GiGi GiGiSDL
 	${INSTALL_PROGRAM} ${WRKSRC}/lib${lib}.so \
 		${PREFIX}/lib/lib${lib}.so.${SHLIB_VER}
 	cd ${PREFIX}/lib && ${LN} -sf lib${lib}.so.${SHLIB_VER} lib${lib}.so
@@ -57,7 +54,7 @@ maint-gen-distfile:
 		${ECHO_CMD} "ERROR: the distfile already exists."; \
 		${FALSE}; \
 	fi
-	svn export https://svn.sourceforge.net/svnroot/${PORTNAME}/trunk ${PORTNAME}
+	svn export https://${PORTNAME}.svn.sourceforge.net/svnroot/${PORTNAME}/trunk ${PORTNAME}
 	tar cjf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}
 	${RM} -rf ${PORTNAME}
 
diff --git a/x11-toolkits/gigi/distinfo b/x11-toolkits/gigi/distinfo
index ec55290484bf..ca7aedd8834b 100644
--- a/x11-toolkits/gigi/distinfo
+++ b/x11-toolkits/gigi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gigi-0.6.0.tar.bz2) = ffe4667bf8b17841fdb1929491b37cb7
-SHA256 (gigi-0.6.0.tar.bz2) = f8008ce089c099b85ff3874df8677a1d9bcba60f21fb7f33e1def6dd7c4fb074
-SIZE (gigi-0.6.0.tar.bz2) = 586265
+MD5 (gigi-0.6.0.20070726.tar.bz2) = 60878c47daf21394d02729624e74f722
+SHA256 (gigi-0.6.0.20070726.tar.bz2) = 4831702da64a10ad9888af563e122a5a90928605ad97c75c7381c2f8738e0193
+SIZE (gigi-0.6.0.20070726.tar.bz2) = 563236
diff --git a/x11-toolkits/gigi/files/patch-GiGiSDL.pc.in b/x11-toolkits/gigi/files/patch-GiGiSDL.pc.in
index a6a934a87804..48ba7e40d7ab 100644
--- a/x11-toolkits/gigi/files/patch-GiGiSDL.pc.in
+++ b/x11-toolkits/gigi/files/patch-GiGiSDL.pc.in
@@ -1,11 +1,11 @@
---- ./GiGiSDL.pc.in.orig	Sun Jan 15 16:32:32 2006
-+++ ./GiGiSDL.pc.in	Tue May  1 15:59:09 2007
+--- GiGiSDL.pc.in.orig	Fri Jul 20 19:21:38 2007
++++ GiGiSDL.pc.in	Thu Jul 26 14:20:45 2007
 @@ -4,7 +4,7 @@
  
  Name: GiGiSDL
  Description: An SDL-based input driver and application framework for use with libGiGi.
--Requires: GiGi = ${version}, GiGiNet = ${version}
-+Requires: GiGi = ${version}, GiGiNet = ${version}, sdl
+-Requires: GiGi = ${version}
++Requires: GiGi = ${version}, sdl
  Version: ${version}
  Libs: -lGiGiSDL %(gigi_sdl_libs)s
- Cflags: %(sdl_include)s
+ Cflags: 
diff --git a/x11-toolkits/gigi/pkg-plist b/x11-toolkits/gigi/pkg-plist
index ab5e2451eced..e2b7a2203f60 100644
--- a/x11-toolkits/gigi/pkg-plist
+++ b/x11-toolkits/gigi/pkg-plist
@@ -52,22 +52,12 @@ include/GG/dialogs/ThreeButtonDlg.h
 include/GG/gen_signals.py
 include/GG/ltdl.h
 include/GG/ltdl_config.h
-include/GG/net/SDL_net.h
-include/GG/net/SDLnetsys.h
-include/GG/net/fastevents.h
-include/GG/net/net2.h
-include/GG/net/queue.h
-include/GG/net/trace.h
 lib/libGiGi.so
 lib/libGiGi.so.%%SHLIB_VER%%
-lib/libGiGiNet.so
-lib/libGiGiNet.so.%%SHLIB_VER%%
 lib/libGiGiSDL.so
 lib/libGiGiSDL.so.%%SHLIB_VER%%
 libdata/pkgconfig/GiGi.pc
-libdata/pkgconfig/GiGiNet.pc
 libdata/pkgconfig/GiGiSDL.pc
-@dirrm include/GG/net
 @dirrm include/GG/dialogs
 @dirrm include/GG/SDL
 @dirrm include/GG/OgreSDL