Date: Sun, 7 Feb 2016 19:43:56 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408449 - in head: . Mk Mk/Uses archivers/peazip audio/jokosher devel/dee emulators/darcnes multimedia/avidemux multimedia/mpeg4ip multimedia/mplayer multimedia/winff net-im/libpurple n... Message-ID: <201602071943.u17Jhua8089151@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sun Feb 7 19:43:56 2016 New Revision: 408449 URL: https://svnweb.freebsd.org/changeset/ports/408449 Log: Move Mk/bsd.gnome.mk and Mk/bsd.mate.mk to Mk/Uses/. To use the GNOME or MATE components activate it by adding gnome or mate to USES. The usage of USE_GNOME/INSTALL_ICONS and for example GLIB_SCHEMAS has stayed the same. Like with USES, the use of USE_GNOME and so after bsd.port.pre.mk is now forbidden. And adapt ports that where still doing that. Exp-runs done by: antoine@ PR: 205432 Reviewed by: antoine@, mat@ Approved by: portmgr (antoine@) Differential Revision: https://reviews.freebsd.org/D3653 Added: head/Mk/Uses/gnome.mk - copied, changed from r408448, head/Mk/bsd.gnome.mk head/Mk/Uses/mate.mk - copied, changed from r408448, head/Mk/bsd.mate.mk Deleted: head/Mk/bsd.gnome.mk head/Mk/bsd.mate.mk Modified: head/CHANGES head/Mk/bsd.port.mk head/archivers/peazip/Makefile head/audio/jokosher/Makefile head/devel/dee/Makefile head/emulators/darcnes/Makefile head/multimedia/avidemux/Makefile.common head/multimedia/mpeg4ip/Makefile head/multimedia/mplayer/Makefile head/multimedia/winff/Makefile head/net-im/libpurple/Makefile head/net-p2p/transmission-remote-gui/Makefile head/sysutils/ntfsprogs/Makefile Modified: head/CHANGES ============================================================================== --- head/CHANGES Sun Feb 7 19:23:22 2016 (r408448) +++ head/CHANGES Sun Feb 7 19:43:56 2016 (r408449) @@ -10,6 +10,18 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20160207: +AUTHOR: kwm@FreeBSD.org + + The GNOME and MATE framework activation changed. To use the frameworks + now either gnome or mate needs to be added USES. + + The usage of USE_GNOME, USE_MATE, INSTALLS_ICONS and for example + GLIB_SCHEMAS stays the same. + + Like with USES, the use of USE_GNOME and so after bsd.port.pre.mk + is now forbidden. + 20160112: AUTHOR: amdmi3@FreeBSD.org Copied and modified: head/Mk/Uses/gnome.mk (from r408448, head/Mk/bsd.gnome.mk) ============================================================================== --- head/Mk/bsd.gnome.mk Sun Feb 7 19:23:22 2016 (r408448, copy source) +++ head/Mk/Uses/gnome.mk Sun Feb 7 19:43:56 2016 (r408449) @@ -1,4 +1,4 @@ -#-*- tab-width: 4; -*- +#-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # # $FreeBSD$ @@ -13,12 +13,8 @@ # # ======================= /USERS ================================ -.if !defined(_POSTMKINCLUDED) && !defined(Gnome_Pre_Include) - # Please make sure all changes to this file are passed through the maintainer. # Do not commit them yourself (unless of course you're the Port's Wraith ;). -Gnome_Include_MAINTAINER= gnome@FreeBSD.org -Gnome_Pre_Include= bsd.gnome.mk # This section defines possible names of GNOME components and all information # necessary for ports to use those components. @@ -59,6 +55,16 @@ Gnome_Pre_Include= bsd.gnome.mk # and will display correctly. This macro isn't needed # for QT based applications, which use a different method. # +# MAINTAINER: gnome@FreeBSD.org + +.if !defined(_INCLUDE_USES_GNOME_MK) +_INCLUDE_USES_GNOME_MK= yes + +_USES_POST+= gnome + +.if !empty(gnome_ARGS) +IGNORE= USES=gnome takes no arguments +.endif # non-version specific components _USE_GNOME_ALL= esound intlhack intltool introspection \ @@ -554,17 +560,6 @@ HAVE_GNOME+= ${component} . endif .endif -.endif -# End of optional part. - -.if defined(_POSTMKINCLUDED) && !defined(Gnome_Post_Include) - -Gnome_Post_Include= bsd.gnome.mk - -.if !defined(Gnome_Pre_Include) -.error The Pre include part of bsd.gnome.mk part is not included. Did you forget WANT_GNOME=yes before bsd.port.pre.mk? -.endif - .if defined(USE_GNOME) # First of all expand all USE_GNOME_IMPL recursively . for component in ${_USE_GNOME_ALL} @@ -653,14 +648,6 @@ MAKE_ENV+= GCONF_DISABLE_MAKEFILE_SCHEMA . endif .endif -.if defined(GNOME_PRE_PATCH) - -pre-patch: gnome-pre-patch - -gnome-pre-patch: - @${GNOME_PRE_PATCH:C/^;//1} -.endif - .if defined(WANT_GNOME) USE_GNOME?= . if ${_USE_GNOME_SAVED}==${USE_GNOME} @@ -676,9 +663,23 @@ RUN_DEPENDS+= ${GNOME_SUBR}:${PORTSDIR}/ SUB_LIST+= GNOME_SUBR=${GNOME_SUBR} .endif +.endif +# end of the part + +.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GNOME_POST_MK) +_INCLUDE_USES_GNOME_POST_MK= yes + +.if defined(GNOME_PRE_PATCH) + +_USES_patch+= 290:gnome-pre-patch + +gnome-pre-patch: + @${GNOME_PRE_PATCH:C/^;//1} +.endif + .if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) || defined(INSTALLS_ICONS) \ || defined(GLIB_SCHEMAS) -post-install: gnome-post-install +_USES_install+= 690:gnome-post-install gnome-post-install: . if defined(GCONF_SCHEMAS) Copied and modified: head/Mk/Uses/mate.mk (from r408448, head/Mk/bsd.mate.mk) ============================================================================== --- head/Mk/bsd.mate.mk Sun Feb 7 19:23:22 2016 (r408448, copy source) +++ head/Mk/Uses/mate.mk Sun Feb 7 19:43:56 2016 (r408449) @@ -2,31 +2,29 @@ # ex:ts=4 # # $FreeBSD$ -# $NetBSD$ -# $MCom: ports-experimental/Mk/bsd.mate.mk,v 1.13 2012/09/03 17:02:31 mezz Exp $ # # Please view me with 4 column tabs! -####################################################### -# -# *** WARNING: Disable MARCUSCOM before merge in FreeBSD! -# Please also remove this section before merging into FreeBSD. -# -#MARCUSCOM_CVS=yes - # ======================= USERS ================================= # # There are no significant user-definable settings in here. # This file is a framework to make it easier to create MATE ports. # # ======================= /USERS ================================ - -.if !defined(_POSTMKINCLUDED) && !defined(Mate_Pre_Include) - +# # Please make sure all changes to this file are passed through the maintainer. # Do not commit them yourself (unless of course you're the Port's Wraith ;). -Mate_Include_MAINTAINER= gnome@FreeBSD.org -Mate_Pre_Include= bsd.mate.mk +# +# MAINTAINER: gnome@FreeBSD.org + +.if !defined(_INCLUDE_USES_MATE_MK) +_INCLUDE_USES_MATE_MK= yes + +_USES_POST+= mate + +.if !empty(mate_ARGS) +IGNORE= USES=mate takes no arguments +.endif # This section defines possible names of MATE components and all information # necessary for ports to use those components. @@ -142,13 +140,6 @@ settingsdaemon_RUN_DEPENDS= ${settingsda # End component definition section -.endif -# End of optional part. - -.if defined(_POSTMKINCLUDED) && !defined(Mate_Post_Include) - -Mate_Post_Include= bsd.mate.mk - .if defined(USE_MATE) # Comparing between USE_MATE and _USE_MATE_ALL to make sure the component # exists in _USE_MATE_ALL. If it does not exist then give an error about it. @@ -202,11 +193,17 @@ MATE_PRE_PATCH+= ; ${${component}_PRE_PA . endfor .endif # USE_MATE check +.endif +# End of optional part. + +.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_MATE_POST_MK) +_INCLUDE_USES_MATE_POST_MK= yes + .if ${USE_MATE:Mautogen}!="" CONFIGURE_ENV+= NOCONFIGURE=yes -pre-configure: mate-pre-configure +_USES_configure+= 295:mate-pre-configure mate-pre-configure: @(cd ${CONFIGURE_WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} ./autogen.sh) @@ -214,15 +211,11 @@ mate-pre-configure: .if defined(MATE_PRE_PATCH) -pre-configure-script: mate-pre-configure-script +_USES_configure+= 445:mate-pre-configure-script mate-pre-configure-script: @${MATE_PRE_PATCH:C/^;//1} .endif -.if ${MAINTAINER}=="gnome@FreeBSD.org" -CONFIGURE_FAIL_MESSAGE= "Please run the gnomelogalyzer, available from \"http://www.freebsd.org/gnome/gnomelogalyzer.sh\", which will diagnose the problem and suggest a solution. If - and only if - the gnomelogalyzer cannot solve the problem, report the build failure to the FreeBSD MATE team at ${MAINTAINER}, and attach (a) \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\", (b) the output of the failed make command, and (c) the gnomelogalyzer output. Also, it might be a good idea to provide an overview of all packages installed on your system (i.e. an \`ls ${PKG_DBDIR}\`). Put your attachment up on any website, copy-and-paste into http://freebsd-gnome.pastebin.com, or use send-pr(1) with the attachment. Try to avoid sending any attachments to the mailing list (${MAINTAINER}), because attachments sent to FreeBSD mailing lists are usually discarded by the mailing list software." -.endif - .endif # End of use part. Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sun Feb 7 19:23:22 2016 (r408448) +++ head/Mk/bsd.port.mk Sun Feb 7 19:43:56 2016 (r408449) @@ -388,16 +388,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_GECKO - If set, this port uses the Gecko/Mozilla product. # See bsd.gecko.mk for more details. ## -# USE_GNOME - A list of the Gnome dependencies the port has (e.g., -# glib12, gtk12). Implies that the port needs Gnome. -# Implies inclusion of bsd.gnome.mk. See bsd.gnome.mk -# or http://www.FreeBSD.org/gnome/docs/porting.html -# for more details. -## -# USE_MATE - A list of the MATE dependencies the port has. Implies -# that the port needs MATE. Implies inclusion of -# bsd.mate.mk. See bsd.mate.mk for more details. -## # USE_WX - If set, this port uses the WxWidgets library and related # components. See bsd.wx.mk for more details. ## @@ -1398,11 +1388,11 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/ .endif .if defined(WANT_GNOME) || defined(USE_GNOME) || defined(INSTALLS_ICONS) -.include "${PORTSDIR}/Mk/bsd.gnome.mk" +USES+= gnome .endif .if defined(USE_MATE) -.include "${PORTSDIR}/Mk/bsd.mate.mk" +USES+= mate .endif .if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT) @@ -1913,14 +1903,6 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfo .include "${PORTSDIR}/Mk/bsd.gecko.mk" .endif -.if defined(WANT_GNOME) || defined(USE_GNOME) -.include "${PORTSDIR}/Mk/bsd.gnome.mk" -.endif - -.if defined(USE_MATE) -.include "${PORTSDIR}/Mk/bsd.mate.mk" -.endif - .if defined(USE_KDE4) .include "${PORTSDIR}/Mk/bsd.kde4.mk" .endif Modified: head/archivers/peazip/Makefile ============================================================================== --- head/archivers/peazip/Makefile Sun Feb 7 19:23:22 2016 (r408448) +++ head/archivers/peazip/Makefile Sun Feb 7 19:43:56 2016 (r408449) @@ -40,7 +40,7 @@ QT4_DESC= Use qt4 interface OPTIONS_DEFAULT= GTK2 7Z -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGTK2} USE_FPC+= gtk2 @@ -112,4 +112,4 @@ do-install: ${INSTALL_DATA} peazip.png ${STAGEDIR}${PREFIX}/share/pixmaps/ ${INSTALL_SCRIPT} ${WRKDIR}/pea ${WRKDIR}/pealauncher ${WRKDIR}/peazip ${STAGEDIR}${PREFIX}/bin/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/jokosher/Makefile ============================================================================== --- head/audio/jokosher/Makefile Sun Feb 7 19:23:22 2016 (r408448) +++ head/audio/jokosher/Makefile Sun Feb 7 19:43:56 2016 (r408449) @@ -26,14 +26,14 @@ PIDGIN_DESC= Pidgin status extension PROFILES_DESC= Gnome Audio Profiels extension PULSE_DESC= ${PULSEAUDIO_DESC} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDBUS} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus .endif .if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MPROFILES} \ - || ${HAVE_GNOME:Mpygnome2}!="" + || exists(${LOCALBASE}/libdata/pkgconfig/gnome-python-2.0.pc) USE_GNOME+= pygnome2 .endif @@ -64,4 +64,4 @@ post-patch: .SILENT 's|"update-desktop-database"|&, "${PREFIX}/share/applications"|' \ ${WRKSRC}/bin/${PORTNAME} ${WRKSRC}/${PYSETUP} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/dee/Makefile ============================================================================== --- head/devel/dee/Makefile Sun Feb 7 19:23:22 2016 (r408448) +++ head/devel/dee/Makefile Sun Feb 7 19:43:56 2016 (r408449) @@ -16,9 +16,9 @@ LICENSE= GPLv3 BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala LIB_DEPENDS= libicutu.so:${PORTSDIR}/devel/icu -USES= gmake libtool pkgconfig pathfix python +USES= gmake libtool pkgconfig pathfix python:2 GNU_CONFIGURE= yes -USE_GNOME= glib20 introspection:build +USE_GNOME= glib20 introspection:build pygobject3 USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtk-doc-html \ @@ -29,15 +29,7 @@ CONFIGURE_ARGS= --disable-gtk-doc-html \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} >= 3000 -USE_GNOME+= py3gobject3 -.else -USE_GNOME+= pygobject3 -.endif - post-patch: ${REINPLACE_CMD} -e 's| -Wempty-body||' ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/emulators/darcnes/Makefile ============================================================================== --- head/emulators/darcnes/Makefile Sun Feb 7 19:23:22 2016 (r408448) +++ head/emulators/darcnes/Makefile Sun Feb 7 19:43:56 2016 (r408449) @@ -27,7 +27,7 @@ OPTIONS_SINGLE_BACKEND= X11 GTK1 SVGALIB OPTIONS_DEFAULT=X11 BACKEND_DESC= GUI backend -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${ARCH} != "i386" || defined(WITHOUT_X86_ASM) MAKE_ARGS+= C_ONLY=-DC_ONLY @@ -59,4 +59,4 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/readme ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/multimedia/avidemux/Makefile.common ============================================================================== --- head/multimedia/avidemux/Makefile.common Sun Feb 7 19:23:22 2016 (r408448) +++ head/multimedia/avidemux/Makefile.common Sun Feb 7 19:43:56 2016 (r408449) @@ -57,17 +57,6 @@ CMAKE_ARGS+= -DNO_NLS:BOOL=ON PLIST_SUB+= NLS="@comment " QT_NLS="@comment " .endif -.include <bsd.port.pre.mk> - -# is this kosher? the result seems to run tho... (see ports/185997) -.if $(COMPILER_FEATURES:Mlibc++) -LDFLAGS+= -lc++ -.endif - -#.if ${COMPILER_TYPE} == clang -USE_GCC= yes -#.endif - # for libexecinfo: (so that __builtin_frame_address() finds the top # of the stack) .if ${ARCH} == "amd64" @@ -265,6 +254,17 @@ CMAKE_ARGS+= -DOPENCORE_AMRWB:BOOL=OFF PLIST_SUB+= AMRWB="@comment " .endif +.include <bsd.port.pre.mk> + +# is this kosher? the result seems to run tho... (see ports/185997) +.if $(COMPILER_FEATURES:Mlibc++) +LDFLAGS+= -lc++ +.endif + +#.if ${COMPILER_TYPE} == clang +USE_GCC= yes +#.endif + .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not compile on ia64, powerpc, or sparc64 .endif Modified: head/multimedia/mpeg4ip/Makefile ============================================================================== --- head/multimedia/mpeg4ip/Makefile Sun Feb 7 19:23:22 2016 (r408448) +++ head/multimedia/mpeg4ip/Makefile Sun Feb 7 19:43:56 2016 (r408449) @@ -45,7 +45,7 @@ PORTDOCS= MAINREADME.html MP4LIVE_INTERN ReadingList.txt encoding.htm m4rm.html \ mp4player.jpg mrm.html pi.html prm.html -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> ### ## Auto detect possible extensions @@ -170,4 +170,4 @@ CONFIGURE_ARGS+= --disable-mmx CFLAGS+= -O3 -ffast-math -fomit-frame-pointer .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Sun Feb 7 19:23:22 2016 (r408448) +++ head/multimedia/mplayer/Makefile Sun Feb 7 19:43:56 2016 (r408449) @@ -48,7 +48,7 @@ CONFFILES= example.conf input.conf menu. USES+= iconv pkgconfig .include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars" -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> CONFIGURE_ARGS+= --disable-arts \ --disable-directfb \ @@ -64,8 +64,6 @@ CONFIGURE_ARGS+= --disable-arts \ --disable-musepack \ --disable-theora -.include "${.CURDIR}/../../multimedia/mplayer/Makefile.options" - .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} PLIST_SUB+= GMPLAYER="" DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false @@ -115,6 +113,9 @@ CONFIGURE_ARGS+=--enable-xvmc --with-xvm CONFIGURE_ARGS+=--disable-x11 .endif +.include <bsd.port.pre.mk> +.include "${.CURDIR}/../../multimedia/mplayer/Makefile.options" + pre-everything:: @${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "" Modified: head/multimedia/winff/Makefile ============================================================================== --- head/multimedia/winff/Makefile Sun Feb 7 19:23:22 2016 (r408448) +++ head/multimedia/winff/Makefile Sun Feb 7 19:43:56 2016 (r408449) @@ -45,7 +45,7 @@ QT4_DESC= Use qt4 interface OPTIONS_DEFAULT= GTK2 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGTK2} USE_FPC+= gtk2 @@ -80,4 +80,4 @@ do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net-im/libpurple/Makefile ============================================================================== --- head/net-im/libpurple/Makefile Sun Feb 7 19:23:22 2016 (r408448) +++ head/net-im/libpurple/Makefile Sun Feb 7 19:43:56 2016 (r408449) @@ -121,14 +121,10 @@ PLIST_SUB+= PERL:="@comment not install PERLMAN:="@comment not installed: " .endif -.include <bsd.port.pre.mk> - .if !defined(PIDGIN_SLAVE) -.if ${HAVE_GNOME:Mgconf2}!="" || exists(${LOCALBASE}/bin/gconftool-2) USE_GNOME+= gconf2 GCONF_SCHEMAS= purple.schemas .endif -.endif #.if defined(WITH_GTKUI) && ${HAVE_GNOME:Mevolutiondataserver}!="" #USE_GNOME+= evolutiondataserver @@ -331,6 +327,8 @@ post-patch: .if defined(PIDGIN_SLAVE) @${FIND} ${BUILD_WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|$$(top_builddir)/libpurple/libpurple.la|-lpurple|' + @${REINPLACE_CMD} -e 's|gconftool-2|gconftool-disabled|g' \ + ${WRKSRC}/configure .endif .if !defined(PIDGIN_SLAVE) && ${PORT_OPTIONS:MPERL} @@ -339,4 +337,4 @@ post-stage: ${STAGEDIR}${PREFIX}/lib/purple-2/perl/auto/Purple/.packlist .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net-p2p/transmission-remote-gui/Makefile ============================================================================== --- head/net-p2p/transmission-remote-gui/Makefile Sun Feb 7 19:23:22 2016 (r408448) +++ head/net-p2p/transmission-remote-gui/Makefile Sun Feb 7 19:43:56 2016 (r408449) @@ -40,7 +40,7 @@ QT4_DESC= Use qt4 interface OPTIONS_DEFAULT= GTK2 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGTK2} USE_FPC+= gtk2 @@ -63,4 +63,4 @@ do-install: @cd ${WRKSRC}/units && \ ${INSTALL_PROGRAM} transgui ${STAGEDIR}${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/sysutils/ntfsprogs/Makefile ============================================================================== --- head/sysutils/ntfsprogs/Makefile Sun Feb 7 19:23:22 2016 (r408448) +++ head/sysutils/ntfsprogs/Makefile Sun Feb 7 19:43:56 2016 (r408449) @@ -42,12 +42,6 @@ SUB_FILES= pkg-message WANT_GNOME= yes .endif -.include <bsd.port.pre.mk> - -.if ${ARCH} == "i386" -CFLAGS:= ${CFLAGS:C/-O.?/-O0/g} -.endif - .if ${PORT_OPTIONS:MGNOMEVFS2} CONFIGURE_ARGS+=--enable-gnome-vfs USE_GNOME= gnomevfs2 @@ -57,6 +51,12 @@ CONFIGURE_ARGS+=--disable-gnome-vfs PLIST_SUB+= GNOMEVFS2="@comment " .endif +.include <bsd.port.pre.mk> + +.if ${ARCH} == "i386" +CFLAGS:= ${CFLAGS:C/-O.?/-O0/g} +.endif + .if ${PORT_OPTIONS:MLOCK} CFLAGS+= -DUSE_LOCK .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602071943.u17Jhua8089151>