kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add back png and jpeg LIB_DEPENDS. Respect CXX and C

Browse source 
Noticed by:	bento
This commit is contained in:
Kris Kennaway 2002-05-08 02:19:16 +00:00
parent 96da2a068a
commit 25f4de6f2e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=58686
4 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
graphics/osg-devel/Makefile
View file

@ -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

21
graphics/osg-devel/files/patch-aa
View file

@ -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 =

4
graphics/osg/Makefile
View file

@ -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

21
graphics/osg/files/patch-aa
View file

@ -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 =