summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/avifile/Makefile4
-rw-r--r--graphics/fly/Makefile3
-rw-r--r--graphics/freetype-lib/Makefile.common3
-rw-r--r--graphics/gd/Makefile3
-rw-r--r--graphics/gdk-pixbuf/Makefile.common3
-rw-r--r--graphics/geomview/Makefile4
-rw-r--r--graphics/gif2png/Makefile3
-rw-r--r--graphics/gimp/Makefile5
-rw-r--r--graphics/gnome-iconedit/Makefile3
-rw-r--r--graphics/gphoto/Makefile3
-rw-r--r--graphics/gqview/Makefile4
-rw-r--r--graphics/imlib/Makefile3
-rw-r--r--graphics/libgdgeda/Makefile4
-rw-r--r--graphics/librsvg/Makefile4
-rw-r--r--graphics/opendis/Makefile3
-rw-r--r--graphics/plotutils/Makefile3
-rw-r--r--graphics/sane-backends/Makefile4
-rw-r--r--graphics/xsane/Makefile7
18 files changed, 26 insertions, 40 deletions
diff --git a/graphics/avifile/Makefile b/graphics/avifile/Makefile
index bb5f339601f..a0ac0ef5736 100644
--- a/graphics/avifile/Makefile
+++ b/graphics/avifile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/04/14 23:09:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:34 jlam Exp $
DISTNAME= avifile-0.53.5
CATEGORIES= graphics
@@ -27,8 +27,8 @@ HAS_CONFIGURE= yes
CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}" \
MOC="${MOC}" \
UIC="${UIC}" \
-# CPPFLAGS="-I${LOCALBASE}/include"
# LIBS="-Wl,-R${X11BASE}/qt2/lib -L${X11BASE}/qt2/lib"
+#CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --prefix=${PREFIX} --with-win32-path=${LOCALBASE}/lib/win32 \
--enable-sdl --without-qt
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index 9ef2818075d..b41d6bc6946 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/03/27 03:19:59 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:34 jlam Exp $
DISTNAME= fly-1.6.5
CATEGORIES= graphics www
@@ -15,7 +15,6 @@ EVAL_PREFIX+= XPMDIR=xpm
USE_X11= yes # (perhaps) -lXpm
CPPFLAGS+= -I${XPMDIR}/include -I${XPMDIR}/include/X11 # Xpm.h
CPPFLAGS+= -I${LOCALBASE}/include # gd.h
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/fly ${PREFIX}/bin
diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common
index 8b24db11ae1..5b81ccc8453 100644
--- a/graphics/freetype-lib/Makefile.common
+++ b/graphics/freetype-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2001/06/11 02:05:10 jlam Exp $
+# $NetBSD: Makefile.common,v 1.15 2001/06/11 06:34:35 jlam Exp $
DISTNAME= freetype-${FT_VERS}
FT_VERS= 1.3.1
@@ -25,7 +25,6 @@ PATCHDIR= ${.CURDIR}/../../graphics/freetype-lib/patches
.include "../../devel/gettext-lib/buildlink.mk"
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= LIBS="${LIBS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 7e8d95eee25..b75052280a9 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/05/22 09:32:20 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2001/06/11 06:34:35 jlam Exp $
# FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
#
@@ -37,7 +37,6 @@ GD_MINOR= 9
MAKE_ENV+= GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" COMPILER="${CC}"
EVAL_PREFIX+= XPMDIR=xpm
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include/freetype # freetype.h
CPPFLAGS+= -I${LOCALBASE}/include # png.h
CPPFLAGS+= -I${XPMDIR}/include -I${XPMDIR}/include/X11 # xpm.h
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index a63518299eb..7ee1a4b72fb 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2001/05/22 09:33:32 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2001/06/11 06:34:35 jlam Exp $
#
DISTNAME= gdk-pixbuf-0.10.1
@@ -21,7 +21,6 @@ USE_LIBTOOL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= # defined
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
M4= ${LOCALBASE}/bin/gm4
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 6dc5a8de775..4f76702527d 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/02 15:08:52 jtb Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:35 jlam Exp $
DISTNAME= geomview-1.8.1
CATEGORIES= graphics math
@@ -21,7 +21,7 @@ EVAL_PREFIX+= MESABASE=Mesa
CONFIGURE_ARGS+= --without-xforms
CONFIGURE_ARGS+= --with-opengl=${MESABASE}
CONFIGURE_ARGS+= --with-motif=${MOTIFBASE}
-CONFIGURE_ENV+= CPPFLAGS="-Dunix -Dalloca=__builtin_alloca"
+CPPFLAGS+= -Dunix -Dalloca=__builtin_alloca
INFO_FILES= geomview
diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile
index 58dc00a2366..08b670480ea 100644
--- a/graphics/gif2png/Makefile
+++ b/graphics/gif2png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/05/22 09:32:20 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2001/06/11 06:34:36 jlam Exp $
DISTNAME= gif2png-2.4.2
CATEGORIES= graphics converters
@@ -12,7 +12,6 @@ COMMENT= convert GIF files to PNG
DEPENDS+= png>=1.0.11:../../graphics/png
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index c97c33c8420..3baad004448 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2001/05/22 09:32:20 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2001/06/11 06:34:36 jlam Exp $
DISTNAME= gimp-1.2.1
CATEGORIES= graphics
@@ -35,8 +35,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" \
--disable-perl \
--disable-python
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- GNOME_CONFIG=no \
+CONFIGURE_ENV= GNOME_CONFIG=no \
INTLDEPS="-I${LOCALBASE}/include"
CPPFLAGS= -I${LOCALBASE}/include
diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile
index 21c9d64885a..f4e6e943930 100644
--- a/graphics/gnome-iconedit/Makefile
+++ b/graphics/gnome-iconedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/02 20:06:13 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:36 jlam Exp $
#
DISTNAME= gnome-iconedit-1.2.0
@@ -20,7 +20,6 @@ USE_X11BASE= YES
# for finding libpng
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
post-configure:
cd ${WRKSRC}/src && ${GMAKE} clean
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index 5ff8030c10b..4decf6e0c71 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/28 01:35:25 briggs Exp $
+# $NetBSD: Makefile,v 1.12 2001/06/11 06:34:36 jlam Exp $
DISTNAME= gphoto-0.4.3
CATEGORIES= graphics
@@ -15,6 +15,5 @@ USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 94bada0900e..17a799a2669 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/04/02 20:06:14 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/06/11 06:34:36 jlam Exp $
#
DISTNAME= gqview-0.10.1
@@ -17,8 +17,6 @@ USE_LIBINTL= yes
USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG=no
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
# for libpng recognition
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index cbe64337e7f..4c849c0e579 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2001/05/22 09:32:21 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2001/06/11 06:34:37 jlam Exp $
#
DISTNAME= imlib-1.9.8.1
@@ -22,7 +22,6 @@ USE_X11BASE= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
PLIST_SUBST+= LOCALBASE=${LOCALBASE}
USE_GMAKE= yes
diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile
index 6560ec24f17..c41750d7327 100644
--- a/graphics/libgdgeda/Makefile
+++ b/graphics/libgdgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/05/22 09:32:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:37 jlam Exp $
#
DISTNAME= libgdgeda-1.6
@@ -13,7 +13,7 @@ DEPENDS+= png>=1.0.11:../../graphics/png
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include"
+CPPFLAGS+= -I${PREFIX}/include
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index d32c0d9e1ff..5051e3e165c 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/14 17:47:27 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:37 jlam Exp $
#
DISTNAME= librsvg-1.0.0
@@ -18,6 +18,6 @@ USE_LIBTOOL= YES
USE_X11BASE= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/opendis/Makefile b/graphics/opendis/Makefile
index 8efc6c5b75f..463818c81de 100644
--- a/graphics/opendis/Makefile
+++ b/graphics/opendis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:22:28 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/11 06:34:37 jlam Exp $
DISTNAME= opendis-0.0.3
CATEGORIES= graphics
@@ -11,6 +11,5 @@ COMMENT= Download images from Flashpoint Digita-based cameras
#USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index bda17543c14..9e631132998 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/05/22 09:32:22 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2001/06/11 06:34:38 jlam Exp $
#
DISTNAME= plotutils-2.4.1
@@ -15,7 +15,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-libplotter
# make sure configure finds png
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
USE_LIBTOOL= yes
USE_X11BASE= yes
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 450d17469ec..52c7f767432 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/28 11:25:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:38 jlam Exp $
# FreeBSD Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp
#
@@ -24,7 +24,7 @@ USE_GMAKE= yes
#USE_X11BASE= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include"
+CPPFLAGS+= -I${PREFIX}/include
# -O to work around a bug with -O2 and egcs.
CFLAGS= -O -I${LOCALBASE}/include
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index a3be6e5f559..7d253cab2bc 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/05/22 09:32:23 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2001/06/11 06:34:38 jlam Exp $
#
DISTNAME= xsane-0.72
@@ -31,8 +31,7 @@ USE_GMAKE= YES
USE_X11BASE= YES
LDFLAGS+= -L${PREFIX}/lib/sane -Wl,-R${PREFIX}/lib/sane
-INCLUDES= -I${PREFIX}/include -I${LOCALBASE}/include
-CPPFLAGS+= ${INCLUDES}
-CONFIGURE_ENV+= CPPFLAGS="${INCLUDES}" LIBS="-lintl"
+CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include
+CONFIGURE_ENV+= LIBS="-lintl"
.include "../../mk/bsd.pkg.mk"