Date: Mon, 30 Jul 2012 15:38:16 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r301720 - in head: . www/aolserver Message-ID: <201207301538.q6UFcGjZ008116@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207301538.q6UFcGjZ008116>