From f1bb6f1b577226570cdbd67d3041bf6b7374e264 Mon Sep 17 00:00:00 2001 From: pvalchev Date: Fri, 19 Jul 2002 23:43:11 +0000 Subject: [PATCH] new png header path --- graphics/xfig/Makefile | 3 +-- graphics/xfig/patches/patch-Imakefile | 21 +++++++++++++++++++-- print/teTeX/base/Makefile | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index 519a4292640..1a7d67897fe 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2002/03/21 20:57:09 espie Exp $ +# $OpenBSD: Makefile,v 1.24 2002/07/19 23:43:11 pvalchev Exp $ COMMENT= "CAD drawing program for X11" @@ -6,7 +6,6 @@ VERSION= 3.2.3d DISTNAME= xfig.${VERSION}.full PKGNAME= xfig-${VERSION} CATEGORIES= graphics x11 -NEED_VERSION= 1.515 HOMEPAGE= http://www.xfig.org/ diff --git a/graphics/xfig/patches/patch-Imakefile b/graphics/xfig/patches/patch-Imakefile index 1be294dbe63..c71532b2b60 100644 --- a/graphics/xfig/patches/patch-Imakefile +++ b/graphics/xfig/patches/patch-Imakefile @@ -1,5 +1,5 @@ ---- Imakefile.orig Tue May 29 20:32:11 2001 -+++ Imakefile Mon Oct 1 17:07:28 2001 +--- Imakefile.orig Tue May 29 12:32:11 2001 ++++ Imakefile Fri Jul 19 16:46:08 2002 @@ -47,8 +47,8 @@ XCOMM You must have version 5b or newer #ifdef USEJPEG @@ -60,3 +60,20 @@ I18N_SRC = w_i18n.c I18N_OBJ = w_i18n.o #endif +@@ -256,6 +258,7 @@ READJPEGO = f_readjpg.o + #ifdef USEPNG + DUSEPNG = -DUSE_PNG + PNGLIBS = -lpng -lz ++PNGINC = -I${LOCALBASE}/include/libpng + READPNGS = f_readpng.c + READPNGO = f_readpng.o + #endif /* USEPNG */ +@@ -325,7 +328,7 @@ MAINDEPFILES = patchlevel.h version.h + SRCS = $(XFIGSRC) + OBJS = $(XFIGOBJ) + +-EXTRA_INCLUDES = $(JPEGINC) $(XPMINC) $(XAW3DINC) ++EXTRA_INCLUDES = $(JPEGINC) $(XPMINC) $(XAW3DINC) $(PNGINC) + DEPLIBS = XawClientDepLibs + + LOCAL_LIBRARIES = $(JPEGLIB) diff --git a/print/teTeX/base/Makefile b/print/teTeX/base/Makefile index 3fbe3b6d4e7..d63d8ece071 100644 --- a/print/teTeX/base/Makefile +++ b/print/teTeX/base/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2002/06/09 05:37:07 wilfried Exp $ +# $OpenBSD: Makefile,v 1.20 2002/07/19 23:43:11 pvalchev Exp $ COMMENT= "TeX distribution, executables" @@ -37,7 +37,7 @@ CONFIGURE_STYLE=gnu MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/texk ${WRKSRC}/config ${WRKSRC}/libs/ncurses ${WRKSRC}/texinfo ${WRKSRC} CONFIGURE_ARGS= --disable-multiplatform --without-texinfo \ --with-system-ncurses --with-system-zlib --with-system-pnglib \ - --with-pnglib-libdir=${PNGDIR}/lib --with-pnglib-include=${PNGDIR}/include + --with-pnglib-libdir=${PNGDIR}/lib --with-pnglib-include=${PNGDIR}/include/libpng CONFIGURE_ENV=YACC=yacc .if ${FLAVOR:L:Mno_x11}