From owner-svn-ports-head@freebsd.org Thu Jan 31 13:39:00 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4FED014AA591; Thu, 31 Jan 2019 13:39:00 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E9D218F12D; Thu, 31 Jan 2019 13:38:59 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D6518813C; Thu, 31 Jan 2019 13:38:59 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0VDcxKA096172; Thu, 31 Jan 2019 13:38:59 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0VDcxmb096171; Thu, 31 Jan 2019 13:38:59 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201901311338.x0VDcxmb096171@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Thu, 31 Jan 2019 13:38:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491718 - head/devel/cvsweb X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/devel/cvsweb X-SVN-Commit-Revision: 491718 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E9D218F12D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2019 13:39:00 -0000 Author: tobik Date: Thu Jan 31 13:38:59 2019 New Revision: 491718 URL: https://svnweb.freebsd.org/changeset/ports/491718 Log: devel/cvsweb: 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/cvsweb/Makefile Modified: head/devel/cvsweb/Makefile ============================================================================== --- head/devel/cvsweb/Makefile Thu Jan 31 13:31:51 2019 (r491717) +++ head/devel/cvsweb/Makefile Thu Jan 31 13:38:59 2019 (r491718) @@ -14,11 +14,23 @@ COMMENT= WWW CGI script to browse CVS repository trees CONFLICTS= cvsweb-3.* -NO_BUILD= yes USES= perl5 +NO_BUILD= yes +PLIST_SUB= CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}" +SUB_FILES= pkg-message + OPTIONS_DEFINE= DOCS +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 # Specify where your repository belongs. @@ -27,9 +39,6 @@ OPTIONS_DEFINE= DOCS 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) && exists(${PREFIX}/share/apache) CGIDIR?= share/apache/cgi-bin @@ -38,17 +47,6 @@ ICONSDIR?= share/apache/icons CGIDIR?= www/cgi-bin ICONSDIR?= www/icons .endif - -CONFFILES= cvsweb.conf \ - cvsweb.conf-freebsd \ - cvsweb.conf-openbsd \ - cvsweb.conf-netbsd \ - cvsweb.conf-ruby - -PLIST_SUB+= CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}" - -SUB_FILES= pkg-message -SUB_LIST= PREFIX="${PREFIX}" DOCSDIR="${DOCSDIR}" post-patch: @${REINPLACE_CMD} -i '' -e 's,!!PERL!!,${PERL},' \