new png header path.

devel/libuta/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2002/05/13 18:50:40 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2002/05/27 02:50:14 brad Exp $
 
 COMMENT=	"graphical user interface library for C++"
 
 VERSION=	0.3.40
 DISTNAME=	libuta-${VERSION}
 CATEGORIES=	devel
-NEED_VERSION=	1.475
+NEED_VERSION=	1.525
 
 HOMEPAGE=	http://libuta.sourceforge.net/
 
@@ -22,17 +22,18 @@ PATCH_LIST=	${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltconfig \
 		${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltmain_sh \
 		patch-*
 
-LIB_DEPENDS=	smpeg.1.3:smpeg-*:devel/smpeg \
+LIB_DEPENDS=	smpeg.1.3::devel/smpeg \
 		SDL_mixer::devel/sdl-mixer \
-		png.2:png-*:graphics/png \
-		sigc.0.0:libsigc++-*:devel/libsigc++ \
-		ttf.1.3:freetype-*:print/freetype
+		png.2::graphics/png \
+		sigc.0.0::devel/libsigc++ \
+		ttf.1.3::print/freetype
 
 USE_X11=	Yes
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 VMEM_WARNING=	Yes
 

devel/libuta/patches/patch-configure

@@ -1,7 +1,18 @@
-$OpenBSD: patch-configure,v 1.2 2001/08/20 06:40:52 pvalchev Exp $
---- configure.orig	Sat Jul 28 07:50:41 2001
-+++ configure	Mon Aug 20 00:36:04 2001
-@@ -4062,7 +4062,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+$OpenBSD: patch-configure,v 1.3 2002/05/27 02:50:14 brad Exp $
+--- configure.orig	Sat Jul 28 09:50:41 2001
++++ configure	Sun May 26 22:36:44 2002
+@@ -3569,10 +3569,6 @@ cross_compiling=$ac_cv_prog_cc_cross
+ 
+  
+ 
+-CFLAGS=
+-CXXFLAGS=
+-CPPFLAGS=-Wall
+-
+ case $win32 in
+     true)
+ 		
+@@ -4062,7 +4058,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
@@ -10,7 +21,7 @@ $OpenBSD: patch-configure,v 1.2 2001/08/20 06:40:52 pvalchev Exp $
  cat > conftest.$ac_ext <<EOF
  #line 4068 "configure"
  #include "confdefs.h"
-@@ -4096,7 +4096,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+@@ -4096,7 +4092,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
  #define $ac_tr_lib 1
  EOF
  

graphics/netpbm/files/Makefile.config.OpenBSD

@@ -13,7 +13,7 @@ TIFFHDR_DIR = ${LOCALBASE}/include
 JPEGLIB_DIR = ${LOCALBASE}/lib
 JPEGHDR_DIR = ${LOCALBASE}/include
 PNGLIB_DIR = ${LOCALBASE}/lib
-PNGHDR_DIR = ${LOCALBASE}/include
+PNGHDR_DIR = ${LOCALBASE}/include/libpng
 ZLIB_DIR = /usr/lib
 ZHDR_DIR = /usr/include
 URTLIB_DIR = NONE