diff options
| author | kris <kris@FreeBSD.org> | 2002-05-08 02:19:16 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2002-05-08 02:19:16 +0000 |
| commit | 7f76716ae4d77854e5d9a2bcefa25c3da4c368db (patch) | |
| tree | f3fc5f3fe941c0aa9c60197c64809e0d2a2525ba /graphics | |
| parent | 87d2d4ca7d285847dd0f7f2508eebba920f78f9d (diff) | |
| download | FreeBSD-ports-7f76716ae4d77854e5d9a2bcefa25c3da4c368db.zip FreeBSD-ports-7f76716ae4d77854e5d9a2bcefa25c3da4c368db.tar.gz | |
Add back png and jpeg LIB_DEPENDS. Respect CXX and C
Noticed by: bento
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/osg-devel/Makefile | 4 | ||||
| -rw-r--r-- | graphics/osg-devel/files/patch-aa | 21 | ||||
| -rw-r--r-- | graphics/osg/Makefile | 4 | ||||
| -rw-r--r-- | graphics/osg/files/patch-aa | 21 |
4 files changed, 40 insertions, 10 deletions
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile index ed79f0b..01bfa90 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg-devel/Makefile @@ -12,7 +12,9 @@ MASTER_SITES= http://www.openscenegraph.org/download/snapshots/ MAINTAINER= aa8vb@nc.rr.com -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ + jpeg.9:${PORTSDIR}/graphics/jpeg \ + freetype.9:${PORTSDIR}/print/freetype2 USE_X_PREFIX= yes USE_MESA= yes diff --git a/graphics/osg-devel/files/patch-aa b/graphics/osg-devel/files/patch-aa index 819bf05..d23aa1ea 100644 --- a/graphics/osg-devel/files/patch-aa +++ b/graphics/osg-devel/files/patch-aa @@ -1,6 +1,19 @@ ---- ./Make/ORIG/makedefs.freebsd Wed Jan 16 07:08:27 2002 -+++ ./Make/makedefs.freebsd Thu Mar 14 18:32:27 2002 -@@ -17,9 +17,9 @@ +--- Make/makedefs.freebsd.orig Wed Jan 16 04:08:27 2002 ++++ Make/makedefs.freebsd Tue May 7 18:34:36 2002 +@@ -6,20 +6,20 @@ + DEPFILES = $(OBJS:.o=.d) + + +-C++ = g++ ++C++ = ${CXX} + YFLAGS = -d + LCINCS += -I/usr/local/include -I/usr/X11R6/include + LC++INCS += ${LCINCS} +-CFLAGS = -O2 -W -Wall $(LCINCS) ++CFLAGS += -W -Wall $(LCINCS) + C++FLAGS = ${CFLAGS} + CPPFLAGS = ${CFLAGS} + SO_EXT = so DL_EXT = so @@ -8,7 +21,7 @@ +FREEBSD_LOCALLIBS = -L/usr/local/lib -rpath /usr/local/lib -L/usr/X11R6/lib -rpath /usr/X11R6/lib -LDFLAGS = -O2 -W -Wall -pthread -L/usr/local/lib -L/usr/X11R6/lib -+LDFLAGS = -O2 -W -Wall -pthread $(FREEBSD_LOCALLIBS) ++LDFLAGS = -W -Wall -pthread $(FREEBSD_LOCALLIBS) DYNAMICLIBRARYLIB = PFLIBS = diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index ed79f0b..01bfa90 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -12,7 +12,9 @@ MASTER_SITES= http://www.openscenegraph.org/download/snapshots/ MAINTAINER= aa8vb@nc.rr.com -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ + jpeg.9:${PORTSDIR}/graphics/jpeg \ + freetype.9:${PORTSDIR}/print/freetype2 USE_X_PREFIX= yes USE_MESA= yes diff --git a/graphics/osg/files/patch-aa b/graphics/osg/files/patch-aa index 819bf05..d23aa1ea 100644 --- a/graphics/osg/files/patch-aa +++ b/graphics/osg/files/patch-aa @@ -1,6 +1,19 @@ ---- ./Make/ORIG/makedefs.freebsd Wed Jan 16 07:08:27 2002 -+++ ./Make/makedefs.freebsd Thu Mar 14 18:32:27 2002 -@@ -17,9 +17,9 @@ +--- Make/makedefs.freebsd.orig Wed Jan 16 04:08:27 2002 ++++ Make/makedefs.freebsd Tue May 7 18:34:36 2002 +@@ -6,20 +6,20 @@ + DEPFILES = $(OBJS:.o=.d) + + +-C++ = g++ ++C++ = ${CXX} + YFLAGS = -d + LCINCS += -I/usr/local/include -I/usr/X11R6/include + LC++INCS += ${LCINCS} +-CFLAGS = -O2 -W -Wall $(LCINCS) ++CFLAGS += -W -Wall $(LCINCS) + C++FLAGS = ${CFLAGS} + CPPFLAGS = ${CFLAGS} + SO_EXT = so DL_EXT = so @@ -8,7 +21,7 @@ +FREEBSD_LOCALLIBS = -L/usr/local/lib -rpath /usr/local/lib -L/usr/X11R6/lib -rpath /usr/X11R6/lib -LDFLAGS = -O2 -W -Wall -pthread -L/usr/local/lib -L/usr/X11R6/lib -+LDFLAGS = -O2 -W -Wall -pthread $(FREEBSD_LOCALLIBS) ++LDFLAGS = -W -Wall -pthread $(FREEBSD_LOCALLIBS) DYNAMICLIBRARYLIB = PFLIBS = |
