Date: Thu, 31 Jan 2019 13:46:22 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491719 - head/devel/cvsweb3 Message-ID: <201901311346.x0VDkM3d001325@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Thu Jan 31 13:46:21 2019 New Revision: 491719 URL: https://svnweb.freebsd.org/changeset/ports/491719 Log: devel/cvsweb3: Do not set SUB_LIST after bsd.port.pre.mk The framework already adds PREFIX and DOCSDIR to it, so drop it entirely. Move variables that do not need to be after bsd.port.pre.mk up. Modified: head/devel/cvsweb3/Makefile Modified: head/devel/cvsweb3/Makefile ============================================================================== --- head/devel/cvsweb3/Makefile Thu Jan 31 13:38:59 2019 (r491718) +++ head/devel/cvsweb3/Makefile Thu Jan 31 13:46:21 2019 (r491719) @@ -32,11 +32,25 @@ CONFLICTS= cvsweb-2.* USES= perl5 shebangfix SHEBANG_FILES= cvsweb.cgi + NO_BUILD= yes NO_ARCH= yes +PLIST_SUB= CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}" CSSDIR="${CSSDIR}" \ + DIRPREFIX="${DIRPREFIX}" +SUB_FILES= pkg-message + OPTIONS_DEFINE= DOCS EXAMPLES +CONFFILES= cvsweb.conf \ + cvsweb.conf-freebsd \ + cvsweb.conf-openbsd \ + cvsweb.conf-netbsd \ + cvsweb.conf-ruby + +# Specify the title of your cvsweb site. +TITLE?= My CVS Repository + .include <bsd.port.pre.mk> # Specify where your repository belongs. @@ -45,9 +59,6 @@ OPTIONS_DEFINE= DOCS EXAMPLES CVSROOT= /home/cvs .endif -# Specify the title of your cvsweb site. -TITLE?= My CVS Repository - # Specify these directories in relative paths to ${PREFIX}. .if exists(${PREFIX}/www/cgi-bin) DIRPREFIX= www @@ -61,18 +72,6 @@ DIRPREFIX= share/apache CGIDIR?= ${DIRPREFIX}/cgi-bin ICONSDIR?= ${DIRPREFIX}/icons CSSDIR?= ${DIRPREFIX}/data/css - -CONFFILES= cvsweb.conf \ - cvsweb.conf-freebsd \ - cvsweb.conf-openbsd \ - cvsweb.conf-netbsd \ - cvsweb.conf-ruby - -PLIST_SUB+= CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}" CSSDIR="${CSSDIR}" \ - DIRPREFIX="${DIRPREFIX}" - -SUB_FILES= pkg-message -SUB_LIST= PREFIX="${PREFIX}" DOCSDIR="${DOCSDIR}" post-patch: @${SED} -i '' -e 's,/usr/local/etc/,${PREFIX}/etc/,' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901311346.x0VDkM3d001325>