diff options
| author | danw <danw> | 2000-06-24 16:44:01 +0000 |
|---|---|---|
| committer | danw <danw> | 2000-06-24 16:44:01 +0000 |
| commit | bb3460a119051e23bdbb58eb694832ad59737e48 (patch) | |
| tree | 0df1557c5d516ae0bb66ede7abc1258a9e617dc3 /x11 | |
| parent | 3705d9b1164ed7a6c294426b3d16aa1bef7933e1 (diff) | |
| download | pkgsrc-bb3460a119051e23bdbb58eb694832ad59737e48.tar.gz | |
After talking with Matthias Scheler, revert support for building without
libgtop, to force people to make the (simple but not completely obvious)
changes needed to get libgtop to build on new arches.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-applets/Makefile | 11 | ||||
| -rw-r--r-- | x11/gnome/Makefile | 11 |
2 files changed, 4 insertions, 18 deletions
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index c3f7697345d..6c053827810 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/06/03 17:31:44 rh Exp $ +# $NetBSD: Makefile,v 1.3 2000/06/24 16:44:03 danw Exp $ # DISTNAME= gnome-applets-1.2.0 @@ -9,20 +9,13 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnome.org/ DEPENDS+= gnome-core-*:../../x11/gnome-core +DEPENDS+= libgtop-*:../../devel/libgtop USE_GMAKE= yes USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" -.include "../../mk/bsd.prefs.mk" - -.if (${OPSYS} == "NetBSD") -.if (${MACHINE_ARCH} == arm32) || (${MACHINE_ARCH} == i386) || \ - (${MACHINE_ARCH} == m68k) -DEPENDS+= libgtop-*:../../devel/libgtop -.endif - .if exists(/usr/include/machine/apmvar.h) CPPFLAGS+= -D__NetBSD_APM__ .endif diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile index 5cb392c9b5d..39bfc37ca8c 100644 --- a/x11/gnome/Makefile +++ b/x11/gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/06/24 03:30:27 danw Exp $ +# $NetBSD: Makefile,v 1.12 2000/06/24 16:44:03 danw Exp $ DISTNAME= gnome-1.2.0 CATEGORIES= x11 gnome @@ -26,17 +26,10 @@ DEPENDS+= gnome-utils>=1.0.51:../../misc/gnome-utils DEPENDS+= gnumeric>=0.52:../../math/gnumeric DEPENDS+= gtk-->=1.0.3:../gtk-- DEPENDS+= gtk-engines>=0.8:../gtk-engines +DEPENDS+= gtop>=1.0.9:../../sysutils/gtop DEPENDS+= xchat>=1.4.1:../../net/xchat DEPENDS+= xscreensaver-gnome>=3.24:../xscreensaver-gnome -.include "../../mk/bsd.prefs.mk" -.if (${OPSYS} == "NetBSD") -.if (${MACHINE_ARCH} == arm32) || (${MACHINE_ARCH} == i386) || \ - (${MACHINE_ARCH} == m68k) -DEPENDS+= gtop>=1.0.9:../../sysutils/gtop -.endif -.endif - USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes |