From 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sat, 19 Apr 2008 17:56:05 +0000 Subject: - 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) --- lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile | 4 ++-- .../files/patch-platforms::unix::npsqueak::npsqueakregister.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lang/squeak-dev/files') diff --git a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile b/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile index f8692044db87..d5def76a44c7 100644 --- a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile +++ b/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile @@ -5,7 +5,7 @@ ############ Customize flags here ####################### -INC = -I./include -I/usr/X11R6/include -+INC = -I./include -I%%X11BASE%%/include ++INC = -I./include -I%%LOCALBASE%%/include CC = gcc CFLAGS = $(INC) -O2 -fPIC -Wall LD = gcc @@ -14,7 +14,7 @@ npsqueak.so : npsqueak.o npunix.o - $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -+ $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -L%%X11BASE%%/lib -lXt -lX11 ++ $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -L%%LOCALBASE%%/lib -lXt -lX11 npsqueak.o: npsqueak.c ../config.h $(CC) -c $(CFLAGS) -DVM_LIBDIR=\"$(VM_LIBDIR)\" $< diff --git a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in b/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in index a4ba55ad46d4..a7bd917d2677 100644 --- a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in +++ b/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in @@ -7,7 +7,7 @@ -BROWSERS="netscape mozilla mozilla-firefox opera MozillaFirefox/lib" -BROWSER_DIRS="/usr/local/lib /usr/lib /opt" +BROWSERS="netscape mozilla firefox opera seamonkey" -+BROWSER_DIRS="%%X11BASE%%/lib %%X11BASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib" ++BROWSER_DIRS="%%LOCALBASE%%/lib %%LOCALBASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib" SYSTEM_BROWSER_DIR="/usr/lib/browser-plugins" ACTION=register -- cgit v1.2.3