From 5de4d85c5507e9977bab4a9f185f7b917ca55e84 Mon Sep 17 00:00:00 2001 From: kirby Date: Fri, 4 Mar 2016 10:11:21 +0000 Subject: [PATCH] Remove explicitely set CONFIGURE_STYLE=cmake. It is already done via MODULES=devel/cmake OK dcoppa@, czarkoff@ --- astro/stellarium/Makefile | 3 +-- cad/xtrkcad/Makefile | 3 +-- comms/rtl-sdr/Makefile | 4 +--- databases/sqliteman/Makefile | 3 +-- games/lostpixels/Makefile | 3 +-- graphics/autopano-sift-c/Makefile | 3 +-- math/eigen2/Makefile | 3 +-- math/eigen3/Makefile | 3 +-- net/spectrum/Makefile | 4 +--- net/wireshark/Makefile | 3 +-- productivity/taskd/Makefile | 4 +--- productivity/taskwarrior/Makefile | 4 +--- security/libnipper/Makefile | 3 +-- security/nipper/Makefile | 3 +-- 14 files changed, 14 insertions(+), 32 deletions(-) diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile index 2c756c560d5..5c34f97f900 100644 --- a/astro/stellarium/Makefile +++ b/astro/stellarium/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2016/01/09 08:34:35 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.43 2016/03/04 10:11:21 kirby Exp $ COMMENT= free open source planetarium @@ -26,7 +26,6 @@ RUN_DEPENDS= net/curl \ devel/desktop-file-utils \ x11/gtk+3,-guic -CONFIGURE_STYLE=cmake CONFIGURE_ENV= HOME=${WRKDIR} CONFIGURE_ARGS= -Wno-dev \ -DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include" \ diff --git a/cad/xtrkcad/Makefile b/cad/xtrkcad/Makefile index 1917dfe501f..754196877d6 100644 --- a/cad/xtrkcad/Makefile +++ b/cad/xtrkcad/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2015/11/21 06:48:33 sebastia Exp $ +# $OpenBSD: Makefile,v 1.14 2016/03/04 10:11:21 kirby Exp $ COMMENT= CAD program for designing model railroad layouts @@ -27,7 +27,6 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 LIB_DEPENDS= www/webkit>=1.4.0v0 -CONFIGURE_STYLE=cmake CONFIGURE_ENV+= CFLAGS=-I${PREFIX}/include \ LDFLAGS="-pthread -L${PREFIX}/lib -liconv -lintl" diff --git a/comms/rtl-sdr/Makefile b/comms/rtl-sdr/Makefile index b3000a4fd3d..512a5bd2b9a 100644 --- a/comms/rtl-sdr/Makefile +++ b/comms/rtl-sdr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2015/05/22 11:31:11 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2016/03/04 10:11:21 kirby Exp $ COMMENT= software to turn RTL2832U into an SDR @@ -24,8 +24,6 @@ MASTER_SITES= http://spacehopper.org/mirrors/ MODULES= devel/cmake LIB_DEPENDS= devel/libusb1 -CONFIGURE_STYLE= cmake - NO_TEST= Yes # rtl_tcp, rtl_adsb and rtl_fm require asynchronous mode which is diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile index 9b9fe2d2974..aa7d98eff5e 100644 --- a/databases/sqliteman/Makefile +++ b/databases/sqliteman/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2015/04/21 18:40:21 sthen Exp $ +# $OpenBSD: Makefile,v 1.22 2016/03/04 10:11:21 kirby Exp $ COMMENT = gui for sqlite CATEGORIES = databases x11 @@ -16,7 +16,6 @@ WANTLIB += c lib/qt4/QtCore lib/qt4/QtGui lib/qt4/QtSql lib/qt4/QtXml m WANTLIB += pthread qscintilla2 stdc++ MODULES = devel/cmake -CONFIGURE_STYLE = cmake LIB_DEPENDS = x11/qt4 \ editors/qscintilla diff --git a/games/lostpixels/Makefile b/games/lostpixels/Makefile index 65731642f2a..1a267f52835 100644 --- a/games/lostpixels/Makefile +++ b/games/lostpixels/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2013/03/11 11:07:39 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2016/03/04 10:11:21 kirby Exp $ BROKEN-sparc64 = Illegal operands error building SDL_gfxPrimitives.cpp @@ -29,7 +29,6 @@ USE_GMAKE = Yes MODULES += devel/cmake \ lang/lua MODLUA_BUILDDEP = No -CONFIGURE_STYLE = cmake WRKDIST = ${WRKDIR}/blinkensisters/lostpixels/game/software/ SEPARATE_BUILD = No diff --git a/graphics/autopano-sift-c/Makefile b/graphics/autopano-sift-c/Makefile index 9556e610d3e..fa6adefec78 100644 --- a/graphics/autopano-sift-c/Makefile +++ b/graphics/autopano-sift-c/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2015/04/21 18:24:22 sthen Exp $ +# $OpenBSD: Makefile,v 1.13 2016/03/04 10:11:22 kirby Exp $ COMMENT = identify control points from groups of overlapping images @@ -27,7 +27,6 @@ LIB_DEPENDS = graphics/jpeg \ textproc/libxml MODULES += devel/cmake -CONFIGURE_STYLE = cmake NO_TEST = Yes diff --git a/math/eigen2/Makefile b/math/eigen2/Makefile index e81f943684c..150a30f4d6f 100644 --- a/math/eigen2/Makefile +++ b/math/eigen2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2015/12/03 21:24:30 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2016/03/04 10:11:22 kirby Exp $ PKG_ARCH = * COMMENT = lightweight C++ template library for linear algebra @@ -18,7 +18,6 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = devel/cmake -CONFIGURE_STYLE = cmake NO_TEST= Yes # CONFIGURE_ARGS = -DEIGEN_BUILD_TESTS:BOOL=ON \ # -DEIGEN_BUILD_EXAMPLES:BOOL=ON diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile index f4538e30549..917fac75272 100644 --- a/math/eigen3/Makefile +++ b/math/eigen3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2015/12/03 21:24:30 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2016/03/04 10:11:22 kirby Exp $ PKG_ARCH = * COMMENT = lightweight C++ template library for linear algebra @@ -33,7 +33,6 @@ RUN_DEPENDS = devel/sparsehash \ math/suitesparse MODULES = devel/cmake x11/qt4 -CONFIGURE_STYLE = cmake # Needs Fortran support USE_NINJA = No diff --git a/net/spectrum/Makefile b/net/spectrum/Makefile index 443c4bac1d4..c649d390e94 100644 --- a/net/spectrum/Makefile +++ b/net/spectrum/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2015/11/06 20:37:34 sthen Exp $ +# $OpenBSD: Makefile,v 1.24 2016/03/04 10:11:22 kirby Exp $ COMMENT = XMPP transport/gateway @@ -30,8 +30,6 @@ RUN_DEPENDS = net/py-xmpppy SPVARDIR = /var/spectrum -CONFIGURE_STYLE = cmake - CONFIGURE_ENV += LDFLAGS=-pthread USE_GROFF = Yes NO_TEST = Yes diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 5730ddc3ca1..5f9c9e9906c 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2016/03/01 00:07:17 sthen Exp $ +# $OpenBSD: Makefile,v 1.35 2016/03/04 10:11:22 kirby Exp $ # XXX should add pledge to dumpcap. @@ -92,7 +92,6 @@ LIB_DEPENDS-gtk += tshark-${WVER}:${BUILD_PKGPATH:S/,$//},-text \ audio/portaudio-svn MODULES += devel/cmake -CONFIGURE_STYLE = cmake CONFIGURE_ARGS = -DDUMPCAP_INST_VALS=suid \ -DCMAKE_INSTALL_MANDIR=${TRUEPREFIX}/man \ -DCOMPILER_CAN_HANDLE_SSE4_2=false \ diff --git a/productivity/taskd/Makefile b/productivity/taskd/Makefile index 7d7e906232f..d4fa10ae8ce 100644 --- a/productivity/taskd/Makefile +++ b/productivity/taskd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2016/02/14 11:31:25 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2016/03/04 10:11:22 kirby Exp $ COMMENT = lightweight server providing access to task data @@ -25,8 +25,6 @@ WANTLIB += c gnutls m pthread LIB_DEPENDS = security/gnutls -CONFIGURE_STYLE = cmake - CONFIGURE_ARGS += -DTASKD_DOCDIR=share/taskd \ -DTASKD_MAN1DIR=man/man1 \ -DTASKD_MAN5DIR=man/man5 diff --git a/productivity/taskwarrior/Makefile b/productivity/taskwarrior/Makefile index 36e1f1a48a9..afede36fd25 100644 --- a/productivity/taskwarrior/Makefile +++ b/productivity/taskwarrior/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2016/03/02 17:19:48 kspillner Exp $ +# $OpenBSD: Makefile,v 1.21 2016/03/04 10:11:22 kirby Exp $ COMMENT = command line todo list manager @@ -29,8 +29,6 @@ WANTLIB += c gnutls m pthread LIB_DEPENDS = security/gnutls -CONFIGURE_STYLE = cmake - CONFIGURE_ARGS += -DTASK_DOCDIR=share/taskwarrior \ -DTASK_MAN1DIR=man/man1 \ -DTASK_MAN5DIR=man/man5 diff --git a/security/libnipper/Makefile b/security/libnipper/Makefile index 1bec9a9a60c..21ac8ba90d0 100644 --- a/security/libnipper/Makefile +++ b/security/libnipper/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2015/03/16 18:07:54 naddy Exp $ +# $OpenBSD: Makefile,v 1.17 2016/03/04 10:11:22 kirby Exp $ COMMENT = library for nipper @@ -17,7 +17,6 @@ PERMIT_PACKAGE_FTP = Yes EXTRACT_SUFX = .tgz WANTLIB= m stdc++ -CONFIGURE_STYLE = cmake MODULES += devel/cmake NO_TEST = Yes diff --git a/security/nipper/Makefile b/security/nipper/Makefile index 817b7723f99..03c68e9137f 100644 --- a/security/nipper/Makefile +++ b/security/nipper/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2013/10/11 23:50:44 naddy Exp $ +# $OpenBSD: Makefile,v 1.10 2016/03/04 10:11:22 kirby Exp $ COMMENT = audit network device configuration @@ -20,7 +20,6 @@ WANTLIB = c m stdc++ nipper LIB_DEPENDS= security/libnipper -CONFIGURE_STYLE = cmake MODULES += devel/cmake NO_TEST = Yes