mirror of
https://git.freebsd.org/ports.git
synced 2025-06-22 13:10:31 -04:00
3e4ed01146
- 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)
55 lines
2.2 KiB
Text
55 lines
2.2 KiB
Text
--- source/unix/makefile.orig Mon Nov 22 09:12:37 1999
|
|
+++ source/unix/makefile Sat Dec 2 03:42:45 2006
|
|
@@ -53,7 +53,7 @@
|
|
#CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=586 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
|
|
|
|
# Linux compiler flags, Pentium II optimized
|
|
-CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=686 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
|
|
+CFLAGS+= -c -ansi -DCPU=686 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
|
|
|
|
# HPUX compiler flags
|
|
#CFLAGS = +O2 -finline-functions -c -Aa -D_HPUX_SOURCE -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
|
|
@@ -61,9 +61,6 @@
|
|
# IRIX 6.5 compiler flags, courtesy Johan Eriksson
|
|
#CFLAGS = -O2 -n32 -mips4 -r10000 -ansi -c -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)
|
|
|
|
-# Your compiler
|
|
-CC = gcc
|
|
-
|
|
# The X11 variable should point to the top-level directory where the X11
|
|
# libraries and include files are located. It should really be set in
|
|
# your system startup script (ie .cshrc or .profile) so that it can be
|
|
@@ -78,7 +75,7 @@
|
|
# for some AIX systems:
|
|
#X11 = /usr/lpp/X11
|
|
|
|
-X11 = /usr/X11R6
|
|
+X11 = $(LOCALBASE)
|
|
|
|
# You probably won't need to change these if you have the X11 variable
|
|
# above set properly...
|
|
@@ -90,10 +87,10 @@
|
|
# Use libXXX.a if you want to force static linking of the libraries.
|
|
# Use -Llibdir -lXXX if you want to use shared libraries (if they are
|
|
# available). It doesn't matter if you only have libXXX.a libraries.
|
|
-PNGDIR = $(SRCDIR)/libpng
|
|
+PNGDIR = $(PREFIX)/include
|
|
LIBPNGINC = -I$(PNGDIR)
|
|
#LIBPNGLIB = $(PNGDIR)/libpng.a
|
|
-LIBPNGLIB = -L$(PNGDIR) -lpng
|
|
+LIBPNGLIB = -L$(PREFIX)/lib -lpng
|
|
#LIBPNGLIB = -L/usr/local/lib -lpng
|
|
|
|
# The following options are added at the suggestion of Axel Hecht
|
|
@@ -104,9 +101,9 @@
|
|
# LIBPNGLIB = -L$(PREFIX)/lib -lpng
|
|
|
|
ZLIBDIR = $(SRCDIR)/zlib
|
|
-ZLIBINC = -I$(ZLIBDIR)
|
|
+ZLIBINC = #-I$(ZLIBDIR)
|
|
#ZLIBLIB = $(ZLIBDIR)/libz.a
|
|
-ZLIBLIB = -L$(ZLIBDIR) -lz
|
|
+ZLIBLIB = -lz
|
|
#ZLIBLIB = -L/usr/local/lib -lz
|
|
|
|
# The following options are added at the suggestion of Axel Hecht
|