summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/controlcenter/Makefile3
-rw-r--r--x11/fltk/Makefile3
-rw-r--r--x11/fox/Makefile4
-rw-r--r--x11/gdm/Makefile4
-rw-r--r--x11/gnome-applets/Makefile3
-rw-r--r--x11/gnome-core/Makefile3
-rw-r--r--x11/gnome-libs/Makefile5
-rw-r--r--x11/gtk/Makefile4
-rw-r--r--x11/wmfire/Makefile4
-rw-r--r--x11/wmfstatus/Makefile3
-rw-r--r--x11/wxGTK/Makefile3
-rw-r--r--x11/xfce/Makefile4
-rw-r--r--x11/xmountains/Makefile4
-rw-r--r--x11/xteddy2/Makefile4
14 files changed, 21 insertions, 30 deletions
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 3a02a0c8e22..f9a39002e1c 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/04/06 22:08:09 rh Exp $
+# $NetBSD: Makefile,v 1.30 2001/06/11 06:34:56 jlam Exp $
DISTNAME= control-center-1.4.0.1
CATEGORIES= x11 gnome
@@ -26,7 +26,6 @@ LOCALSTATEDIR= /var/gnome
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR}
CONFIGURE_ARGS+= --with-glib-prefix=${LOCALBASE}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include # libintl.h
post-patch:
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 804ac1f5bff..8d659b9889f 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/06/11 02:05:16 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/06/11 06:34:56 jlam Exp $
#
DISTNAME= ${PKGNAME}-source
@@ -25,7 +25,6 @@ USE_LIBTOOL= # defined
GNU_CONFIGURE= # defined
CONFIGURE_ARGS= --enable-libtool=${LIBTOOL}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.include "../../graphics/Mesa/buildlink.mk"
diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index a48bf7fc58a..74018ee62a9 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/27 07:57:38 sakamoto Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:57 jlam Exp $
# FreeBSD Id: ports/x11-toolkits/fox/Makefile,v 1.14 2001/02/23 19:00:05 knu Exp
DISTNAME= fox-0.99.172
@@ -24,7 +24,7 @@ PATCH_DIST_STRIP=-p1
CPPFLAGS+= -I..
X_CFLAGS= -DUSE_XUNICODE
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" X_CFLAGS="${X_CFLAGS}"
+CONFIGURE_ENV+= X_CFLAGS="${X_CFLAGS}"
.endif
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index a67a03a2c5f..57c19a36163 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/04/02 20:07:03 zuntum Exp $
+# $NetBSD: Makefile,v 1.21 2001/06/11 06:34:57 jlam Exp $
DISTNAME= gdm-2.2.0
CATEGORIES= x11 gnome
@@ -25,7 +25,7 @@ LOCALSTATEDIR= /var/gnome
EVAL_PREFIX+= KDEBASEDIR=kdebase
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LIBS="${LIBS}" \
+CONFIGURE_ENV+= LIBS="${LIBS}" \
LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
GDMOWN=${GDMOWN} GDMGRP=${GDMGRP}
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 1ec0f86ecc9..42616c78ea7 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/04/07 10:58:33 rh Exp $
+# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:57 jlam Exp $
#
DISTNAME= gnome-applets-1.4.0.1
@@ -19,7 +19,6 @@ USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
AUTOGEN_ENV= NOCONFIGURE=1
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index aff35560767..ba3fd7dab46 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2001/05/26 13:28:40 rh Exp $
+# $NetBSD: Makefile,v 1.66 2001/06/11 06:34:57 jlam Exp $
DISTNAME= gnome-core-1.4.0.4
CATEGORIES= x11 gnome
@@ -28,7 +28,6 @@ LOCALSTATEDIR= /var/gnome
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR}
CPPFLAGS+= -I${LOCALBASE}/include # libintl.h
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
USE_PERL5= YES
PERL_SCRIPTS= help-browser/gnome-convert help-browser/gnome-download
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 60b03a17726..59ecbf8006d 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2001/04/06 21:47:04 rh Exp $
+# $NetBSD: Makefile,v 1.61 2001/06/11 06:34:58 jlam Exp $
DISTNAME= gnome-libs-1.2.13
CATEGORIES= x11 gnome
@@ -25,8 +25,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--with-glib-prefix=${LOCALBASE} \
--with-kde-datadir=${X11PREFIX}/share/kde
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
- LOCALBASE=${LOCALBASE} \
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \
X11BASE=${X11BASE}
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index ab4e635298b..90151661559 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2001/04/30 04:16:12 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2001/06/11 06:34:58 jlam Exp $
DISTNAME= gtk+-1.2.10
CATEGORIES= x11
@@ -23,7 +23,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-xinput=xfree
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" X_LDFLAGS="${X_LDFLAGS}"
+CONFIGURE_ENV+= X_LDFLAGS="${X_LDFLAGS}"
INFO_FILES= gdk.info gtk.info
diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile
index 0455f34541b..8ef24f2e4e1 100644
--- a/x11/wmfire/Makefile
+++ b/x11/wmfire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/10 13:19:27 agc Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:58 jlam Exp $
#
DISTNAME= wmfire-0.0.3.8
@@ -11,7 +11,7 @@ COMMENT= Displays generated fire according to system load
USE_X11= YES
USE_XPM= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS=-I${X11BASE}/include
+CPPFLAGS+= -I${X11BASE}/include
MAKE_ENV+= XPMDIR=${XPMDIR}
EVAL_PREFIX= XPMDIR=xpm
diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile
index 9048a1c5a58..593307c2c6b 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:06:54 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:58 jlam Exp $
DISTNAME= wmfstatus-0.3
CATEGORIES= x11
@@ -12,7 +12,6 @@ USE_X11= YES
USE_XPM= YES
CPPFLAGS= -I${X11BASE}/include
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
WRKSRC= ${WRKDIR}/${DISTNAME}/wmfstatus
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index 08b7cb51576..0670cc4c72c 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/05/22 09:32:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:58 jlam Exp $
#
DISTNAME= wxGTK-2.2.3
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+= --with-zlib=sys
CONFIGURE_ARGS+= --with-libpng=sys
CONFIGURE_ARGS+= --with-libtiff=sys
CONFIGURE_ARGS+= --disable-threads
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index 68e32ad3a72..ed6bcf9c2b7 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/04/02 20:06:15 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/06/11 06:34:59 jlam Exp $
DISTNAME= xfce-3.6.3
CATEGORIES= x11
@@ -29,8 +29,6 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/share
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc
CONFIGURE_ARGS+= --enable-imlib=${IMLIBDIR}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-
# work around bug in configure script
CONFIGURE_ENV+= gt_cv_func_gettext_libintl="yes"
diff --git a/x11/xmountains/Makefile b/x11/xmountains/Makefile
index b430c849fd6..94de7c14780 100644
--- a/x11/xmountains/Makefile
+++ b/x11/xmountains/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:07:18 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:59 jlam Exp $
#
DISTNAME= xmountains_2.5
@@ -17,7 +17,7 @@ NO_WRKSUBDIR= yes
USE_IMAKE= yes
DIST_SUBDIR= xmountains
-MAKE_ENV+= CPPFLAGS="-DVROOT"
+CPPFLAGS+= -DVROOT
# XXX Hack. We really want an OTHER_SITES/OTHERFILES mechanism for this.
do-patch:
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index 0afe4c151eb..23cc83913bd 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:07:26 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:59 jlam Exp $
DISTNAME= xteddy-2.0.1
CATEGORIES= x11 games
@@ -15,7 +15,7 @@ CONFLICT+= xteddy-1.*
GNU_CONFIGURE= yes
USE_X11= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include"
+CPPFLAGS+= -I${X11BASE}/include
LDFLAGS+= -L${X11BASE}/lib -R${X11BASE}/lib # for libImlib
pre-configure:
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-02 00:05:15 +0000