From 40d1d04cdd489f7a5a8d30ace93300411ab73a18 Mon Sep 17 00:00:00 2001 From: naddy Date: Sat, 12 Mar 2016 23:23:38 +0000 Subject: [PATCH] trivial NO_SHARED_ARCHS and PROPERTIES:Mno_shared removal --- devel/git/Makefile | 10 +--------- devel/subversion/Makefile | 6 +----- sysutils/gamin/Makefile | 3 +-- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/devel/git/Makefile b/devel/git/Makefile index 6ee4996bd1d..79d4897bcd0 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.145 2016/03/07 07:33:37 benoit Exp $ +# $OpenBSD: Makefile,v 1.146 2016/03/12 23:23:38 naddy Exp $ COMMENT-main = GIT - Tree History Storage Tool COMMENT-svn = GIT - subversion interoperability tools @@ -76,14 +76,6 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ DIFF=diff TAR=tar -.include -.if ${PROPERTIES:Mno_shared} -CONFIGURE_ENV += ac_cv_lib_curl_curl_global_init=yes -MAKE_FLAGS += NEEDS_CRYPTO_WITH_SSL=YesPlease \ - NEEDS_SSL_WITH_CURL=YesPlease \ - NEEDS_LIBINTL_BEFORE_LIBICONV=YesPlease -.endif - USE_GMAKE = Yes USE_GROFF = Yes diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 83b70015c23..79e933850c3 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.145 2016/03/11 20:28:25 naddy Exp $ +# $OpenBSD: Makefile,v 1.146 2016/03/12 23:23:38 naddy Exp $ COMMENT-main= subversion revision control system COMMENT-perl= perl interface to subversion @@ -91,10 +91,6 @@ WANTLIB-ap2 += ${_lib}>=${SO_VERSION} .endfor RUN_DEPENDS-ap2= www/apache-httpd -NOT_FOR_ARCHS-perl = ${NO_SHARED_ARCHS} -NOT_FOR_ARCHS-python = ${NO_SHARED_ARCHS} -NOT_FOR_ARCHS-ruby = ${NO_SHARED_ARCHS} - WANTLIB-perl= ${WANTLIB} apr-1 aprutil-1 sqlite3 RUN_DEPENDS-perl= ${MODGETTEXT_RUN_DEPENDS} LIB_DEPENDS-perl= ${MODGETTEXT_LIB_DEPENDS} ${MAINSPEC} diff --git a/sysutils/gamin/Makefile b/sysutils/gamin/Makefile index 74c92e65209..f9aeea1d210 100755 --- a/sysutils/gamin/Makefile +++ b/sysutils/gamin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2015/03/19 20:25:27 naddy Exp $ +# $OpenBSD: Makefile,v 1.39 2016/03/12 23:23:38 naddy Exp $ # XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated) CFLAGS += "-DG_CONST_RETURN=const" @@ -30,7 +30,6 @@ PERMIT_PACKAGE_CDROM= Yes EXTRACT_SUFX= .tar.bz2 MULTI_PACKAGES= -main -python -NOT_FOR_ARCHS-python = ${NO_SHARED_ARCHS} PSEUDO_FLAVORS= no_python FLAVOR?=