From owner-svn-ports-all@FreeBSD.ORG  Mon Jul 30 15:38:16 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E981910656D5;
	Mon, 30 Jul 2012 15:38:16 +0000 (UTC)
	(envelope-from zeising@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BB0508FC15;
	Mon, 30 Jul 2012 15:38:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6UFcGlI008120;
	Mon, 30 Jul 2012 15:38:16 GMT (envelope-from zeising@svn.freebsd.org)
Received: (from zeising@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6UFcGjZ008116;
	Mon, 30 Jul 2012 15:38:16 GMT (envelope-from zeising@svn.freebsd.org)
Message-Id: <201207301538.q6UFcGjZ008116@svn.freebsd.org>
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Mon, 30 Jul 2012 15:38:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301720 - in head: . www/aolserver
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jul 2012 15:38:17 -0000

Author: zeising
Date: Mon Jul 30 15:38:16 2012
New Revision: 301720
URL: http://svn.freebsd.org/changeset/ports/301720

Log:
  Misc. fixes:
  - Remove pre/post include
  - No need for ARCH check since ONLY_FOR_ARCHS is used
  - Use USERS/GROUPS
  - Fix invalid @exec in plist causing directory to be created in the wrong
    place with pkgng
  
  Add nogroup to GIDs since this port uses it.
  
  PR:		ports/169984
  Submitted by:	maintainer
  Approved by:	kwm (mentor)

Modified:
  head/GIDs
  head/www/aolserver/Makefile
  head/www/aolserver/pkg-plist

Modified: head/GIDs
==============================================================================
--- head/GIDs	Mon Jul 30 15:30:35 2012	(r301719)
+++ head/GIDs	Mon Jul 30 15:38:16 2012	(r301720)
@@ -237,4 +237,5 @@ hadoop:*:955:
 pandora:*:956:
 razorback:*:957:
 gnunet:*:958:
+nogroup:*:65533
 nobody:*:65534:

Modified: head/www/aolserver/Makefile
==============================================================================
--- head/www/aolserver/Makefile	Mon Jul 30 15:30:35 2012	(r301719)
+++ head/www/aolserver/Makefile	Mon Jul 30 15:38:16 2012	(r301720)
@@ -26,6 +26,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 AOLSERVERBASE?=	${PORTNAME}
 AOLSERVERUSER?=	nobody
 AOLSERVERGROUP?=	nogroup
+USERS=	${AOLSERVERUSER}
+GROUPS=	${AOLSERVERGROUP}
 
 MANPREFIX=	${PREFIX}/${AOLSERVERBASE}
 USE_GMAKE=	yes
@@ -52,15 +54,11 @@ HTMLDOCS_DESC=	Install HTML documentatio
 MANPAGES_DESC=	Install manpages
 TESTS_DESC=	Install tests in example directory
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 SUB_LIST+=	MKDIR="${MKDIR}" ECHO_CMD="${ECHO_CMD}" \
 		CHOWN="${CHOWN}" CHMOD="${CHMOD}"
 
-.if (${ARCH} == "ia64")
-BROKEN=		does not compile on ia64
-.endif
-
 CONFIGURE_ENV+=		TCLSH="${TCLSH}"
 CONFIGURE_ARGS+=	--prefix="${PREFIX}/${AOLSERVERBASE}" \
 			--with-tcl="${TCL_LIBDIR}"
@@ -738,4 +736,4 @@ post-install:
 
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/aolserver/pkg-plist
==============================================================================
--- head/www/aolserver/pkg-plist	Mon Jul 30 15:30:35 2012	(r301719)
+++ head/www/aolserver/pkg-plist	Mon Jul 30 15:38:16 2012	(r301720)
@@ -832,8 +832,8 @@
 @dirrmtry %%AOLSERVERBASE%%/servers/server1
 @dirrmtry %%AOLSERVERBASE%%/servers
 @dirrmtry %%AOLSERVERBASE%%
-@exec mkdir -p %%AOLSERVERBASE%%/log
-@exec mkdir -p %%AOLSERVERBASE%%/servers/server1/modules/nslog
+@exec mkdir -p %D/%%AOLSERVERBASE%%/log
+@exec mkdir -p %D/%%AOLSERVERBASE%%/servers/server1/modules/nslog
 %%TESTS%%%%EXAMPLESDIR%%/tests/adp/test1.adp
 %%TESTS%%%%EXAMPLESDIR%%/tests/adp/test2.adp
 %%TESTS%%%%EXAMPLESDIR%%/tests/adp/test3.adp