Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Jan 2019 13:38:59 +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: r491718 - head/devel/cvsweb
Message-ID:  <201901311338.x0VDcxmb096171@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
 
 # 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},' \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901311338.x0VDcxmb096171>