summaryrefslogtreecommitdiffstats
path: root/astro/saoimage
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
committermiwi <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
commitbce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch)
treef5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /astro/saoimage
parent2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff)
downloadFreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip
FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz
- 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)
Diffstat (limited to 'astro/saoimage')
-rw-r--r--astro/saoimage/files/patch-aa10
-rw-r--r--astro/saoimage/files/patch-ab4
2 files changed, 7 insertions, 7 deletions
diff --git a/astro/saoimage/files/patch-aa b/astro/saoimage/files/patch-aa
index 5cf2b36..d897bf4 100644
--- a/astro/saoimage/files/patch-aa
+++ b/astro/saoimage/files/patch-aa
@@ -33,7 +33,7 @@
#ADFLAGS = -I/usr/openwin/share/include # ATTENTION: OpenWindows users...
-ADFLAGS = -I/usr/X11R6/include
-+ADFLAGS = -I${X11BASE}/include
++ADFLAGS = -I${LOCALBASE}/include
# Libraries that move about or may require special specification.
#
@@ -42,7 +42,7 @@
# to specify its path fully in XLIB.
-XLIB = -L/usr/X11R6/lib -lX11
-+XLIB = -L${X11BASE}/lib -lX11
++XLIB = -L${LOCALBASE}/lib -lX11
#XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users...
#F77LIB = -lF77 -lI77 -lU77
F77LIB = -lf2c
@@ -51,7 +51,7 @@
-XLIBH = /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/Xutil.h
-+XLIBH = ${X11BASE}/include/X11/Xlib.h ${X11BASE}/include/X11/Xutil.h
++XLIBH = ${LOCALBASE}/include/X11/Xlib.h ${LOCALBASE}/include/X11/Xutil.h
STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \
hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h
WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH)
@@ -61,8 +61,8 @@
defs/desktop.def defs/cursor.def
-mainkey.o : $(WORKS) /usr/include/X11/keysym.h \
- /usr/include/X11/keysymdef.h
-+mainkey.o : $(WORKS) ${X11BASE}/include/X11/keysym.h \
-+ ${X11BASE}/include/X11/keysymdef.h
++mainkey.o : $(WORKS) ${LOCALBASE}/include/X11/keysym.h \
++ ${LOCALBASE}/include/X11/keysymdef.h
#mainkey.o : $(WORKS) # for OpenWindows
mainslct.o : $(WORKS)
mainutil.o : $(XLIBH) $(STRUCT) hfiles/extern.h
diff --git a/astro/saoimage/files/patch-ab b/astro/saoimage/files/patch-ab
index a2e953f..a556ab3 100644
--- a/astro/saoimage/files/patch-ab
+++ b/astro/saoimage/files/patch-ab
@@ -5,7 +5,7 @@
# make procedure in the parent SAOimage directory.
-CFLAGS = -c -O
-+CFLAGS += -c -I${X11BASE}/include
++CFLAGS += -c -I${LOCALBASE}/include
LINT = lint
RANLIB = ranlib
@@ -14,7 +14,7 @@
LIB = libbtn.a
-XLIBH = /usr/include/X11/Xlib.h
-+XLIBH = ${X11BASE}/include/X11/Xlib.h
++XLIBH = ${LOCALBASE}/include/X11/Xlib.h
#XLIBH = /usr/openwin/share/include/X11/Xlib.h #for OpenWindows
all: $(LIB)
OpenPOWER on IntegriCloud