aboutsummaryrefslogtreecommitdiff
path: root/biology/garlic
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
commit3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch)
treed573ea09b2bf6be67cb497df199932da9e2707c4 /biology/garlic
parent40049f4af2200d0dcf33596508688623fc75f764 (diff)
downloadports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz
ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav)
Notes
Notes: svn path=/head/; revision=211584
Diffstat (limited to 'biology/garlic')
-rw-r--r--biology/garlic/Makefile3
-rw-r--r--biology/garlic/files/patch-Makefile4
2 files changed, 3 insertions, 4 deletions
diff --git a/biology/garlic/Makefile b/biology/garlic/Makefile
index 497c008bfed8..b3e26548fe0f 100644
--- a/biology/garlic/Makefile
+++ b/biology/garlic/Makefile
@@ -31,8 +31,7 @@ CFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
- s|%%LOCALBASE%%|${LOCALBASE}|g ;\
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ;\
s|%%CC%%|${CC}|g ; \
s|%%CFLAGS%%|${CFLAGS}|g' ${WRKSRC}/Makefile
.if !defined(WITH_OPTIMIZED_FLAGS)
diff --git a/biology/garlic/files/patch-Makefile b/biology/garlic/files/patch-Makefile
index 63eb7c755204..b4d5e99172a9 100644
--- a/biology/garlic/files/patch-Makefile
+++ b/biology/garlic/files/patch-Makefile
@@ -6,7 +6,7 @@
#CCOPT = -O
-CCOPT = -O3
-+CCOPT = %%CFLAGS%% -I%%LOCALBASE%%/include -I%%X11BASE%%/include
++CCOPT = %%CFLAGS%% -I%%LOCALBASE%%/include
#CCOPT = -O3 -g3
#CCOPT = -ansi -pedantic -g3
#CCOPT = -ansi -pedantic -O -Wall -Wstrict-prototypes -g3
@@ -14,7 +14,7 @@
HEADERS = defines.h typedefs.h
-LIBPATH = -L/usr/X11R6/lib
-+LIBPATH = -L%%X11BASE%%/lib
++LIBPATH = -L%%LOCALBASE%%/lib
LINKOPT = -lX11 -lm