diff options
author | Pete Fritchman <petef@FreeBSD.org> | 2003-05-03 18:27:53 +0000 |
---|---|---|
committer | Pete Fritchman <petef@FreeBSD.org> | 2003-05-03 18:27:53 +0000 |
commit | 42220eeb24448c1b3e77b292f5661f3b184a76a7 (patch) | |
tree | f56432b4e208acccebc15aa1296bf68721c144a9 /biology | |
parent | Update to 3.94. (diff) |
- unbreak on 4.x: add dependency on gdkpixbuf, fix Makefiles to compile with
the correct libraries
- add a WITH_OPTIMIZED_CFLAGS knob
PR: 51614
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=80062
Diffstat (limited to 'biology')
-rw-r--r-- | biology/L-Breeder/Makefile | 49 | ||||
-rw-r--r-- | biology/L-Breeder/files/patch-GL_Lsystem::Makefile | 11 | ||||
-rw-r--r-- | biology/L-Breeder/files/patch-LBreeder::Makefile | 14 |
3 files changed, 30 insertions, 44 deletions
diff --git a/biology/L-Breeder/Makefile b/biology/L-Breeder/Makefile index a37669556195..59ae0ce71dda 100644 --- a/biology/L-Breeder/Makefile +++ b/biology/L-Breeder/Makefile @@ -17,39 +17,50 @@ COMMENT= Allows you to display and breed L-system forms LIB_DEPENDS= wx_gtk-2.2_gl.2:${PORTSDIR}/x11-toolkits/wxgtk -BROKEN= Unknown problem - WRKSRC= ${WRKDIR}/LBreeder/LBreeder PATCH_WRKSRC= ${WRKDIR}/LBreeder USE_X_PREFIX= yes -USE_GNOME= gtk12 +USE_GNOME= gtk12 gdkpixbuf USE_MESA= yes USE_GMAKE= yes USE_REINPLACE= yes +.if defined(WITH_OPTIMIZED_CFLAGS) +CFLAGS+= -O3 -ffast-math +.endif + pre-everything:: -.ifndef(WITH_OPTIMIZED_CFLAGS) - @${ECHO_MSG} ">>>" - @${ECHO_MSG} ">>> You can enable extra optimizations by defining WITH_OPTIMIZED_CFLAGS." - @${ECHO_MSG} ">>> For example, 'make WITH_OPTIMIZED_CFLAGS=yes'" - @${ECHO_MSG} ">>>" +.if !defined(WITH_OPTIMIZED_CFLAGS) + @${ECHO_MSG} "You can enable additional compilation optimizations" + @${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS" +.endif + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500000 +BROKEN= "invalid C++" .endif post-patch: -# uphold C{C,XX} @${FIND} ${WRKDIR} -type f -name Makefile | \ - ${XARGS} -n 10 ${REINPLACE_CMD} \ - -e 's|g\+\+|${CXX}|;s|gcc|${CC}|' -# both uphold CFLAGS and protect ARCHs where greater than -O is not -# safe -.ifndef(WITH_OPTIMIZED_CFLAGS) - @${REINPLACE_CMD} -e 's|-O2|"${CFLAGS}"|' ${WRKSRC}/Makefile -.else - @${REINPLACE_CMD} -e 's|-O2|"${CFLAGS} -O2"|' ${WRKSRC}/Makefile -.endif + ${XARGS} -n 10 ${REINPLACE_CMD} -E -e \ + 's|/usr/lib/libm.a||; \ + s|-ldl||; \ + s|-lgtk||; \ + s|-lgmodule||; \ + s|-lpthread||; \ + s|-lgthread||; \ + s|/usr/lib/libGL.a|-lGL|; \ + s|/usr/lib/libGLU.so|-lGLU|; \ + s|-O2|"${CFLAGS} ${PTHREAD_CFLAGS}"|; \ + s|-lglib|`${GLIB_CONFIG} --libs`|; \ + s|g\+\+|${CXX} -I${X11BASE}/include|; \ + s|-lgdk|`${GDK_PIXBUF_CONFIG} --libs`|; \ + s|-lwx_gtk[[:space:]]|`wx-config --libs`|; \ + s|-lwx_gtk_gl|-lwx_gtk-2.2_gl|' do-install: @${INSTALL_PROGRAM} ${WRKSRC}/L-Breeder ${PREFIX}/bin -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/biology/L-Breeder/files/patch-GL_Lsystem::Makefile b/biology/L-Breeder/files/patch-GL_Lsystem::Makefile deleted file mode 100644 index 7231f69e801f..000000000000 --- a/biology/L-Breeder/files/patch-GL_Lsystem::Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- GL_Lsystem/Makefile.orig Wed Aug 16 08:08:27 2000 -+++ GL_Lsystem/Makefile Tue Jan 22 00:58:31 2002 -@@ -2,6 +2,8 @@ - - .PHONY : clean all - -+CFLAGS+= -I${X11BASE}/include -+ - all : GLGraphics.o GL_Lsystem.o trackball.o Lstring Lturtle - - GLGraphics.o : GLGraphics.cpp GLGraphics.h ../Extras/vect3.h ../Lsystem/UIBaseClass.h diff --git a/biology/L-Breeder/files/patch-LBreeder::Makefile b/biology/L-Breeder/files/patch-LBreeder::Makefile deleted file mode 100644 index 8d1cd228ca89..000000000000 --- a/biology/L-Breeder/files/patch-LBreeder::Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- LBreeder/Makefile.orig Wed Jul 31 13:58:18 2002 -+++ LBreeder/Makefile Wed Jul 31 13:58:30 2002 -@@ -14,10 +14,7 @@ - export SHOW_DEBUGGING_MESSAGES; $(MAKE) all - - L-Breeder : $(objects) -- g++ -lwx_gtk -ldl -lpthread -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk \ ---rdynamic -lgmodule -lgthread -lglib -lpthread -lXext -lX11 /usr/lib/libGL.a \ --/usr/lib/libGLU.so /usr/lib/libm.a \ ---lwx_gtk_gl $(objects) -o L-Breeder -+ g++ `${GTK_CONFIG} gthread --libs` -lwx_gtk -lGL -lGLU -lwx_gtk_gl $(objects) -o L-Breeder - - StaticApp : $(objects) - g++ /usr/lib/libwx_gtk-2.1.so -ldl -lpthread -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk \ |