From f16b99d84dd5a79b534a91f1ba6afc704b73fb23 Mon Sep 17 00:00:00 2001 From: naddy Date: Wed, 25 Feb 2004 02:35:15 +0000 Subject: [PATCH] The sparc64 compiler is gcc3 now; don't require the gcc3 module. --- archivers/par2cmdline/Makefile | 6 +----- audio/bonk/Makefile | 6 +----- audio/xmms-bonk/Makefile | 7 +------ converters/wv2/Makefile | 6 ++---- devel/astyle/Makefile | 7 +------ devel/atlas/Makefile | 5 +---- devel/gengameng/Makefile | 6 +----- devel/gsl/Makefile | 7 +------ devel/lincvs/Makefile | 6 ++---- devel/tclcl/Makefile | 6 +----- games/afternoonstalker/Makefile | 6 +----- games/burgerspace/Makefile | 6 +----- games/bzflag/Makefile | 6 +----- games/cosmosmash/Makefile | 6 +----- games/eboard/Makefile | 6 ++---- games/enigma/Makefile | 6 +----- games/gnushogi/Makefile | 7 +------ games/gtkpool/Makefile | 7 +------ games/late/Makefile | 5 +---- games/oilwar/Makefile | 6 +----- graphics/ImageMagick/Makefile | 7 +------ graphics/png2ico/Makefile | 6 +----- graphics/xfig/Makefile | 5 +---- mail/mozilla-thunderbird/Makefile | 4 ++-- misc/cdrchive/Makefile | 7 ++----- misc/libutf8/Makefile | 6 +----- net/centericq/Makefile | 6 ++---- net/ettercap/Makefile | 5 +---- net/iperf/Makefile | 7 +------ net/mutella/Makefile | 6 +----- net/nam/Makefile | 6 +----- net/ns/Makefile | 6 +----- productivity/devtodo/Makefile | 6 +----- productivity/qhacc/Makefile | 6 ++---- textproc/gtkspell/Makefile | 6 +----- www/bk2site/Makefile | 7 +------ www/cgicc/Makefile | 7 +------ www/galeon/Makefile | 4 ++-- www/konqueror-embedded/Makefile | 6 ++---- www/mozilla-firefox/Makefile | 4 ++-- www/mozilla/Makefile | 4 ++-- www/squid/Makefile | 6 +----- www/tinyproxy/Makefile | 5 +---- x11/blackbox/Makefile | 7 +------ x11/fluxbox/Makefile | 5 +---- x11/paragui/Makefile | 7 +------ x11/pekwm/Makefile | 7 +------ x11/qlwm/Makefile | 6 ++---- x11/qt2-designer/Makefile | 5 +---- x11/qt2/Makefile | 5 +---- x11/qt3/Makefile | 6 +----- x11/waimea/Makefile | 6 +----- 52 files changed, 64 insertions(+), 245 deletions(-) diff --git a/archivers/par2cmdline/Makefile b/archivers/par2cmdline/Makefile index c0c456bf983..749ca0b7ddd 100644 --- a/archivers/par2cmdline/Makefile +++ b/archivers/par2cmdline/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2004/01/23 05:20:48 jolan Exp $ +# $OpenBSD: Makefile,v 1.2 2004/02/25 02:35:15 naddy Exp $ COMMENT= "command line implementation of the PAR v2.0 specification" DISTNAME= par2cmdline-0.3 @@ -15,10 +15,6 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes -MODULES=gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= C++ - CONFIGURE_STYLE=gnu post-install: diff --git a/audio/bonk/Makefile b/audio/bonk/Makefile index ab8ed736d18..c78c3e2fb08 100644 --- a/audio/bonk/Makefile +++ b/audio/bonk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2003/09/26 11:35:30 naddy Exp $ +# $OpenBSD: Makefile,v 1.9 2004/02/25 02:35:15 naddy Exp $ COMMENT= "lossy/lossless audio coder" @@ -16,10 +16,6 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}/ -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= C++ - MAKE_FLAGS= CXX='${CXX}' CXXFLAGS='${CXXFLAGS}' LIBS=-lossaudio FAKE_FLAGS= PREFIX='${WRKINST}${PREFIX}' INSTALL='${INSTALL_PROGRAM}' diff --git a/audio/xmms-bonk/Makefile b/audio/xmms-bonk/Makefile index 5b00548e728..ec9c39f49e6 100644 --- a/audio/xmms-bonk/Makefile +++ b/audio/xmms-bonk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2003/01/05 03:13:06 lebel Exp $ +# $OpenBSD: Makefile,v 1.6 2004/02/25 02:35:15 naddy Exp $ NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} @@ -21,11 +21,6 @@ MASTER_SITES= http://www.proustmedia.de/bonk-xmms/ LIB_DEPENDS= xmms.3::audio/xmms -# gcc3 -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - MAKE_ENV= CXX="${CXX}" ALL_TARGET= diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile index 338f1282643..3f186f62d58 100644 --- a/converters/wv2/Makefile +++ b/converters/wv2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2004/01/08 21:06:26 sturm Exp $ +# $OpenBSD: Makefile,v 1.4 2004/02/25 02:35:15 naddy Exp $ COMMENT= "library providing routines to access Microsoft Word/Excel files" @@ -17,9 +17,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MODULES= gettext gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ +MODULES= gettext BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS+= glib-2.0.0.0,glib-2.0.0.0::devel/glib2 \ diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile index dff3b5b36ca..675c0b32298 100644 --- a/devel/astyle/Makefile +++ b/devel/astyle/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2003/01/04 17:54:07 lebel Exp $ +# $OpenBSD: Makefile,v 1.10 2004/02/25 02:35:15 naddy Exp $ COMMENT= "indenter and formatter of C/C++/Java source files" @@ -17,11 +17,6 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=astyle/} EXTRACT_SUFX= .zip -# gcc3 -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" WRKDIST= ${WRKDIR} diff --git a/devel/atlas/Makefile b/devel/atlas/Makefile index 40386602d1d..6fff7800558 100644 --- a/devel/atlas/Makefile +++ b/devel/atlas/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2002/11/17 09:02:19 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.7 2004/02/25 02:35:15 naddy Exp $ COMMENT= "C++ reference implementation of the Atlas protocol" @@ -24,9 +24,6 @@ PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \ LIB_DEPENDS= SDL::devel/sdl \ sigc.0.0:libsigc++-*:devel/libsigc++ -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= C++ USE_X11= Yes SEPARATE_BUILD= concurrent diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile index 4785e84f4e1..e9c567cca03 100644 --- a/devel/gengameng/Makefile +++ b/devel/gengameng/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2003/11/21 21:02:57 sturm Exp $ +# $OpenBSD: Makefile,v 1.11 2004/02/25 02:35:15 naddy Exp $ COMMENT= "X11 game engine library" @@ -18,10 +18,6 @@ MASTER_SITES= http://www3.sympatico.ca/sarrazip/dev/ LIB_DEPENDS= SDL::devel/sdl \ SDL_image::devel/sdl-image -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ - USE_X11= Yes USE_LIBTOOL= Yes diff --git a/devel/gsl/Makefile b/devel/gsl/Makefile index 807ed2564d4..dd6d3bb61fc 100644 --- a/devel/gsl/Makefile +++ b/devel/gsl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2003/02/09 22:15:45 lebel Exp $ +# $OpenBSD: Makefile,v 1.15 2004/02/25 02:35:15 naddy Exp $ COMMENT= "GNU Scientific Library" @@ -16,9 +16,4 @@ PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu -# gcc3 -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - .include diff --git a/devel/lincvs/Makefile b/devel/lincvs/Makefile index 8f9185679e1..9a1372d866c 100644 --- a/devel/lincvs/Makefile +++ b/devel/lincvs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2003/12/03 20:18:36 sturm Exp $ +# $OpenBSD: Makefile,v 1.13 2004/02/25 02:35:15 naddy Exp $ COMMENT= "graphical CVS front-end using QT2" @@ -24,9 +24,7 @@ EXTRACT_SUFX= -0-generic-src.tgz USE_GMAKE= Yes USE_X11= Yes -MODULES= qt2 gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ +MODULES= qt2 BUILD_DEPENDS= ::x11/qt2-designer diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile index 95b6fb86d86..a843ee263b6 100644 --- a/devel/tclcl/Makefile +++ b/devel/tclcl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2003/11/01 20:08:40 sturm Exp $ +# $OpenBSD: Makefile,v 1.17 2004/02/25 02:35:15 naddy Exp $ # $FreeBSD: ports/devel/tclcl/Makefile,v 1.4 1999/11/28 18:31:57 steve Exp $ COMMENT= "Tcl/C++ interface used by ns and nam" @@ -16,10 +16,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ - MASTER_SITES= http://www.isi.edu/nsnam/dist/ LIB_DEPENDS= otcl.1::lang/otcl diff --git a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile index 84e6ac965a7..eeb9c04c7cc 100644 --- a/games/afternoonstalker/Makefile +++ b/games/afternoonstalker/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2003/11/21 21:02:58 sturm Exp $ +# $OpenBSD: Makefile,v 1.6 2004/02/25 02:35:15 naddy Exp $ COMMENT= "Night Stalker clone for X" @@ -20,10 +20,6 @@ MASTER_SITES= http://www3.sympatico.ca/sarrazip/dev/ LIB_DEPENDS= gengameng.4.1::devel/gengameng \ SDL_mixer::devel/sdl-mixer -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ - USE_X11= Yes CONFIGURE_STYLE= gnu diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile index 7a8dcbd3fbb..33e4e064a5d 100644 --- a/games/burgerspace/Makefile +++ b/games/burgerspace/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2003/11/21 21:02:58 sturm Exp $ +# $OpenBSD: Makefile,v 1.8 2004/02/25 02:35:15 naddy Exp $ COMMENT= "burgertime clone for X" @@ -19,10 +19,6 @@ MASTER_SITES= http://www3.sympatico.ca/sarrazip/dev/ LIB_DEPENDS= gengameng.4.1::devel/gengameng \ SDL_mixer::devel/sdl-mixer -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ - USE_X11= Yes CONFIGURE_STYLE= gnu diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index 362ae1fc260..84a39ead33a 100644 --- a/games/bzflag/Makefile +++ b/games/bzflag/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2004/02/20 06:49:11 jolan Exp $ +# $OpenBSD: Makefile,v 1.4 2004/02/25 02:35:15 naddy Exp $ BROKEN= "doesn't respect CXXFLAGS, problems loading data files" @@ -16,10 +16,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= C++ - USE_X11= Yes CONFIGURE_STYLE=gnu diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile index d15db6397e3..a8c52d8c0ea 100644 --- a/games/cosmosmash/Makefile +++ b/games/cosmosmash/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2003/11/21 21:02:58 sturm Exp $ +# $OpenBSD: Makefile,v 1.5 2004/02/25 02:35:15 naddy Exp $ COMMENT= "astrosmash clone for X" @@ -19,10 +19,6 @@ MASTER_SITES= http://www3.sympatico.ca/sarrazip/dev/ LIB_DEPENDS= gengameng.4.1::devel/gengameng \ SDL_mixer::devel/sdl-mixer -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ - USE_X11= Yes CONFIGURE_STYLE= gnu diff --git a/games/eboard/Makefile b/games/eboard/Makefile index f27d025845e..b9a4f1c3eea 100644 --- a/games/eboard/Makefile +++ b/games/eboard/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2003/10/01 23:13:23 fgsch Exp $ +# $OpenBSD: Makefile,v 1.25 2004/02/25 02:35:16 naddy Exp $ COMMENT= "gtk+ chess board interface" @@ -19,9 +19,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eboard/} LIB_DEPENDS= Imlib.19,gdk_imlib::graphics/imlib -MODULES= gettext gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ +MODULES= gettext USE_X11= Yes AUTOCONF_NEW= Yes diff --git a/games/enigma/Makefile b/games/enigma/Makefile index cbd21256141..c3e4e96be0a 100644 --- a/games/enigma/Makefile +++ b/games/enigma/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2003/12/03 01:00:57 jolan Exp $ +# $OpenBSD: Makefile,v 1.7 2004/02/25 02:35:16 naddy Exp $ COMMENT= "Oxyd/Rock'n'Roll clone" @@ -15,10 +15,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= C++ - MASTER_SITES= http://savannah.nongnu.org/download/enigma/ LIB_DEPENDS= SDL_image.1::devel/sdl-image \ diff --git a/games/gnushogi/Makefile b/games/gnushogi/Makefile index 50fa3cf854d..79ffa359bb6 100644 --- a/games/gnushogi/Makefile +++ b/games/gnushogi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2003/02/09 21:52:54 lebel Exp $ +# $OpenBSD: Makefile,v 1.21 2004/02/25 02:35:16 naddy Exp $ # COMMENT= "GNU version of Shogi" @@ -22,11 +22,6 @@ NO_REGRESS= Yes DOCFILES= shogi.rules tutorial1.gam tutorial2.gam -# gcc3 -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/gnushogi ${INSTALL_PROGRAM} ${WRKSRC}/gnushogi ${PREFIX}/bin diff --git a/games/gtkpool/Makefile b/games/gtkpool/Makefile index 4053b81c553..792414b9bc4 100644 --- a/games/gtkpool/Makefile +++ b/games/gtkpool/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2003/01/05 00:25:48 lebel Exp $ +# $OpenBSD: Makefile,v 1.16 2004/02/25 02:35:16 naddy Exp $ COMMENT= "simple gtk+ pool simulation game" @@ -17,11 +17,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -# gcc3 -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - USE_X11= Yes NO_REGRESS= Yes diff --git a/games/late/Makefile b/games/late/Makefile index 36a2fd5a647..4a5f82b12b9 100644 --- a/games/late/Makefile +++ b/games/late/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2004/02/01 06:55:03 jolan Exp $ +# $OpenBSD: Makefile,v 1.4 2004/02/25 02:35:16 naddy Exp $ COMMENT= "puzzle game resembling the arcade game Qix" DISTNAME= late-0.0.3 @@ -16,9 +16,6 @@ PERMIT_PACKAGE_FTP= Yes MAINTAINER= Jolan Luff -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= C++ LIB_DEPENDS= SDL_image::devel/sdl-image USE_X11= Yes diff --git a/games/oilwar/Makefile b/games/oilwar/Makefile index 5f33eb5642a..324baa7e4dd 100644 --- a/games/oilwar/Makefile +++ b/games/oilwar/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2003/05/12 08:23:47 jolan Exp $ +# $OpenBSD: Makefile,v 1.4 2004/02/25 02:35:16 naddy Exp $ COMMENT= "sdl shoot 'em up; stop evil army from getting your oil" @@ -17,10 +17,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= C++ - USE_X11= Yes NO_REGRESS= Yes diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index b772eaa5e96..f5fed2a9c5b 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.62 2004/02/06 22:44:06 sturm Exp $ +# $OpenBSD: Makefile,v 1.63 2004/02/25 02:35:16 naddy Exp $ COMMENT= "display and manipulate images under X11" @@ -27,11 +27,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -# gcc3 -MODULES+= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - .if ${MACHINE_ARCH} == "sparc64" PATCH_LIST= patch-* gcc-* .endif diff --git a/graphics/png2ico/Makefile b/graphics/png2ico/Makefile index 3844365de71..c96feabb812 100644 --- a/graphics/png2ico/Makefile +++ b/graphics/png2ico/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2003/08/24 00:34:16 naddy Exp $ +# $OpenBSD: Makefile,v 1.3 2004/02/25 02:35:16 naddy Exp $ COMMENT= "Convert PNG images to Windows .ico files" @@ -17,10 +17,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= C++ - LIB_DEPENDS= png.3::graphics/png MAKE_ENV= CXX="${CXX}" diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index 048846a3fee..78da3ddd3b8 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2003/04/04 14:28:36 naddy Exp $ +# $OpenBSD: Makefile,v 1.27 2004/02/25 02:35:16 naddy Exp $ COMMENT= "CAD drawing program for X11" @@ -24,9 +24,6 @@ LIB_DEPENDS= jpeg.62::graphics/jpeg \ RUN_DEPENDS= ::print/transfig \ ::textproc/xpdf -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 - MAKE_FLAGS= XAPPLOADDIR="${PREFIX}/lib/X11/app-defaults" \ XFIGDOCDIR="${PREFIX}/share/doc/xfig" \ XFIGLIBDIR="${PREFIX}/lib/X11/xfig" diff --git a/mail/mozilla-thunderbird/Makefile b/mail/mozilla-thunderbird/Makefile index 821762b4263..b9a58a95e39 100644 --- a/mail/mozilla-thunderbird/Makefile +++ b/mail/mozilla-thunderbird/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2004/02/23 17:58:56 wilfried Exp $ +# $OpenBSD: Makefile,v 1.5 2004/02/25 02:35:16 naddy Exp $ ONLY_FOR_ARCHS= alpha i386 sparc sparc64 @@ -23,7 +23,7 @@ MASTER_SITES= http://ftp.eu.mozilla.org/pub/mozilla.org/thunderbird/releases/${V DISTFILES= thunderbird-${VER}-source.tar.bz2 MODULES= gcc3 -MODGCC3_ARCHES= alpha sparc64 +MODGCC3_ARCHES= alpha MODGCC3_LANGS= C++ BUILD_DEPENDS= :zip->=2.3:archivers/zip \ :pkgconfig-*:devel/pkgconfig diff --git a/misc/cdrchive/Makefile b/misc/cdrchive/Makefile index 8db73303044..cd1a441c1b7 100644 --- a/misc/cdrchive/Makefile +++ b/misc/cdrchive/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2003/11/16 19:33:08 sturm Exp $ +# $OpenBSD: Makefile,v 1.10 2004/02/25 02:35:16 naddy Exp $ COMMENT= "Qt-based CD creation tool" @@ -19,10 +19,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://www.drahthaar.clara.net/ \ http://www.jakemsr.com/openbsd/ports/ -MODULES= qt2 gcc3 - -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ +MODULES= qt2 RUN_DEPENDS= :cdrtools-*:sysutils/cdrtools diff --git a/misc/libutf8/Makefile b/misc/libutf8/Makefile index 52412ffe62b..3882cee5094 100644 --- a/misc/libutf8/Makefile +++ b/misc/libutf8/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2003/02/09 22:27:01 lebel Exp $ +# $OpenBSD: Makefile,v 1.10 2004/02/25 02:35:16 naddy Exp $ COMMENT= "provides UTF-8 locale support" @@ -19,8 +19,4 @@ CONFIGURE_STYLE= gnu dest CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/autoconf -# gcc3 -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 - .include diff --git a/net/centericq/Makefile b/net/centericq/Makefile index dbc18faf901..f1465c88ded 100644 --- a/net/centericq/Makefile +++ b/net/centericq/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2004/02/03 08:37:55 brad Exp $ +# $OpenBSD: Makefile,v 1.25 2004/02/25 02:35:16 naddy Exp $ COMMENT= "curses-based icq client implementation" @@ -18,9 +18,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MODULES= gcc3 gettext -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ +MODULES= gettext USE_GMAKE= Yes CONFIGURE_STYLE= gnu diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile index e068b3b744a..5fa18a94aea 100644 --- a/net/ettercap/Makefile +++ b/net/ettercap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2003/11/02 00:38:32 margarida Exp $ +# $OpenBSD: Makefile,v 1.26 2004/02/25 02:35:16 naddy Exp $ NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} @@ -21,9 +21,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 - FLAVORS= no_x11 FLAVOR?= diff --git a/net/iperf/Makefile b/net/iperf/Makefile index 5756c19023e..d100becbd8c 100644 --- a/net/iperf/Makefile +++ b/net/iperf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2003/01/05 03:18:50 lebel Exp $ +# $OpenBSD: Makefile,v 1.8 2004/02/25 02:35:16 naddy Exp $ COMMENT= "tool for measuring maximum TCP and UDP bandwidth" @@ -16,11 +16,6 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://dast.nlanr.net/Projects/Iperf/ -# gcc3 -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - MAKE_ENV= CC="${CC}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" NO_REGRESS= Yes diff --git a/net/mutella/Makefile b/net/mutella/Makefile index 25cfa23dd49..b618d789c1b 100644 --- a/net/mutella/Makefile +++ b/net/mutella/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2003/11/20 17:46:13 sturm Exp $ +# $OpenBSD: Makefile,v 1.3 2004/02/25 02:35:16 naddy Exp $ COMMENT= "gnutella client with an easy to use interface" @@ -17,10 +17,6 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mutella/} -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ - SEPARATE_BUILD= simple CONFIGURE_STYLE= gnu diff --git a/net/nam/Makefile b/net/nam/Makefile index d78936d689d..5ba92775124 100644 --- a/net/nam/Makefile +++ b/net/nam/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2003/11/01 20:08:40 sturm Exp $ +# $OpenBSD: Makefile,v 1.19 2004/02/25 02:35:17 naddy Exp $ # $FreeBSD: ports/net/nam/Makefile,v 1.3 1999/11/29 03:46:08 steve Exp $ COMMENT= "UCB/LBNL Network Animator" @@ -22,10 +22,6 @@ PERMIT_DISTFILES_FTP= Yes BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= :tclcl->=1.0b13:devel/tclcl -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ - WRKDIST= ${WRKDIR}/${PKGNAME} CONFIGURE_STYLE=gnu diff --git a/net/ns/Makefile b/net/ns/Makefile index 7beecec55ff..4b6024c23d9 100644 --- a/net/ns/Makefile +++ b/net/ns/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2003/11/01 20:05:01 sturm Exp $ +# $OpenBSD: Makefile,v 1.24 2004/02/25 02:35:17 naddy Exp $ # $FreeBSD: ports/net/ns/Makefile,v 1.3 1999/11/28 18:31:26 steve Exp $ COMMENT= "UCB/LBNL Network Simulator Version 2" @@ -22,10 +22,6 @@ HOMEPAGE= http://www.isi.edu/nsnam/ns/ LIB_DEPENDS= otcl::lang/otcl \ tclcl::devel/tclcl -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ - CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --with-tcl-ver=8.3 --with-tk-ver=8.3 diff --git a/productivity/devtodo/Makefile b/productivity/devtodo/Makefile index 72ecf22ad7a..f60673e7c74 100644 --- a/productivity/devtodo/Makefile +++ b/productivity/devtodo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2003/12/04 23:07:25 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.7 2004/02/25 02:35:17 naddy Exp $ COMMENT= "reminder/task program aimed at developers" @@ -18,10 +18,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - CONFIGURE_STYLE= gnu EXAMPLES= doc/scripts.* doc/todorc.example contrib/* diff --git a/productivity/qhacc/Makefile b/productivity/qhacc/Makefile index d7ebeeac6fb..41a98bf3c7c 100644 --- a/productivity/qhacc/Makefile +++ b/productivity/qhacc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2003/11/18 19:25:00 sturm Exp $ +# $OpenBSD: Makefile,v 1.7 2004/02/25 02:35:17 naddy Exp $ COMMENT= "qt home accounting program" @@ -10,9 +10,7 @@ MASTER_SITES= ${HOMEPAGE} \ MAINTAINER= Marc Espie -MODULES= qt2 gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ +MODULES= qt2 MAKE_ENV= QTDIR=${MODQT_LIBDIR} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MAKE_FLAGS= QTLIBDIR=${MODQT_LIBDIR} QTINCDIR=${MODQT_INCDIR} diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile index 759ec033a25..e3659d770b9 100644 --- a/textproc/gtkspell/Makefile +++ b/textproc/gtkspell/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2004/02/22 01:37:02 jolan Exp $ +# $OpenBSD: Makefile,v 1.6 2004/02/25 02:35:17 naddy Exp $ COMMENT= "gtk2 spelling checker" DISTNAME= gtkspell-2.0.5 @@ -18,10 +18,6 @@ PERMIT_PACKAGE_FTP= Yes USE_X11= Yes MODULES+= gettext -MODULES+= gcc3 - -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= C C++ BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS= aspell.15.2::textproc/aspell/core \ diff --git a/www/bk2site/Makefile b/www/bk2site/Makefile index b54733c1a1f..5c1c4adbab3 100644 --- a/www/bk2site/Makefile +++ b/www/bk2site/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2004/01/25 21:10:51 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.13 2004/02/25 02:35:17 naddy Exp $ COMMENT= "convert Netscape bookmarks into a Yahoo-like website" @@ -14,11 +14,6 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bk2site/} -# gcc3 -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --enable-standard-datadir diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile index 2689a885db9..b5fae079a6b 100644 --- a/www/cgicc/Makefile +++ b/www/cgicc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2003/10/18 19:44:42 sturm Exp $ +# $OpenBSD: Makefile,v 1.8 2004/02/25 02:35:17 naddy Exp $ COMMENT= "c++ compliant CGI applications libraries" @@ -23,9 +23,4 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/example ${WRKSRC}/support FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} \ docdir=${DESTDIR}${PREFIX}/share/doc/cgicc -# gcc3 -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - .include diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 17cd90cbf95..4ca46d0f48a 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2004/01/18 10:49:03 wilfried Exp $ +# $OpenBSD: Makefile,v 1.11 2004/02/25 02:35:17 naddy Exp $ COMMENT= "GNOME web browser based on gecko" @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galeon/} MODULES= gettext gcc3 -MODGCC3_ARCHES= alpha sparc64 powerpc +MODGCC3_ARCHES= alpha powerpc MODGCC3_LANGS= C++ BUILD_DEPENDS= :mozilla-${MOZ}:www/mozilla \ diff --git a/www/konqueror-embedded/Makefile b/www/konqueror-embedded/Makefile index 7f721250ef0..f567ad9c7c7 100644 --- a/www/konqueror-embedded/Makefile +++ b/www/konqueror-embedded/Makefile @@ -1,11 +1,9 @@ -# $OpenBSD: Makefile,v 1.10 2003/11/19 21:56:39 sturm Exp $ +# $OpenBSD: Makefile,v 1.11 2004/02/25 02:35:17 naddy Exp $ COMMENT='stand-alone Qt-based web browser' CATEGORIES=www x11 -MODULES= qt2 gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ +MODULES= qt2 DATE= 20030705 DISTNAME=konqueror-embedded-snapshot-${DATE} diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile index 20f2a450f0e..3c1c99a5745 100644 --- a/www/mozilla-firefox/Makefile +++ b/www/mozilla-firefox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2004/02/23 17:58:56 wilfried Exp $ +# $OpenBSD: Makefile,v 1.3 2004/02/25 02:35:17 naddy Exp $ ONLY_FOR_ARCHS= alpha i386 sparc sparc64 @@ -23,7 +23,7 @@ MASTER_SITES= http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/ DISTFILES= firefox-source-${VER}.tar.bz2 MODULES= gcc3 -MODGCC3_ARCHES= alpha sparc64 +MODGCC3_ARCHES= alpha MODGCC3_LANGS= C++ BUILD_DEPENDS= :zip->=2.3:archivers/zip \ :pkgconfig-*:devel/pkgconfig diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 77edcfda9a5..d071c29383a 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.66 2004/02/15 19:44:01 wilfried Exp $ +# $OpenBSD: Makefile,v 1.67 2004/02/25 02:35:17 naddy Exp $ ONLY_FOR_ARCHS= alpha i386 sparc sparc64 @@ -37,7 +37,7 @@ SUBPACKAGE?= RUN_DEPENDS= ::www/mozilla .else MODULES= gcc3 -MODGCC3_ARCHES= alpha sparc64 +MODGCC3_ARCHES= alpha MODGCC3_LANGS= C++ BUILD_DEPENDS= :zip->=2.3:archivers/zip \ :pkgconfig-*:devel/pkgconfig diff --git a/www/squid/Makefile b/www/squid/Makefile index 4b436da6697..5f0d238e051 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.57 2004/02/16 10:21:20 brad Exp $ +# $OpenBSD: Makefile,v 1.58 2004/02/25 02:35:17 naddy Exp $ COMMENT= "WWW and FTP proxy cache and accelerator" @@ -59,10 +59,6 @@ SUBST_VARS= SQUIDDIR FLAVORS= transparent FLAVOR?= -# Gcc 3 -MODULES+= gcc3 -MODGCC3_ARCHES= sparc64 - SEPARATE_BUILD= concurrent CONFIGURE_STYLE= autoconf MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/cfgaux diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile index d1e1458b438..33dc0c7cd63 100644 --- a/www/tinyproxy/Makefile +++ b/www/tinyproxy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2003/11/03 00:49:29 margarida Exp $ +# $OpenBSD: Makefile,v 1.9 2004/02/25 02:35:17 naddy Exp $ COMMENT= "lightweight HTTP/SSL proxy" @@ -18,9 +18,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 - CONFIGURE_STYLE= simple CONFIGURE_ARGS+= --with-config=${SYSCONFDIR}/tinyproxy/tinyproxy.conf MAKE_FLAGS= CFLAGS="${CFLAGS}" diff --git a/x11/blackbox/Makefile b/x11/blackbox/Makefile index 5d98289c59f..d46d4ce4739 100644 --- a/x11/blackbox/Makefile +++ b/x11/blackbox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2003/01/05 03:53:59 lebel Exp $ +# $OpenBSD: Makefile,v 1.34 2004/02/25 02:35:17 naddy Exp $ COMMENT= "small & pretty window manager for 8 and more bits displays" @@ -18,11 +18,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -# gcc3 -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - USE_X11= Yes CONFIGURE_STYLE= gnu diff --git a/x11/fluxbox/Makefile b/x11/fluxbox/Makefile index 17c3bfd37e4..69b8c2219c9 100644 --- a/x11/fluxbox/Makefile +++ b/x11/fluxbox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2004/01/30 17:04:48 lebel Exp $ +# $OpenBSD: Makefile,v 1.27 2004/02/25 02:35:17 naddy Exp $ COMMENT= "window manager based on the original Blackbox code" @@ -26,9 +26,6 @@ AUTOCONF_VERSION= 2.54 CONFIGURE_ARGS= --enable-kde --enable-xinerama USE_GMAKE= Yes -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ USE_X11= Yes SUBST_VARS= VERSION diff --git a/x11/paragui/Makefile b/x11/paragui/Makefile index 57119e6fa67..37b24aa3058 100644 --- a/x11/paragui/Makefile +++ b/x11/paragui/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2003/10/08 17:13:17 sturm Exp $ +# $OpenBSD: Makefile,v 1.13 2004/02/25 02:35:18 naddy Exp $ COMMENT= "cross-platform high-level application framework" @@ -24,11 +24,6 @@ LIB_DEPENDS= SDL::devel/sdl \ SDL_ttf::devel/sdl-ttf \ SDL_image::devel/sdl-image -# gcc3 -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - USE_X11= Yes USE_GMAKE= Yes diff --git a/x11/pekwm/Makefile b/x11/pekwm/Makefile index de11977e9d4..e17571cbce4 100755 --- a/x11/pekwm/Makefile +++ b/x11/pekwm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2003/12/05 08:20:40 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.4 2004/02/25 02:35:18 naddy Exp $ COMMENT= "aewm++ based pretty themable window manager" @@ -18,11 +18,6 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}files/source/ -# gcc3 -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS+= c++ - USE_X11= Yes CONFIGURE_STYLE= simple CONFIGURE_ARGS+= --prefix=${LOCALBASE} diff --git a/x11/qlwm/Makefile b/x11/qlwm/Makefile index 2f592af920e..cf497f760a6 100644 --- a/x11/qlwm/Makefile +++ b/x11/qlwm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2003/11/18 20:53:11 sturm Exp $ +# $OpenBSD: Makefile,v 1.10 2004/02/25 02:35:18 naddy Exp $ COMMENT= "qt-based window manager" @@ -21,9 +21,7 @@ DOCDIR=${PREFIX}/share/doc/qlwm USE_X11= Yes -MODULES= qt2 gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ +MODULES= qt2 MAKE_FLAGS=INCPATH='-I${X11BASE}/include -I${MODQT_INCDIR}' \ LFLAGS='-L${X11BASE}/lib -L${MODQT_LIBDIR} -L${LOCALBASE}/lib' \ diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile index 10ad6b1afac..1c2d5657ca2 100644 --- a/x11/qt2-designer/Makefile +++ b/x11/qt2-designer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2003/11/18 20:53:11 sturm Exp $ +# $OpenBSD: Makefile,v 1.17 2004/02/25 02:35:18 naddy Exp $ COMMENT= "designer for qt2" @@ -13,9 +13,6 @@ EXTRACT_ONLY= BUILD_DEPENDS= ::x11/qt2:configure RUN_DEPENDS= ::x11/qt2,-html -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= c++ HOMEPAGE= http://www.trolltech.com/qt/ diff --git a/x11/qt2/Makefile b/x11/qt2/Makefile index 30d03719bc4..3884435db39 100644 --- a/x11/qt2/Makefile +++ b/x11/qt2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2004/02/04 07:39:19 sturm Exp $ +# $OpenBSD: Makefile,v 1.44 2004/02/25 02:35:18 naddy Exp $ # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $ COMMENT= "C++ X11 GUI toolkit" COMMENT-examples= "examples and tutorial for qt2" @@ -23,9 +23,6 @@ PERMIT_DISTFILES_FTP= Yes #CXXFLAGS+= -g -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= C++ USE_X11= Yes USE_GMAKE= Yes MAKE_ENV= QTDIR="${WRKDIST}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \ diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile index aa2d9265336..20340ff78bc 100644 --- a/x11/qt3/Makefile +++ b/x11/qt3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2004/02/04 07:39:19 sturm Exp $ +# $OpenBSD: Makefile,v 1.34 2004/02/25 02:35:18 naddy Exp $ # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $ COMMENT= "C++ X11 GUI toolkit" @@ -35,10 +35,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= C++ - USE_X11= Yes MAKE_ENV= QTDIR="${WRKDIST}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \ SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS}" \ diff --git a/x11/waimea/Makefile b/x11/waimea/Makefile index 428d943eb0c..f7d57d0d659 100644 --- a/x11/waimea/Makefile +++ b/x11/waimea/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2003/03/29 15:02:21 couderc Exp $ +# $OpenBSD: Makefile,v 1.5 2004/02/25 02:35:18 naddy Exp $ COMMENT= "Virtual desktop manager for X11" @@ -18,10 +18,6 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=waimea/} -MODULES= gcc3 -MODGCC3_ARCHES= sparc64 -MODGCC3_LANGS= C++ - USE_X11= Yes USE_GMAKE= Yes CONFIGURE_STYLE= gnu