From f5230ef613067e9a1806d64b49d1e65d469a5d40 Mon Sep 17 00:00:00 2001 From: brad Date: Sun, 26 May 2002 19:04:00 +0000 Subject: [PATCH] new png header path. --- x11/qt/Makefile | 6 +++--- x11/qt2/patches/patch-configs_openbsd-g++-shared | 6 +++--- x11/qt2/patches/patch-configs_openbsd-g++-shared-debug | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/x11/qt/Makefile b/x11/qt/Makefile index 8f14e84ddfa..5122dcff898 100644 --- a/x11/qt/Makefile +++ b/x11/qt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.61 2002/03/21 21:25:55 espie Exp $ +# $OpenBSD: Makefile,v 1.62 2002/05/26 19:04:00 brad Exp $ # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $ COMMENT= "C++ X11 GUI toolkit" @@ -10,7 +10,7 @@ DISTNAME= qt-${VERSION} PKGNAME-examples=qt-examples-${VERSION} PKGNAME-html= qt-html-${VERSION} CATEGORIES= x11 -NEED_VERSION= 1.515 +NEED_VERSION= 1.525 MASTER_SITES= ftp://ftp.troll.no/qt/source/ HOMEPAGE= http://www.trolltech.com/products/qt/ @@ -77,7 +77,7 @@ VMEM_WARNING= Yes post-build: @cd ${IMAGEIODIR} && \ - ${SETENV} ${MAKE_ENV} SYS_CXXFLAGS='-I$(LOCALBASE)/include ${CXXFLAGS}' ${MAKE} ${MAKE_FLAGS} + ${SETENV} ${MAKE_ENV} SYS_CXXFLAGS='-I$(LOCALBASE)/include/libpng -I$(LOCALBASE)/include ${CXXFLAGS}' ${MAKE} ${MAKE_FLAGS} do-install: ${INSTALL_DATA_DIR} ${QT_INCDIR} diff --git a/x11/qt2/patches/patch-configs_openbsd-g++-shared b/x11/qt2/patches/patch-configs_openbsd-g++-shared index 006f44a45e8..61811213170 100644 --- a/x11/qt2/patches/patch-configs_openbsd-g++-shared +++ b/x11/qt2/patches/patch-configs_openbsd-g++-shared @@ -1,5 +1,5 @@ ---- configs/openbsd-g++-shared.orig Mon Oct 29 15:24:05 2001 -+++ configs/openbsd-g++-shared Sat Dec 22 11:41:39 2001 +--- configs/openbsd-g++-shared.orig Sun Apr 21 12:45:43 2002 ++++ configs/openbsd-g++-shared Sun Apr 21 13:35:23 2002 @@ -1,11 +1,11 @@ # Compiling INTERFACE_DECL_PATH = . @@ -11,7 +11,7 @@ # Compiling with support libraries -SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -+SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -I/usr/local/include ++SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -I/usr/local/include/libpng -I/usr/local/include SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include diff --git a/x11/qt2/patches/patch-configs_openbsd-g++-shared-debug b/x11/qt2/patches/patch-configs_openbsd-g++-shared-debug index 9d07b7ed4f3..6a389560151 100644 --- a/x11/qt2/patches/patch-configs_openbsd-g++-shared-debug +++ b/x11/qt2/patches/patch-configs_openbsd-g++-shared-debug @@ -1,5 +1,5 @@ ---- configs/openbsd-g++-shared-debug.orig Mon Oct 29 15:24:05 2001 -+++ configs/openbsd-g++-shared-debug Sat Dec 22 11:42:24 2001 +--- configs/openbsd-g++-shared-debug.orig Sun Apr 21 12:45:43 2002 ++++ configs/openbsd-g++-shared-debug Sun Apr 21 13:35:49 2002 @@ -1,11 +1,11 @@ # Compiling INTERFACE_DECL_PATH = . @@ -11,7 +11,7 @@ # Compiling with support libraries -SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -+SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -I/usr/local/include ++SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -I/usr/local/include/libpng -I/usr/local/include SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include