svn commit: r358032 - in head: devel/subversion security/subversion-gnome-keyring security/subversion-kwallet www/mod_dav_svn

[Lev A. Serebryakov]

Author: lev
Date: Mon Jun 16 18:13:54 2014
New Revision: 358032
URL: http://svnweb.freebsd.org/changeset/ports/358032
QAT: https://qat.redports.org/buildarchive/r358032/

Log:
    Fix for FreeBSD 9.
    Fix messed up categories for slave ports.

Modified:
  head/devel/subversion/Makefile.common
  head/security/subversion-gnome-keyring/Makefile
  head/security/subversion-kwallet/Makefile
  head/www/mod_dav_svn/Makefile

Modified: head/devel/subversion/Makefile.common
==============================================================================
--- head/devel/subversion/Makefile.common	Mon Jun 16 18:04:53 2014	(r358031)
+++ head/devel/subversion/Makefile.common	Mon Jun 16 18:13:54 2014	(r358032)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	subversion
 PORTVERSION=	1.8.9
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES+=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 DIST_SUBDIR=	subversion18
@@ -68,7 +68,7 @@ CFLAGS+=	-fpic -DPIC
 OPTIONS_FILE_UNSET?=""
 OPTIONS_FILE_SET?=""
 
-.if (${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE}) && defined(ORGANIZATION)
+.if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
 CFLAGS+=	-DHAS_ORGANIZATION_NAME
 .endif
 
@@ -98,7 +98,7 @@ post-patch:
 .if defined(SVN_BUILD_ADDONS)
 	@${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}
 .endif
-.if (${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE}) && defined(ORGANIZATION)
+.if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
 	@${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h
 .endif
 # shebangfix

Modified: head/security/subversion-gnome-keyring/Makefile
==============================================================================
--- head/security/subversion-gnome-keyring/Makefile	Mon Jun 16 18:04:53 2014	(r358031)
+++ head/security/subversion-gnome-keyring/Makefile	Mon Jun 16 18:13:54 2014	(r358032)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-gnome-keyring
+CATEGORIES=	security gnome
 
 MAINTAINER=	lev at FreeBSD.org
 COMMENT=	Gnome KWyring integration for Version control system
@@ -17,8 +18,6 @@ LIB_DEPENDS+=		libgnome-keyring.so:${POR
 
 CONFIGURE_ARGS+=	--with-gnome-keyring
 
-CATEGORIES+=	gnome security
-
 ALL_TARGET=	gnome-keyring-lib
 INSTALL_TARGET=	install-gnome-keyring-lib
 

Modified: head/security/subversion-kwallet/Makefile
==============================================================================
--- head/security/subversion-kwallet/Makefile	Mon Jun 16 18:04:53 2014	(r358031)
+++ head/security/subversion-kwallet/Makefile	Mon Jun 16 18:13:54 2014	(r358032)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-kwallet
+CATEGORIES=	security kde
 
 MAINTAINER=	lev at FreeBSD.org
 COMMENT=	KDE KWallet integration for Version control system
@@ -17,8 +18,6 @@ USE_KDE4=		kdelibs runtime
 
 CONFIGURE_ARGS+=	--with-kwallet=${KDE4_PREFIX}
 
-CATEGORIES+=	kde security
-
 ALL_TARGET=	kwallet-lib
 INSTALL_TARGET=	install-kwallet-lib
 

Modified: head/www/mod_dav_svn/Makefile
==============================================================================
--- head/www/mod_dav_svn/Makefile	Mon Jun 16 18:04:53 2014	(r358031)
+++ head/www/mod_dav_svn/Makefile	Mon Jun 16 18:13:54 2014	(r358032)
@@ -4,6 +4,8 @@
 PORTNAME=	mod_dav_svn
 DISTNAME=	subversion-${PORTVERSION}
 
+CATEGORIES=	www
+
 MAINTAINER=	lev at FreeBSD.org
 COMMENT=	Apache module for subversion serving.
 
@@ -14,8 +16,6 @@ SVN_BUILD_ADDONS=	yes
 
 .include "${MASTERDIR}/Makefile.common"
 
-CATEGORIES+=	www
-
 USE_APACHE=	22+
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS} \