svn commit: r414642 - in head/www: sogo3 sogo3-activesync

[Jose Alonso Cardenas Marquez]

Author: acm
Date: Thu May  5 13:08:29 2016
New Revision: 414642
URL: https://svnweb.freebsd.org/changeset/ports/414642

Log:
  - Pass maintainer to euan at potensol.com
  - Fix path of configuration files
  - Fix CONFLICTS
  - Bump PORTREVISION

Modified:
  head/www/sogo3-activesync/Makefile
  head/www/sogo3/Makefile

Modified: head/www/sogo3-activesync/Makefile
==============================================================================
--- head/www/sogo3-activesync/Makefile	Thu May  5 12:37:15 2016	(r414641)
+++ head/www/sogo3-activesync/Makefile	Thu May  5 13:08:29 2016	(r414642)
@@ -2,9 +2,9 @@
 
 PKGNAMESUFFIX=		-activesync
 
-MAINTAINER=		acm at FreeBSD.org
+MAINTAINER=		euan at potensol.com
 
-CONFLICTS=		sogo-[0-9]*
+CONFLICTS=		sogo[2-3]-[0-9]*
 
 OPTIONS_SLAVE=		ACTIVESYNC
 

Modified: head/www/sogo3/Makefile
==============================================================================
--- head/www/sogo3/Makefile	Thu May  5 12:37:15 2016	(r414641)
+++ head/www/sogo3/Makefile	Thu May  5 13:08:29 2016	(r414642)
@@ -3,11 +3,12 @@
 
 PORTNAME=		sogo3
 PORTVERSION=		3.0.2
+PORTREVISION=		1
 CATEGORIES=		www gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOGo-${PORTVERSION}
 
-MAINTAINER=		acm at FreeBSD.org
+MAINTAINER=		euan at potensol.com
 COMMENT=		Groupware server with a focus on scalability and open standards
 
 LICENSE=		GPLv2
@@ -31,13 +32,13 @@ USES=			gnustep objc
 USE_GNUSTEP=		base build
 USE_LDCONFIG=		${GNUSTEP_LOCAL_LIBRARIES}/sogo
 
-CONFLICTS?=		sogo-activesync-[0-9]* sogo-[0-9]*
+CONFLICTS?=		sogo[2-3]-activesync-[0-9]* sogo2-[0-9]*
 
 USE_RC_SUBR=		sogod
 
 SUB_LIST+=		GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
 			GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES}
-
+ETCDIR=			${PREFIX}/etc/${PORTNAME:S/3//}
 CONFIGURE_ARGS=		--disable-debug --enable-strip
 
 post-patch: