diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2005-03-02 18:50:47 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2005-03-02 18:50:47 +0000 |
| commit | 9a866799fc823114d83a780923a1c8a9e07af0bf (patch) | |
| tree | a48d5e9daa5fc525151b974fe4e4ce2ac81ec84d /graphics/osg-devel/files/patch-Make::makedefs | |
| parent | make(1) in 5.2.1-RELEASE can't handle the generated Makefiles either. (diff) | |
- Upgrade to 0.9.8 and unbreak;
- Take maintainership.
PR: ports/77257
Submitted by: Sam Lawrance <boris (at) brooknet.com.au>
Approved by: previous maintainer time-out
(waiting for feedback since Feb 8th)
Diffstat (limited to 'graphics/osg-devel/files/patch-Make::makedefs')
| -rw-r--r-- | graphics/osg-devel/files/patch-Make::makedefs | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/graphics/osg-devel/files/patch-Make::makedefs b/graphics/osg-devel/files/patch-Make::makedefs index 8ecc8343ea4f..d3d7dc6d4be3 100644 --- a/graphics/osg-devel/files/patch-Make::makedefs +++ b/graphics/osg-devel/files/patch-Make::makedefs @@ -1,6 +1,6 @@ ---- Make/makedefs.orig Thu Oct 2 22:43:39 2003 -+++ Make/makedefs Sat Oct 18 01:04:39 2003 -@@ -359,17 +359,17 @@ +--- Make/makedefs.orig Sun Dec 5 11:03:43 2004 ++++ Make/makedefs Mon Feb 7 10:59:22 2005 +@@ -402,24 +402,35 @@ #### FreeBSD specific definitions ifeq ($(OS),FreeBSD) @@ -8,38 +8,36 @@ + C++ = ${CXX} DEPARG = -MM - INC += -I/usr/local/include -I/usr/X11R6/include -+ INC += -I${LOCALBASE}/include -I${X11BASE}/include ++ INC += -I${LOCALBASE}/include -I${X11BASE}/include DEF += -W -Wall - OPTF = -O2 -+ OPTF = %%CXXFLAGS%% ++ OPTF ?= -O2 DBGF = -g -DOSG_COMPILE_UNIT_TESTS SHARED = -shared ARCH = ARCHINST = ARCHARGS = -- LINKARGS = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib -+ LINKARGS = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib - DYNAMICLIBRARYLIB = +- LINKARGS = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib -pthread ++ LINKARGS = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib -pthread + DYNAMICLIBRARYLIB = OSG_LIBS = -losgGA -losgDB -losgUtil -losg - FREETYPE_LIB = -lfreetype -@@ -377,9 +377,17 @@ + GL_LIBS = -lGLU -lGL X_INC = -I/usr/X11R6/include X_LIBS = -lXmu -lX11 SOCKET_LIBS = - OTHER_LIBS = -lOpenThreads -- INST_LOCATION = /opt/X11R6 -- INST_SHARE = /usr/share/OpenSceneGraph + OTHER_LIBS = -lOpenThreads ${PTHREAD_LIBS} ++ # PREFIX, EXAMPLESDIR, DOCSDIR, and DATADIR are defined by the port + INST_LOCATION = ${PREFIX} + INST_SHARE = ${PREFIX}/share -+ INST_EXAMPLES = ${INST_SHARE}/examples/osg/bin -+ INST_EXAMPLE_SRC = ${INST_SHARE}/examples/osg/src -+ INST_DOC = ${INST_SHARE}/doc/osg -+ INST_SRC = ${INST_EXAMPLE_SRC} -+ INST_DATA = ${INST_SHARE}/osg ++ INST_EXAMPLES = ${EXAMPLESDIR}/bin ++ INST_EXAMPLE_SRC = ${EXAMPLESDIR}/src ++ INST_DOC = ${DOCSDIR} ++ INST_SRC = ${EXAMPLESDIR}/src ++ INST_DATA = ${DATADIR} + INSTBINCMD = ${BSD_INSTALL_PROGRAM} + INSTDEVCMD = ${BSD_INSTALL_DATA} + LIBXML2_INCLUDE = -I${LOCALBASE}/include/libxml2 - endif - - #### MacOS X specific definitions + PNG_LIBS = -lpng + JPEG_LIBS = -ljpeg + TIFF_LIB = -ltiff |