4 files changed, 100 insertions, 68 deletions

diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index eb45eed60844..5d6c834771a6 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -2,73 +2,46 @@
 # $FreeBSD$
 
 PORTNAME=	bugle
-PORTVERSION=	0.0.20091026
-PORTREVISION=	2
+PORTVERSION=	0.0.20100508
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Debugging library for OpenGL
 
-OPTIONS_DEFINE=	AVCODEC GUI THREADS
-AVCODEC_DESC=	LAVC codec support
+LICENSE=	GPLv2
 
-GNU_CONFIGURE=	yes
+USES=		libtool pathfix perl5
 USE_GL=		gl
-USES=		perl5
+USE_GCC=	yes
 USE_AUTOTOOLS=	libltdl
-USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-ltdl-install=no
+INSTALL_TARGET=	install-strip
+USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=--enable-ltdl-install=no
 CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-
-MAN1=	gldb.1 gldb-gui.1
-MAN3=	bugle.3
-MAN5=	bugle-statistics.5
-MAN7=	bugle-camera.7 bugle-checks.7 bugle-eps.7 bugle-error.7 \
-	bugle-exe.7 bugle-extoverride.7 bugle-frontbuffer.7 bugle-log.7 \
-	bugle-logstats.7 bugle-screenshot.7 bugle-showerror.7 \
-	bugle-showextensions.7 bugle-showstats.7 bugle-stats_basic.7 \
-	bugle-stats_calls.7 bugle-stats_calltimes.7 bugle-stats_fragments.7 \
-	bugle-stats_nv.7 bugle-stats_primitives.7 bugle-trace.7 \
-	bugle-unwindstack.7 bugle-wireframe.7
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+BROKEN_sparc64=	Fails to link
 
-.if ${PORT_OPTIONS:MAVCODEC}
-CONFIGURE_ARGS+=--with-lavc
-LIB_DEPENDS+=	libavcodec.so.1:${PORTSDIR}/multimedia/ffmpeg
-.else
-CONFIGURE_ARGS+=--without-lavc
-.endif
+OPTIONS_DEFINE=		FFMPEG GTK2 READLINE THREADS
+OPTIONS_DEFAULT=	READLINE THREADS
 
-.if ${PORT_OPTIONS:MGUI}
-LIB_DEPENDS+=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
-CONFIGURE_ARGS+=--with-gtk --with-gtkglext
-.else
-CONFIGURE_ARGS+=--without-gtk --without-gtkglext
-.endif
-
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=--with-threads=pthreads
-.else
-CONFIGURE_ARGS+=--with-threads=single
-.endif
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Fails to link
-.endif
+FFMPEG_CONFIGURE_WITH=	lavc
+FFMPEG_LIB_DEPENDS=	libavcodec.so.1:${PORTSDIR}/multimedia/ffmpeg
+GTK2_LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+GTK2_USE=		gnome=gtk20
+GTK2_CONFIGURE_WITH=	gtk gtkglext
+READLINE_USES=		readline
+READLINE_CONFIGURE_WITH=	readline
+THREADS_CONFIGURE_ON=	--with-threads=pthreads
+THREADS_CONFIGURE_OFF=	--with-threads=single
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/gengl/find_header.perl
-
-post-install:
-	@${RM} -f ${PREFIX}/lib/libbugle.la ${PREFIX}/lib/libbugleutils.la \
-	          ${PREFIX}/lib/bugle/*.la \
-	          ${PREFIX}/lib/pkgconfig/bugle.pc
-	@-${RMDIR} ${PREFIX}/lib/pkgconfig
-	@${RM} -rf ${PREFIX}/share/doc/bugle
+	@${REINPLACE_CMD} -e \
+		's|=-lpthread|=-pthread|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/gengl/find_header.perl
 
 .include <bsd.port.mk>
diff --git a/graphics/bugle/distinfo b/graphics/bugle/distinfo
index fe9e77c629f0..ed52cd4b6f7e 100644
--- a/graphics/bugle/distinfo
+++ b/graphics/bugle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bugle-0.0.20091026.tar.gz) = 70cde49e43455839eee0386ccaec40073952cc09bc226deeac21608d71f28329
-SIZE (bugle-0.0.20091026.tar.gz) = 1918949
+SHA256 (bugle-0.0.20100508.tar.gz) = b17402532bc078d7beceeb04cd011622423acc8ba841ea90be5e01e47bdf834c
+SIZE (bugle-0.0.20100508.tar.gz) = 1920342
diff --git a/graphics/bugle/files/patch-configure b/graphics/bugle/files/patch-configure
deleted file mode 100644
index 784ed8f883b5..000000000000
--- a/graphics/bugle/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2009-10-26 20:17:02.000000000 +0100
-+++ configure	2009-11-01 15:33:48.000000000 +0100
-@@ -37159,8 +37159,8 @@
- 
- GLDB=gldb/gldb$EXEEXT
- GLDB_GUI=gldb/gldb-gui$EXEEXT
--test $HAVE_GTK == 1 || GLDB_GUI=""
--test $BUGLE_OSAPI == "BUGLE_OSAPI_POSIX" || GLDB=""
-+test $HAVE_GTK = 1 || GLDB_GUI=""
-+test $BUGLE_OSAPI = "BUGLE_OSAPI_POSIX" || GLDB=""
- 
- 
- 
diff --git a/graphics/bugle/pkg-plist b/graphics/bugle/pkg-plist
index 56b6f58dde64..97ce9def61a0 100644
--- a/graphics/bugle/pkg-plist
+++ b/graphics/bugle/pkg-plist
@@ -77,13 +77,85 @@ lib/bugle/validate.so
 lib/libbugle.a
 lib/libbugle.so
 lib/libbugle.so.8
+lib/libbugle.so.8.0.0
 lib/libbugleutils.a
 lib/libbugleutils.so
 lib/libbugleutils.so.7
+lib/libbugleutils.so.7.0.0
+libdata/pkgconfig/bugle.pc
+man/man1/gldb.1.gz
+man/man1/gldb-gui.1.gz
+man/man3/bugle.3.gz
+man/man5/bugle-statistics.5.gz
+man/man7/bugle-camera.7.gz
+man/man7/bugle-checks.7.gz
+man/man7/bugle-eps.7.gz
+man/man7/bugle-error.7.gz
+man/man7/bugle-exe.7.gz
+man/man7/bugle-extoverride.7.gz
+man/man7/bugle-frontbuffer.7.gz
+man/man7/bugle-log.7.gz
+man/man7/bugle-logstats.7.gz
+man/man7/bugle-screenshot.7.gz
+man/man7/bugle-showerror.7.gz
+man/man7/bugle-showextensions.7.gz
+man/man7/bugle-showstats.7.gz
+man/man7/bugle-stats_basic.7.gz
+man/man7/bugle-stats_calls.7.gz
+man/man7/bugle-stats_calltimes.7.gz
+man/man7/bugle-stats_fragments.7.gz
+man/man7/bugle-stats_nv.7.gz
+man/man7/bugle-stats_primitives.7.gz
+man/man7/bugle-trace.7.gz
+man/man7/bugle-unwindstack.7.gz
+man/man7/bugle-wireframe.7.gz
+%%PORTDOCS%%%%DOCSDIR%%/html/bugle.3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bugle.css
+%%PORTDOCS%%%%DOCSDIR%%/html/camera.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/checks.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/eps.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/error.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/exe.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/extending.html
+%%PORTDOCS%%%%DOCSDIR%%/html/extoverride.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/frontbuffer.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gldb-gui.1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gldb.1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hacking.html
+%%PORTDOCS%%%%DOCSDIR%%/html/images/gtk-copy.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/gtk-zoom-100.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/gtk-zoom-fit.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/gtk-zoom-in.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/gtk-zoom-out.png
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/install.html
+%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/log.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/logstats.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/protocol.html
+%%PORTDOCS%%%%DOCSDIR%%/html/screenshot.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/showerror.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/showextensions.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/showstats.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/single.html
+%%PORTDOCS%%%%DOCSDIR%%/html/statistics.5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/stats_basic.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/stats_calls.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/stats_calltimes.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/stats_fragments.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/stats_nv.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/stats_primitives.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/trace.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/unwindstack.7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/wireframe.7.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/bugle
 @dirrm include/bugle/bugle/glx
 @dirrm include/bugle/bugle/glwin
 @dirrm include/bugle/bugle/gl
 @dirrm include/bugle/bugle
 @dirrm include/bugle/budgie
 @dirrm include/bugle
-@dirrm lib/bugle