5 files changed, 47 insertions, 5 deletions

diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index f197f7c2d807..40b573492504 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bugle
-PORTVERSION=	0.0.20041123
+PORTVERSION=	0.0.20050512
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bugle
@@ -22,9 +22,10 @@ USE_GL=		yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LIBS="-L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+		LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
+USE_LIBLTDL=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/bugle/distinfo b/graphics/bugle/distinfo
index d3e5c4cd05dc..f6b9eede29da 100644
--- a/graphics/bugle/distinfo
+++ b/graphics/bugle/distinfo
@@ -1,2 +1,2 @@
-MD5 (bugle-0.0.20041123.tar.gz) = 1ccd42bd0d028009e1f8b1136b364014
-SIZE (bugle-0.0.20041123.tar.gz) = 480500
+MD5 (bugle-0.0.20050512.tar.gz) = 1a9fce81316285c2b1d8d2908375cf3a
+SIZE (bugle-0.0.20050512.tar.gz) = 875329
diff --git a/graphics/bugle/files/patch-Makefile.in b/graphics/bugle/files/patch-Makefile.in
new file mode 100644
index 000000000000..06d17ac30ecf
--- /dev/null
+++ b/graphics/bugle/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig    Tue Sep 13 10:26:47 2005
++++ Makefile.in Tue Sep 13 10:26:58 2005
+@@ -370,7 +370,7 @@
+ subdirs = @subdirs@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = libltdl
++SUBDIRS = #libltdl
+ SYMBOLFLAGS = -export-symbol-regex '^(gl[A-Z]|budgie_|bugle_|gldb_)'
+ # Misc extra files to include
+ noinst_HEADERS = budgie/tree.def budgie/c-common.def
diff --git a/graphics/bugle/files/patch-budgie_budgie.cpp b/graphics/bugle/files/patch-budgie_budgie.cpp
new file mode 100644
index 000000000000..6bc3af7798fc
--- /dev/null
+++ b/graphics/bugle/files/patch-budgie_budgie.cpp
@@ -0,0 +1,10 @@
+--- budgie/budgie.cpp.orig	Tue Sep 13 10:56:30 2005
++++ budgie/budgie.cpp	Tue Sep 13 10:56:36 2005
+@@ -25,7 +25,6 @@
+ #include "tree.h"
+ #include "treeutils.h"
+ #include "budgie.h"
+-#include "getopt.h"
+ #include <iostream>
+ #include <fstream>
+ #include <sstream>
diff --git a/graphics/bugle/files/patch-configure b/graphics/bugle/files/patch-configure
new file mode 100644
index 000000000000..a323d93c0aaf
--- /dev/null
+++ b/graphics/bugle/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	Tue Sep 13 10:52:24 2005
++++ configure	Tue Sep 13 10:52:45 2005
+@@ -465,7 +465,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subdirs_all="$ac_subdirs_all libltdl"
++ac_subdirs_all="$ac_subdirs_all"
+ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL subdirs LTDLINCL LIBLTDL PERL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS READLINE_LIBS GL_LIBS GLINCLUDES LIBOBJS AVCODEC_LIBS HAVE_READLINE THREAD_LIBS LTLIBOBJS'
+ ac_subst_files=''
+ 
+@@ -20456,7 +20456,7 @@
+ 
+ 
+ 
+-subdirs="$subdirs libltdl"
++subdirs="$subdirs"
+ 
+ 
+