From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 23 04:10:02 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BDB5106566C for ; Sat, 23 Jan 2010 04:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1524D8FC0A for ; Sat, 23 Jan 2010 04:10:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0N4A1TC055246 for ; Sat, 23 Jan 2010 04:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0N4A1hu055245; Sat, 23 Jan 2010 04:10:01 GMT (envelope-from gnats) Resent-Date: Sat, 23 Jan 2010 04:10:01 GMT Resent-Message-Id: <201001230410.o0N4A1hu055245@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sevan Janiyan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B29A106566C for ; Sat, 23 Jan 2010 04:01:04 +0000 (UTC) (envelope-from sevan@newbie.thingamajig-systems.co.uk) Received: from newbie.thingamajig-systems.co.uk (newbie.thingamajig-systems.co.uk [93.97.185.103]) by mx1.freebsd.org (Postfix) with ESMTP id 5924B8FC0A for ; Sat, 23 Jan 2010 04:01:02 +0000 (UTC) Received: from newbie.thingamajig-systems.co.uk (localhost [127.0.0.1]) by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3) with ESMTP id o0N3vXmH037758; Sat, 23 Jan 2010 03:57:33 GMT (envelope-from sevan@newbie.thingamajig-systems.co.uk) Received: (from root@localhost) by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3/Submit) id o0N3vXdO037757; Sat, 23 Jan 2010 03:57:33 GMT (envelope-from sevan) Message-Id: <201001230357.o0N3vXdO037757@newbie.thingamajig-systems.co.uk> Date: Sat, 23 Jan 2010 03:57:33 GMT From: Sevan Janiyan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: tabthorpe@FreeBSD.org Subject: ports/143103: [PATCH] net/citrix_ica: use $SUB_FILES & $SUB_LIST to update scripts X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jan 2010 04:10:02 -0000 >Number: 143103 >Category: ports >Synopsis: [PATCH] net/citrix_ica: use $SUB_FILES & $SUB_LIST to update scripts >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: Sat Jan 23 04:10:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Sevan Janiyan >Release: FreeBSD 8.0-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 21:11:58 UTC >Description: instead of invoking sed manually Added file(s): - files/wfcmgr.in - files/wfica.in Removed file(s): - files/wfcmgr - files/wfica Port maintainer (tabthorpe@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- citrix_ica-10.6_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/citrix_ica/Makefile,v retrieving revision 1.52 diff -u -r1.52 Makefile --- Makefile 19 Mar 2009 17:28:47 -0000 1.52 +++ Makefile 23 Jan 2010 03:55:23 -0000 @@ -35,6 +35,9 @@ PLIST_SUB+= HAVE_ICA_CERTS="@comment " .endif +SUB_FILES= wfcmgr wfica +SUB_LIST= CDIR=${CDIR} + .include .if defined(BATCH) || defined(PACKAGE_BUILDING) @@ -76,13 +79,9 @@ ${ECHO} "-----------------------------------------------------------" ; \ ${FALSE} ; \ fi - ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfcmgr \ - > ${WRKSRC}/wfcmgr.x - ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfica \ - > ${WRKSRC}/wfica.x cd ${WRKSRC} && ${SH} -c './setupwfc' - ${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr - ${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica + ${INSTALL_SCRIPT} ${WRKDIR}/wfcmgr ${PREFIX}/bin/wfcmgr + ${INSTALL_SCRIPT} ${WRKDIR}/wfica ${PREFIX}/bin/wfica # XXX: This is missing a "${BRANDELF} -t Linux ". .if defined(ICA_CERTS) Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/net/citrix_ica/pkg-descr,v retrieving revision 1.6 diff -u -r1.6 pkg-descr --- pkg-descr 3 Jan 2008 20:22:58 -0000 1.6 +++ pkg-descr 23 Jan 2010 03:55:23 -0000 @@ -16,7 +16,6 @@ If your Citrix server does not have one of the supplied root-certificates, you can copy the certificate to /usr/ports/distfiles and add the following line to your /etc/make.conf: - ICA_CERTS=mycert.crt It will then automatically be installed and removed with the normal Index: files/wfcmgr =================================================================== RCS file: files/wfcmgr diff -N files/wfcmgr --- files/wfcmgr 21 Sep 1998 21:30:24 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -#!/bin/sh -export ICAROOT=DESTINATION -exec $ICAROOT/wfcmgr Index: files/wfcmgr.in =================================================================== RCS file: files/wfcmgr.in diff -N files/wfcmgr.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/wfcmgr.in 23 Jan 2010 03:55:23 -0000 @@ -0,0 +1,3 @@ +#!/bin/sh +export ICAROOT=%%CDIR%% +exec $ICAROOT/wfcmgr Index: files/wfica =================================================================== RCS file: files/wfica diff -N files/wfica --- files/wfica 9 Sep 2002 18:25:01 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -#!/bin/sh -export ICAROOT=DESTINATION -exec $ICAROOT/wfica "$@" Index: files/wfica.in =================================================================== RCS file: files/wfica.in diff -N files/wfica.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/wfica.in 23 Jan 2010 03:55:23 -0000 @@ -0,0 +1,3 @@ +#!/bin/sh +export ICAROOT=%%CDIR%% +exec $ICAROOT/wfica "$@" --- citrix_ica-10.6_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: