From 703fb644d7003fdc4144c6b96e5bb7eff20d8374 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 7 Nov 2014 10:40:05 +0000 Subject: [PATCH] No need for default CMAKE_BUILD_TYPE. --- audio/libmusicbrainz5/Makefile | 4 +--- audio/mscore/Makefile | 5 ++--- audio/taglib/Makefile | 5 ++--- devel/bullet/Makefile | 5 ++--- devel/llvm/Makefile | 3 +-- games/sumwars/Makefile | 3 +-- geo/qlandkartegt/Makefile | 4 +--- graphics/darktable/Makefile | 5 ++--- graphics/hugin/Makefile | 5 ++--- graphics/openscenegraph/Makefile | 4 +--- graphics/rawtherapee/Makefile | 5 ++--- graphics/zint/Makefile | 4 +--- mail/trojita/Makefile | 5 ++--- net/libproxy/Makefile | 3 +-- net/mirall/Makefile | 5 ++--- net/ocsync/Makefile | 5 ++--- net/seafile/client/Makefile | 4 +--- productivity/libqzeitgeist/Makefile | 4 +--- textproc/clucene/Makefile | 5 ++--- textproc/libical/Makefile | 5 ++--- www/webkitgtk4/Makefile | 3 +-- x11/ogre/Makefile | 5 ++--- x11/polkit-qt4/Makefile | 5 ++--- 23 files changed, 36 insertions(+), 65 deletions(-) diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile index af90ab6eff8..695bc5b70b8 100644 --- a/audio/libmusicbrainz5/Makefile +++ b/audio/libmusicbrainz5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2014/04/21 14:25:15 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2014/11/07 10:40:05 ajacoutot Exp $ COMMENT= library for audio metadata lookup (v5) @@ -26,8 +26,6 @@ NO_TEST= Yes LIB_DEPENDS= net/neon -CONFIGURE_ARGS= -DCMAKE_BUILD_TYPE=Release - pre-configure: perl -pi -e 's,/usr/local,${LOCALBASE},g' \ ${WRKSRC}/cmake/modules/FindNeon.cmake diff --git a/audio/mscore/Makefile b/audio/mscore/Makefile index 41d06b9fd4f..0c8aafcb630 100644 --- a/audio/mscore/Makefile +++ b/audio/mscore/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2014/11/05 06:03:32 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.13 2014/11/07 10:40:05 ajacoutot Exp $ BROKEN-hppa = ICE on moc_qtsingleapplication.cxx @@ -39,8 +39,7 @@ LIB_DEPENDS = audio/portaudio-svn \ RUN_DEPENDS = devel/desktop-file-utils -CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=RELEASE \ - -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ +CONFIGURE_ARGS =-DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DBUILD_JACK=OFF WRKSRC = ${WRKDIST}/mscore diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile index 3d0c49d1b1c..aa8f23d7777 100644 --- a/audio/taglib/Makefile +++ b/audio/taglib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2014/02/07 14:57:46 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.35 2014/11/07 10:40:05 ajacoutot Exp $ COMMENT= managing meta-data of audio formats DISTNAME= taglib-1.9.1 @@ -21,8 +21,7 @@ WANTLIB= stdc++ m z BUILD_DEPENDS= devel/cppunit -CONFIGURE_ARGS+=-DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_POLICY_DEFAULT_CMP0022=OLD \ +CONFIGURE_ARGS= -DCMAKE_POLICY_DEFAULT_CMP0022=OLD \ -DBUILD_TESTS=ON pre-configure: diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile index 03351d6b9b4..d845313d500 100644 --- a/devel/bullet/Makefile +++ b/devel/bullet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2013/08/07 21:31:30 naddy Exp $ +# $OpenBSD: Makefile,v 1.3 2014/11/07 10:40:05 ajacoutot Exp $ SHARED_ONLY = Yes @@ -30,8 +30,7 @@ WANTLIB += m stdc++ MODULES = devel/cmake BUILD_DEPENDS = graphics/freeglut -CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=ON \ +CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON \ -DBUILD_DEMOS=OFF \ -DBUILD_EXTRAS=OFF \ -DINSTALL_LIBS=ON diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile index 3eb26e07467..d9ae74310de 100644 --- a/devel/llvm/Makefile +++ b/devel/llvm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.89 2014/10/28 17:52:05 brad Exp $ +# $OpenBSD: Makefile,v 1.90 2014/11/07 10:40:05 ajacoutot Exp $ # XXX: Remember to bump MODCLANG_VERSION in lang/clang/clang.port.mk when # updating this port. @@ -39,7 +39,6 @@ SEPARATE_BUILD = Yes CONFIGURE_ARGS = -DLLVM_ENABLE_FFI:Bool=False \ -DLLVM_ENABLE_TERMINFO:Bool=False \ -DLLVM_REQUIRES_RTTI:Bool=True \ - -DCMAKE_BUILD_TYPE:String=Release \ -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True # Workaround relocation overflow diff --git a/games/sumwars/Makefile b/games/sumwars/Makefile index 6109ceabd56..996ee06504b 100644 --- a/games/sumwars/Makefile +++ b/games/sumwars/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2014/08/19 22:40:22 pascal Exp $ +# $OpenBSD: Makefile,v 1.2 2014/11/07 10:40:05 ajacoutot Exp $ ONLY_FOR_ARCHS = amd64 i386 @@ -45,7 +45,6 @@ LIB_DEPENDS = x11/cegui \ CONFIGURE_ARGS += \ -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -liconv -lintl" \ - -DCMAKE_BUILD_TYPE=Release \ -DSUMWARS_NO_ENET=ON \ -DSUMWARS_NO_TINYXML=ON diff --git a/geo/qlandkartegt/Makefile b/geo/qlandkartegt/Makefile index 3fd070a0d53..cc55287f87e 100644 --- a/geo/qlandkartegt/Makefile +++ b/geo/qlandkartegt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2014/10/28 10:00:52 jasper Exp $ +# $OpenBSD: Makefile,v 1.22 2014/11/07 10:40:05 ajacoutot Exp $ COMMENT = garmin gps map management tool @@ -27,8 +27,6 @@ RUN_DEPENDS = devel/desktop-file-utils \ geo/garmindev \ geo/gpsbabel -CONFIGURE_ARGS = -DCMAKE_BUILD_TYPE=Release - post-extract: @find ${WRKDIST} -name *.orig -exec rm {} \; @rm ${WRKSRC}/cmake/Modules/FindGDAL.cmake diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 640e3efae04..356a1047e26 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.40 2014/11/05 09:26:50 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.41 2014/11/07 10:40:05 ajacoutot Exp $ # requires SSE ONLY_FOR_ARCHS= i386 amd64 @@ -66,8 +66,7 @@ LIB_DEPENDS= devel/json-glib \ SEPARATE_BUILD= Yes USE_GROFF= Yes -CONFIGURE_ARGS= -DCMAKE_BUILD_TYPE=Release \ - -DOPENJPEG_INCLUDE_DIR=${PREFIX}/include/openjpeg-1.5 \ +CONFIGURE_ARGS= -DOPENJPEG_INCLUDE_DIR=${PREFIX}/include/openjpeg-1.5 \ -DBINARY_PACKAGE_BUILD=1 \ -DCUSTOM_CFLAGS=1 diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 61e3b1d767a..18ff7ce0523 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.41 2014/07/11 22:17:08 sthen Exp $ +# $OpenBSD: Makefile,v 1.42 2014/11/07 10:40:05 ajacoutot Exp $ BROKEN-hppa = run dep on enblend-enfuse which will not build on hppa @@ -71,8 +71,7 @@ LIB_DEPENDS = devel/boost \ MODULES = devel/cmake devel/gettext lang/python CONFIGURE_ENV = MANDIR=man -CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_HSI=ON +CONFIGURE_ARGS += -DBUILD_HSI=ON NO_TEST = Yes MODPY_ADJ_FILES = src/hugin_script_interface/hpi.py \ diff --git a/graphics/openscenegraph/Makefile b/graphics/openscenegraph/Makefile index b8d2d81385c..50e5d3e0447 100644 --- a/graphics/openscenegraph/Makefile +++ b/graphics/openscenegraph/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2013/11/24 21:58:24 pascal Exp $ +# $OpenBSD: Makefile,v 1.2 2014/11/07 10:40:05 ajacoutot Exp $ SHARED_ONLY = Yes @@ -58,8 +58,6 @@ LIB_DEPENDS = graphics/openexr \ print/poppler \ x11/gnome/librsvg -CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE="Release" - NO_TEST = Yes .include diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index 67bc2e4f29a..62385c9eea4 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2014/07/10 08:27:49 kirby Exp $ +# $OpenBSD: Makefile,v 1.9 2014/11/07 10:40:05 ajacoutot Exp $ COMMENT = RAW image processing application @@ -37,8 +37,7 @@ LIB_DEPENDS = audio/libcanberra,-gtk \ math/fftw3,float \ x11/gtk2mm -CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED=ON \ +CONFIGURE_ARGS += -DBUILD_SHARED=ON \ -DOPTION_OMP=OFF \ -DCMAKE_CXX_FLAGS_RELEASE=${CXXFLAGS} diff --git a/graphics/zint/Makefile b/graphics/zint/Makefile index 6edf617fb1b..716ff56ea20 100644 --- a/graphics/zint/Makefile +++ b/graphics/zint/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2013/12/21 21:47:47 kirby Exp $ +# $OpenBSD: Makefile,v 1.5 2014/11/07 10:40:05 ajacoutot Exp $ COMMENT-main = library for encoding data in several barcode variants COMMENT-x11 = graphical interface for the zint barcode generator @@ -31,8 +31,6 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=zint/} MODULES = devel/cmake -CONFIGURE_ARGS = -DCMAKE_BUILD_TYPE=RELEASE - LIB_DEPENDS-main = graphics/png MULTI_PACKAGES = -main diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile index c4acae585a1..38af480a32f 100644 --- a/mail/trojita/Makefile +++ b/mail/trojita/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2014/03/21 01:11:52 jturner Exp $ +# $OpenBSD: Makefile,v 1.8 2014/11/07 10:40:05 ajacoutot Exp $ COMMENT = fast Qt IMAP e-mail client @@ -29,8 +29,7 @@ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+2,-guic CONFIGURE_ENV += QTDIR="${MODQT_LIBDIR}" -CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release \ - -DWITH_HARMATTAN=OFF \ +CONFIGURE_ARGS += -DWITH_HARMATTAN=OFF \ -DWITH_RAGEL=OFF \ -DWITH_QT5=OFF \ -DGIT_EXECUTABLE="" diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile index f9318670f69..e58c0555cd4 100644 --- a/net/libproxy/Makefile +++ b/net/libproxy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2014/03/25 11:18:46 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.43 2014/11/07 10:40:05 ajacoutot Exp $ SHARED_ONLY= Yes @@ -59,7 +59,6 @@ WANTLIB-webkit += glib-2.0 javascriptcoregtk-3.0 proxy CONFIGURE_ARGS= -DCMAKE_C_FLAGS="${CFLAGS}" \ -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ - -DCMAKE_BUILD_TYPE:STRING=Release \ -DWITH_PYTHON:BOOL=ON \ -DWITH_PERL:BOOL=ON \ -DWITH_GNOME3:BOOL=ON \ diff --git a/net/mirall/Makefile b/net/mirall/Makefile index 48cfc807ed5..3cf5c7f53dc 100644 --- a/net/mirall/Makefile +++ b/net/mirall/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2014/10/28 09:02:57 kirby Exp $ +# $OpenBSD: Makefile,v 1.5 2014/11/07 10:40:05 ajacoutot Exp $ COMMENT = owncloud sync client @@ -32,8 +32,7 @@ RUN_DEPENDS = devel/desktop-file-utils \ LIB_DEPENDS = devel/libinotify \ net/ocsync -CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release \ - -DCSYNC_INCLUDE_PATH=${LOCALBASE}/include/ocsync +CONFIGURE_ARGS += -DCSYNC_INCLUDE_PATH=${LOCALBASE}/include/ocsync NO_TEST = Yes diff --git a/net/ocsync/Makefile b/net/ocsync/Makefile index 8495c29b08f..1711439e9cb 100644 --- a/net/ocsync/Makefile +++ b/net/ocsync/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2014/07/03 11:38:45 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.20 2014/11/07 10:40:05 ajacoutot Exp $ # XXX updating requires Thread Local Storage support @@ -39,8 +39,7 @@ CONFIGURE_ARGS= -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread" \ -DCMAKE_SKIP_RPATH=YES \ -DMAN_INSTALL_DIR=${PREFIX}/man \ -DSYSCONFDIR=${SYSCONFDIR} \ - -DSYSCONF_INSTALL_DIR=${PREFIX}/share/examples \ - -DCMAKE_BUILD_TYPE=Release + -DSYSCONF_INSTALL_DIR=${PREFIX}/share/examples # force disabling libssh and samba support CONFIGURE_ARGS+= \ diff --git a/net/seafile/client/Makefile b/net/seafile/client/Makefile index d8dc0eb4c20..8da446925a3 100644 --- a/net/seafile/client/Makefile +++ b/net/seafile/client/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2014/10/30 15:53:30 kirby Exp $ +# $OpenBSD: Makefile,v 1.3 2014/11/07 10:40:05 ajacoutot Exp $ COMMENT = seafile client @@ -16,8 +16,6 @@ LIB_DEPENDS = net/seafile/seafile RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+2,-guic -CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release - NO_TEST = Yes post-configure: diff --git a/productivity/libqzeitgeist/Makefile b/productivity/libqzeitgeist/Makefile index 74f96c3a89d..7eb5d0cc8c2 100644 --- a/productivity/libqzeitgeist/Makefile +++ b/productivity/libqzeitgeist/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2014/10/20 15:57:12 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.5 2014/11/07 10:40:05 ajacoutot Exp $ COMMENT = Qt wrapper for Zeitgeist, event logging framework @@ -37,8 +37,6 @@ NO_TEST = Yes MODPY_ADJ_FILES = scripts/onto2cpp.py MODPY_RUNDEP = No -CONFIGURE_ARGS= -DCMAKE_BUILD_TYPE=Release - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/qzeitgeist ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/share/qzeitgeist diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile index 652c0a92a6f..84ef63d372c 100644 --- a/textproc/clucene/Makefile +++ b/textproc/clucene/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2013/03/11 11:42:41 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2014/11/07 10:40:05 ajacoutot Exp $ COMMENT = full-text search engine library CATEGORIES = textproc @@ -23,7 +23,6 @@ MODULES= devel/cmake BUILD_DEPENDS= devel/boost -CONFIGURE_ARGS= -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_CONTRIBS_LIB:BOOL=ON +CONFIGURE_ARGS= -DBUILD_CONTRIBS_LIB:BOOL=ON .include diff --git a/textproc/libical/Makefile b/textproc/libical/Makefile index 54f111b5ce4..70e8a7c3814 100644 --- a/textproc/libical/Makefile +++ b/textproc/libical/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2014/10/20 15:51:54 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.17 2014/11/07 10:40:05 ajacoutot Exp $ COMMENT= implementation of the iCalendar protocols and data units @@ -26,7 +26,6 @@ WANTLIB += pthread BUILD_DEPENDS= devel/gobject-introspection -CONFIGURE_ARGS= -DCMAKE_BUILD_TYPE=Release \ - -DGOBJECT_INTROSPECTION=true +CONFIGURE_ARGS= -DGOBJECT_INTROSPECTION=true .include diff --git a/www/webkitgtk4/Makefile b/www/webkitgtk4/Makefile index c8c630eef55..d1ad1829412 100644 --- a/www/webkitgtk4/Makefile +++ b/www/webkitgtk4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2014/10/24 15:57:06 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2014/11/07 10:40:05 ajacoutot Exp $ PORTROACH = limitw:1,even @@ -79,7 +79,6 @@ LIB_DEPENDS = devel/harfbuzz,-icu \ LDFLAGS = -L${X11BASE}/lib CONFIGURE_ARGS = -DPORT=GTK \ - -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \ -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" diff --git a/x11/ogre/Makefile b/x11/ogre/Makefile index f134e3a8212..ee9c5ad282e 100644 --- a/x11/ogre/Makefile +++ b/x11/ogre/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2014/07/11 21:20:31 pascal Exp $ +# $OpenBSD: Makefile,v 1.13 2014/11/07 10:40:05 ajacoutot Exp $ BROKEN-mips64 = missing atomic ops BROKEN-mips64el = missing atomic ops @@ -46,8 +46,7 @@ MASTER_SITES = https://bitbucket.org/sinbad/ogre/get/ DISTFILES = ogre-$V${EXTRACT_SUFX}{v${V:S/./-/g}${EXTRACT_SUFX}} #EXTRACT_SUFX = .tar.bz2 -CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:STRING=Release \ - -DOGRE_INSTALL_SAMPLES=1 +CONFIGURE_ARGS += -DOGRE_INSTALL_SAMPLES=1 MODULES = devel/cmake gcc4 MODGCC4_LANGS = c c++ diff --git a/x11/polkit-qt4/Makefile b/x11/polkit-qt4/Makefile index e7007d32d0f..7ba6115f906 100644 --- a/x11/polkit-qt4/Makefile +++ b/x11/polkit-qt4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2014/10/20 15:57:12 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2014/11/07 10:40:05 ajacoutot Exp $ SHARED_ONLY= Yes @@ -39,8 +39,7 @@ LIB_DEPENDS= sysutils/polkit # polkit(8) almost always needs to know the "active" session RUN_DEPENDS += sysutils/consolekit -CONFIGURE_ARGS= -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ +CONFIGURE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ -DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include" \ -DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" \ -DCMAKE_SHARED_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib"