cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- these ports were already ONLY_FOR_ARCHS=${GCC4_ARCHS} by using the gcc4

Browse Source 
module on all arches. so remove the module usage and set ONLY_FOR_ARCHS instead

from brad
This commit is contained in:
jasper 2011-07-11 12:08:24 +00:00
parent c0ee56f8b9
commit eafc4b4ea9
5 changed files with 23 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
audio/lmms/Makefile
View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.2 2010/11/15 00:22:47 espie Exp $
# $OpenBSD: Makefile,v 1.3 2011/07/11 12:08:24 jasper Exp $
SHARED_ONLY = Yes
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
COMMENT = music studio with tracking, sampling and MIDI
DISTNAME = lmms-0.4.8
REVISION = 0
CATEGORIES = audio
HOMEPAGE = http://lmms.sourceforge.net/
@ -24,9 +27,7 @@ WANTLIB = ICE SM QtGui QtXml X11 Xext Xft Xinerama c fltk jack \
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=lmms/}
EXTRACT_SUFX = .tar.bz2
MODULES = x11/qt4 devel/cmake gcc4
MODGCC4_ARCHES = *
MODGCC4_LANGS = c c++
MODULES = x11/qt4 devel/cmake
RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info

23
editors/subtitleeditor/Makefile
View File

@ -1,4 +1,6 @@
# $OpenBSD: Makefile,v 1.19 2010/11/26 07:20:11 espie Exp $
# $OpenBSD: Makefile,v 1.20 2011/07/11 12:08:24 jasper Exp $
ONLY_FOR_ARCHS= ${GCC4_ARCHS}
SHARED_ONLY= Yes
@ -6,6 +8,7 @@ COMMENT= GTK+2 subtitles editor
V= 0.37.1
DISTNAME= subtitleeditor-${V}
REVISION= 0
CATEGORIES= graphics editors
@ -21,16 +24,6 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://download.gna.org/subtitleeditor/${V:R}/
.include <bsd.own.mk>
.if ${COMPILER_VERSION:L:Mgcc4*}
WANTLIB += stdc++
.else
MODULES += gcc4
MODGCC4_ARCHES =*
MODGCC4_LANGS = c++
WANTLIB += estdc++
.endif
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 atkmm-1.6 c cairo
WANTLIB += cairomm-1.0 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
@ -43,7 +36,7 @@ WANTLIB += pcre enchant xml++-2.6 gstaudio-0.10 gsttag-0.10
WANTLIB += gstinterfaces-0.10 gstvideo-0.10 gstpbutils-0.10
WANTLIB += GL Xxf86vm drm gstcontroller-0.10 gstdataprotocol-0.10
WANTLIB += gstreamermm-0.10 gstcdda-0.10 gstnetbuffer-0.10 gstrtp-0.10
WANTLIB += stdc++
BUILD_DEPENDS= multimedia/gstreamer-0.10/plugins-good \
devel/iso-codes
@ -59,9 +52,9 @@ RUN_DEPENDS= multimedia/gstreamer-0.10/plugins-good \
MODULES+= devel/gettext \
textproc/intltool
USE_GMAKE= Yes
USE_LIBTOOL= Yes
USE_GROFF = Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
USE_GROFF= Yes
LIBTOOL_FLAGS= --tag=disable-static

10
games/rocksndiamonds/Makefile
View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.20 2011/05/11 06:56:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2011/07/11 12:08:24 jasper Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
COMMENT = maze game resembling boulderdash
DISTNAME = rocksndiamonds-3.3.0.1
REVISION = 1
CATEGORIES = games x11
REVISION = 0
HOMEPAGE = http://www.artsoft.org/rocksndiamonds/
@ -31,10 +33,6 @@ MAKE_FLAGS = CC="${CC}" MAKE="${MAKE_PROGRAM}" X11_PATH="${X11BASE}" \
ALL_TARGET = sdl
# XXX segfaults with gcc3
MODULES += gcc4
MODGCC4_ARCHES =*
NO_REGRESS = Yes
N = rocksndiamonds

18
www/webkit/Makefile
View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.52 2011/07/05 11:34:27 landry Exp $
# $OpenBSD: Makefile,v 1.53 2011/07/11 12:08:24 jasper Exp $
ONLY_FOR_ARCHS= ${GCC4_ARCHS}
COMMENT = open source web browser engine for Gtk+
V = 1.4.2
DISTNAME = webkit-${V}
REVISION = 0
EPOCH = 0
CATEGORIES = www
@ -36,16 +39,6 @@ MODULES = devel/gettext \
MODPY_RUNDEP = No
.include <bsd.own.mk>
.if ${COMPILER_VERSION:L:Mgcc4*}
STDCPPLIB = stdc++
.else
MODULES += gcc4
MODGCC4_ARCHES =*
MODGCC4_LANGS = c c++
STDCPPLIB = estdc++
.endif
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \
@ -57,7 +50,6 @@ CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--enable-spellcheck
MAKE_FILE = GNUmakefile
MAKE_FLAGS = STDCPPLIB=${STDCPPLIB}
RUN_DEPENDS = multimedia/gstreamer-0.10/plugins-ffmpeg \
multimedia/gstreamer-0.10/plugins-bad \
@ -71,7 +63,7 @@ WANTLIB = ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
gstreamer-0.10 gstbase-0.10 gstvideo-0.10 gstapp-0.10 gstpbutils-0.10 \
icudata icui18n icuuc sqlite3 xslt enchant soup-2.4 \
pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pthread GL Xxf86vm drm xcb-shm \
z cairo pixman-1 png pthread-stubs xcb xml2 ${STDCPPLIB}
z cairo pixman-1 png pthread-stubs xcb xml2 stdc++
LIB_DEPENDS = multimedia/gstreamer-0.10/core \
multimedia/gstreamer-0.10/plugins-base \

11
www/webkit/patches/patch-GNUmakefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-GNUmakefile_in,v 1.12 2011/07/05 11:34:27 landry Exp $
$OpenBSD: patch-GNUmakefile_in,v 1.13 2011/07/11 12:08:24 jasper Exp $
install GtkLauncher, remove silent build lines, fix lpthread/pthread
--- GNUmakefile.in.orig Fri Jul 1 01:08:07 2011
+++ GNUmakefile.in Fri Jul 1 09:26:33 2011
@ -63,15 +63,6 @@ install GtkLauncher, remove silent build lines, fix lpthread/pthread
libJavaScriptCore_la_CXXFLAGS = \
$(global_cxxflags) \
$(libJavaScriptCore_la_CFLAGS)
@@ -20182,7 +20183,7 @@ Programs_minidom_LDADD = \
libJavaScriptCore.la \
$(WINMM_LIBS) \
-lm \
- -lstdc++
+ -l${STDCPPLIB}
Programs_minidom_LDFLAGS = \
-no-install \
@@ -21245,12 +21246,13 @@ dist_webresources_DATA = \
@ENABLE_WEBKIT2_FALSE@ $(XT_CFLAGS)