Date: Wed, 18 May 2011 19:47:38 GMT From: Chris Rees <utisoft@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/157164: Fix port: www/pubcookie-login-server uses CONF_FILES internally Message-ID: <201105181947.p4IJlcsc032879@red.freebsd.org> Resent-Message-ID: <201105181950.p4IJoCJN033977@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157164
>Category: ports
>Synopsis: Fix port: www/pubcookie-login-server uses CONF_FILES internally
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed May 18 19:50:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Chris Rees
>Release:
>Organization:
>Environment:
>Description:
As discussed on ports@ and with bapt, new variables CONF_FILES and CONF_DIRS are to be introduced to bsd.port.mk.
This causes problems in some ports, of which this is one.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/www/pubcookie-login-server/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 25 Feb 2011 01:32:11 -0000 1.7
+++ Makefile 18 May 2011 18:43:56 -0000
@@ -35,15 +35,16 @@
PC_DIR= ${PREFIX}/${PC_BASE}
SUB_FILES+= pkg-install
-SUB_LIST+= CONF_FILES="${CONF_FILES}" CONF_DIRS="${CONF_DIRS}"
+SUB_LIST+= CONF_FILES="${PUBCOOKIE_CONF_FILES}" \
+ CONF_DIRS="${PUBCOOKIE_CONF_DIRS}"
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${PKGINSTALL}
.include "${.CURDIR}/Makefile.templates"
-CONF_FILES+= ${LOGIN_TEMPLATES:C|(.*)|${PC_BASE}/login_templates.default/\1:${PC_BASE}/login_templates/\1|}
-CONF_DIRS+= ${PC_BASE}/login_templates
-CONF_FILES+= ${LOGIN_IMAGES:C|(.*)|${PC_BASE}/login_templates.default/images/\1:${PC_BASE}/login/images/\1|}
-CONF_DIRS+= ${PC_BASE}/login/images
-CONF_FILES+= ${PC_BASE}/config.login.sample:${PC_BASE}/config
+PUBCOOKIE_CONF_FILES+= ${LOGIN_TEMPLATES:C|(.*)|${PC_BASE}/login_templates.default/\1:${PC_BASE}/login_templates/\1|}
+PUBCOOKIE_CONF_DIRS+= ${PC_BASE}/login_templates
+PUBCOOKIE_CONF_FILES+= ${LOGIN_IMAGES:C|(.*)|${PC_BASE}/login_templates.default/images/\1:${PC_BASE}/login/images/\1|}
+PUBCOOKIE_CONF_DIRS+= ${PC_BASE}/login/images
+PUBCOOKIE_CONF_FILES+= ${PC_BASE}/config.login.sample:${PC_BASE}/config
# XXX Add Kerberos
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105181947.p4IJlcsc032879>