[Midnightbsd-cvs] mports [16518] trunk/devel/subversion: drop kde support

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Aug 22 21:18:57 EDT 2014


Revision: 16518
          http://svnweb.midnightbsd.org/mports/?rev=16518
Author:   laffer1
Date:     2014-08-22 21:18:57 -0400 (Fri, 22 Aug 2014)
Log Message:
-----------
drop kde support

Modified Paths:
--------------
    trunk/devel/subversion/Makefile
    trunk/devel/subversion/Makefile.common
    trunk/devel/subversion/pkg-plist

Modified: trunk/devel/subversion/Makefile
===================================================================
--- trunk/devel/subversion/Makefile	2014-08-23 01:16:15 UTC (rev 16517)
+++ trunk/devel/subversion/Makefile	2014-08-23 01:18:57 UTC (rev 16518)
@@ -7,11 +7,6 @@
 
 USE_RC_SUBR=	svnserve
 
-MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnrdump.1 \
-		svnsync.1 svnversion.1 svnmucc.1
-MAN5=		svnserve.conf.5
-MAN8=		svnserve.8
-
 PORTDOCS=	BUGS CHANGES COMMITTERS INSTALL README
 
 OPTIONS_DEFINE=	\
@@ -19,7 +14,6 @@
 		DOCS		\
 		FREEBSD_TEMPLATE\
 		GNOME_KEYRING	\
-		KDE_KWALLET	\
 		MAINTAINER_DEBUG\
 		MOD_DAV_SVN	\
 		NLS		\
@@ -36,7 +30,6 @@
 		SERF
 
 GNOME_KEYRING_DESC=	Build with GNOME Keyring auth support
-KDE_KWALLET_DESC=	Build with KDE KWallet auth support
 MAINTAINER_DEBUG_DESC=	Build debug version
 MOD_DAV_SVN_DESC=	mod_dav_svn module for Apache 2.X
 P4_STYLE_MARKERS_DESC=	Perforce-style conflict markers
@@ -206,12 +199,6 @@
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${FALSE}
 .endif
-.if ${PORT_OPTIONS:MKDE_WALLET}
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${ECHO_MSG} "!!! KDE Wallet and static build are not compatible !!!"
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${FALSE}
-.endif
 	@${ECHO_MSG} "Static binaries will be built."
 .endif
 	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}"

Modified: trunk/devel/subversion/Makefile.common
===================================================================
--- trunk/devel/subversion/Makefile.common	2014-08-23 01:16:15 UTC (rev 16517)
+++ trunk/devel/subversion/Makefile.common	2014-08-23 01:18:57 UTC (rev 16518)
@@ -9,7 +9,6 @@
 MASTER_SITE_SUBDIR=	subversion
 
 USE_AUTOTOOLS=	libtool
-USE_KDE4=	# Used below if KWallet support is enabled
 USES+=		pkgconfig tar:bzip2
 
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|7].[0-9]*
@@ -90,7 +89,7 @@
 .endif
 
 # KWallet requires NLS to be enabled.
-.if ${PORT_OPTIONS:MNLS} || ${PORT_OPTIONS:MKDE_KWALLET}
+.if ${PORT_OPTIONS:MNLS}
 USES+=	gettext
 PLIST_SUB+=	WITHOUT_GETTEXT=""
 .else
@@ -127,14 +126,7 @@
 PLIST_SUB+=	GNOME_KEYRING="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MKDE_KWALLET}
-USE_KDE4=	kdelibs runtime
-CONFIGURE_ARGS+=--with-kwallet=${KDE4_PREFIX}
-PLIST_SUB+=	KDE_KWALLET=""
-.else
 CONFIGURE_ARGS+=--without-kwallet
-PLIST_SUB+=	KDE_KWALLET="@comment "
-.endif
 
 .include <bsd.port.pre.mk>
 

Modified: trunk/devel/subversion/pkg-plist
===================================================================
--- trunk/devel/subversion/pkg-plist	2014-08-23 01:16:15 UTC (rev 16517)
+++ trunk/devel/subversion/pkg-plist	2014-08-23 01:18:57 UTC (rev 16518)
@@ -66,10 +66,6 @@
 %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.la
 %%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so
 %%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0
-%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.a
-%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.la
-%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so
-%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0
 lib/libsvn_client-1.a
 lib/libsvn_client-1.la
 %%DYNAMIC_ENABLED%%lib/libsvn_client-1.so



More information about the Midnightbsd-cvs mailing list