1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00
freebsd-ports/lang/caml-light/files/patch-ab
Martin Wilke 3e4ed01146 - 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)
2008-04-19 17:56:05 +00:00

109 lines
3.5 KiB
Plaintext

--- contrib/Makefile.orig Sun Nov 12 02:57:42 2000
+++ contrib/Makefile Sat Aug 5 09:57:42 2006
@@ -5,24 +5,24 @@
# Remember that "libunix" is required for
# "debugger", "libgraph", "camltk", "camltk4", and "search_isos".
PACKAGES=libunix libgraph debugger libnum libstr mletags \
- camlmode lorder profiler camltk4 camlsearch
+ camlmode lorder profiler camlsearch
# caml-tex
# caml-latex2e
# camltk
# Which C compiler to use.
# Should be the same compiler used to compile the main system (../src).
-CC=gcc
+#CC=gcc
# Any additional options to $(CC).
-OPTS=
+OPTS=${CFLAGS}
# How to call the C preprocessor on a file that does not have the .c extension.
# That's /lib/cpp on most machines, sometimes /usr/bin/cpp,
# and /usr/ccs/lib/cpp under Solaris.
# The -P option suppresses the generation of "# linenum" directives,
# which are not understood by Caml Light.
-CPP=/lib/cpp -P
+CPP=/usr/bin/cpp -P
# Test to see whether ranlib exists on the machine
RANLIBTEST=test -f /usr/bin/ranlib -o -f /bin/ranlib
@@ -31,27 +31,27 @@
RANLIB=ranlib
# The directory where public executables will be installed
-BINDIR=/usr/local/bin
+BINDIR=${PREFIX}/bin
# The directory where library files will be installed
-LIBDIR=/usr/local/lib/caml-light
+LIBDIR=${PREFIX}/lib/caml-light
# The manual section where the manual pages will be installed
MANEXT=1
# The directory where the manual pages will be installed
-MANDIR=/usr/local/man/man$(MANEXT)
+MANDIR=${PREFIX}/man/man$(MANEXT)
# The path to the include directory containing the X11/*.h includes
# (usually /usr/include; for SunOS with OpenLook, /usr/openwin/include)
# Needed for the "libgraph" and "camltk" packages.
-X11_INCLUDES=/usr/X11R6/include
+X11_INCLUDES=${LOCALBASE}/include
#X11_INCLUDES=/usr/include/X11
# The path to the directory containing the X11 libraries.
# (usually /usr/lib; for SunOS with OpenLook, /usr/openwin/lib)
# Needed for the "libgraph" and "camltk" packages.
-X11_LIB=/usr/X11R6/lib
+X11_LIB=${LOCALBASE}/lib
#X11_LIB=/usr/lib/X11
# Name of the target architecture.
@@ -68,19 +68,19 @@
# Name of the directory where LaTeX style files should be installed.
# Needed only for the "caml-tex" and "caml-latex2e" packages.
-TEXINPUTDIR=/usr/lib/texmf/tex/latex/etc
+TEXINPUTDIR=${PREFIX}/lib/texmf/tex/latex/etc
# Name of the directory where Emacs Lisp files should be installed.
# Needed only for the "camlmode" package.
-EMACSLISPDIR=/usr/lib/emacs/site-lisp
+EMACSLISPDIR=${PREFIX}/share/emacs/site-lisp
# Name of the directories where the tcl.h and tk.h includes can be found.
# Needed only for the "camltk" package.
# /usr/local configuration
# True64 configuration
-TCLINCLDIR=/usr/local/lib/tcl8.0/include
-TKINCLDIR=/usr/local/lib/tk8.0/include
+TCLINCLDIR=${LOCALBASE}/lib/tcl8.4/include
+TKINCLDIR=${LOCALBASE}/lib/tk8.4/include
# RedHat Linux configuration
#TCLINCLDIR=/usr/include
#TKINCLDIR=/usr/include
@@ -89,8 +89,8 @@
# Needed only for the "camltk" package.
# /usr/local configuration
# True64 Unix configuration
-TKLIBDIR=/usr/local/lib/tk8.0/lib
-TCLLIBDIR=/usr/local/lib/tcl8.0/lib
+TKLIBDIR=${LOCALBASE}/lib/tk8.4/lib
+TCLLIBDIR=${LOCALBASE}/lib/tcl8.4/lib
# RedHat Linux configuration
#TKLIBDIR=/usr/lib
@@ -100,7 +100,7 @@
# a custom Tcl/Tk with various extensions (such as Xpm)
#TKLIBS=-ltk -ltcl -lX11
# True64 Unix configuration
-TKLIBS=-ltk8.0 -ltcl8.0 -lX11 -lm
+TKLIBS=-ltk8.4 -ltcl8.4 -lX11 -lm
# RedHat Linux configuration
#TKLIBS=-ltk8.0 -ltcl8.0 -lX11 -ldl -lm