cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new png header path

Browse Source
This commit is contained in:
pvalchev 2002-07-20 00:21:22 +00:00
parent f1bb6f1b57
commit dd9edfb0c2
6 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editors/ted/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.7 2002/03/25 20:21:54 espie Exp $
# $OpenBSD: Makefile,v 1.8 2002/07/20 00:21:22 pvalchev Exp $
COMMENT= "X11 based RTF editor"
V=2.11
DISTNAME= ted-$V
CATEGORIES= editors textproc print
NEED_VERSION= 1.515
MASTER_SITES=ftp://ftp.nluug.nl/pub/editors/ted/
DISTFILES= ted-$V.src.tar.gz

11
editors/ted/patches/patch-bitmap_configure Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-bitmap_configure,v 1.1 2002/07/20 00:21:22 pvalchev Exp $
--- bitmap/configure.orig Fri Jul 19 17:55:13 2002
+++ bitmap/configure Fri Jul 19 17:55:01 2002
@@ -1774,6 +1774,7 @@ fi
/usr/pkg/include \
/usr/X11R6/include \
/usr/local/include/png \
+ /usr/local/include/libpng \
/usr/apps/include \
../libpng
do

4
graphics/povray/Makefile
View File

@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2002/05/08 17:06:48 espie Exp $
# $OpenBSD: Makefile,v 1.4 2002/07/20 00:21:22 pvalchev Exp $
COMMENT= "3D image rendering package"
PKGNAME= povray-3.1g
CATEGORIES= graphics
NEED_VERSION= 1.515
HOMEPAGE= http://www.povray.org

32
graphics/povray/patches/patch-makefile
View File

@ -1,12 +1,20 @@
$OpenBSD: patch-makefile,v 1.1.1.1 2001/08/09 22:28:00 rohee Exp $
$OpenBSD: patch-makefile,v 1.2 2002/07/20 00:21:22 pvalchev Exp $
Respects CFLAGS and CC.
Use local zlib, not the supplied one.
Use an external (and more recent) libpng, not the supplied one.
--- makefile.orig Sat Jun 19 05:52:24 1999
+++ makefile Sat Jul 28 02:29:59 2001
@@ -51,7 +51,10 @@
--- makefile.orig Sun Nov 21 18:12:37 1999
+++ makefile Fri Jul 19 17:42:28 2002
@@ -44,6 +44,7 @@
#
#
# CFLAGS = -O2 -ansi -c -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)
+CFLAGS += $(LIBPNGINC)
LFLAGS = $(LIBPNGLIB) $(ZLIBLIB) -lm
# Linux compiler flags, generic
@@ -53,7 +54,10 @@ LFLAGS = $(LIBPNGLIB) $(ZLIBLIB) -l
#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
@ -18,8 +26,8 @@ Use an external (and more recent) libpng, not the supplied one.
# HPUX compiler flags
#CFLAGS = +O2 -finline-functions -c -Aa -D_HPUX_SOURCE -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
@@ -60,7 +63,7 @@
#CFLAGS = -O2 -n32 -mips4 -r1000 -ansi -c -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)
@@ -62,7 +66,7 @@ CFLAGS = -O6 -finline-functions -ff
#CFLAGS = -O2 -n32 -mips4 -r10000 -ansi -c -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)
# Your compiler
-CC = gcc
@ -27,7 +35,7 @@ Use an external (and more recent) libpng, not the supplied one.
# 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
@@ -76,7 +79,7 @@
@@ -78,7 +82,7 @@ CC = gcc
# for some AIX systems:
#X11 = /usr/lpp/X11
@ -36,20 +44,20 @@ Use an external (and more recent) libpng, not the supplied one.
# You probably won't need to change these if you have the X11 variable
# above set properly...
@@ -88,10 +91,9 @@
@@ -90,10 +94,9 @@ XLIBLIB = -L$(X11)/lib -lX11
# 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
-LIBPNGINC = -I$(PNGDIR)
+LIBPNGINC = -I$(LOCALBASE)/include
+LIBPNGINC = -I$(LOCALBASE)/include/libpng
#LIBPNGLIB = $(PNGDIR)/libpng.a
-LIBPNGLIB = -L$(PNGDIR) -lpng
+LIBPNGLIB = -L$(LOCALBASE)/lib -lpng
#LIBPNGLIB = -L/usr/local/lib -lpng
# The following options are added at the suggestion of Axel Hecht
@@ -101,11 +103,7 @@
@@ -103,11 +106,7 @@ LIBPNGLIB = -L$(PNGDIR) -lpng
# LIBPNGINC = -I$(LIBPNGINCDIR)
# LIBPNGLIB = -L$(PREFIX)/lib -lpng
@ -62,7 +70,7 @@ Use an external (and more recent) libpng, not the supplied one.
# The following options are added at the suggestion of Axel Hecht
# PREFIX = $HOME
@@ -127,12 +125,12 @@
@@ -129,12 +128,12 @@ default: xwin
#default: svga
# Define the default POV-Ray library location
@ -77,7 +85,7 @@ Use an external (and more recent) libpng, not the supplied one.
#----------------------------------------------------------------------
# There should be no compelling reason to customize the makefile beyond
@@ -1011,22 +1009,6 @@
@@ -1013,22 +1012,6 @@ planesDEP = $(SRCDIR)/plan
$(SRCDIR)/povray.h \
$(SRCDIR)/render.h \
$(SRCDIR)/vector.h \

3
graphics/xpaint/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.27 2002/03/21 20:57:09 espie Exp $
# $OpenBSD: Makefile,v 1.28 2002/07/20 00:21:22 pvalchev Exp $
COMMENT= "simple paint program"
DISTNAME= xpaint-2.6.1
CATEGORIES= graphics x11
NEED_VERSION= 1.515
HOMEPAGE= http://home.worldonline.dk/~torsten/xpaint/

13
graphics/xpaint/patches/patch-Local.config
View File

@ -1,5 +1,14 @@
--- Local.config.orig Sat Sep 2 16:02:09 2000
+++ Local.config Wed Feb 20 15:49:55 2002
+++ Local.config Fri Jul 19 17:51:16 2002
@@ -84,7 +84,7 @@ XCOMM includes are correct.
#ifdef HavePNG
PNG_LIB = -L/usr/lib -lpng -lz
-PNG_INCLUDE = -I/usr/include/png
+PNG_INCLUDE = /usr/include/png
#endif
XCOMM If you are running SunOS and get an error with the following undefined
@@ -148,3 +148,14 @@ JPEG_INCLUDE = -I/usr/local/include
JPEG_LIB = -L/usr/local/lib -ljpeg
XPM_INCLUDE = -I/usr/X11R6/include/X11
@ -11,7 +20,7 @@
+TIFF_LIB = -L${LOCALBASE}/lib -ltiff
+JPEG_INCLUDE = -I${LOCALBASE}/include
+JPEG_LIB = -L${LOCALBASE}/lib -ljpeg
+PNG_INCLUDE = -I${LOCALBASE}/include
+PNG_INCLUDE = -I${LOCALBASE}/include/libpng
+PNG_LIB = -L${LOCALBASE}/lib -lpng -lz
+XPM_INCLUDE = -I${X11BASE}/include/X11
+#endif