From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 13 12:00:37 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6149316A41C for ; Wed, 13 Jul 2005 12:00:37 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB1C443D4C for ; Wed, 13 Jul 2005 12:00:33 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6DC0SRE045923 for ; Wed, 13 Jul 2005 12:00:28 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6DC0SGk045920; Wed, 13 Jul 2005 12:00:28 GMT (envelope-from gnats) Resent-Date: Wed, 13 Jul 2005 12:00:28 GMT Resent-Message-Id: <200507131200.j6DC0SGk045920@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, Linas Valiukas Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CA1C316A41C for ; Wed, 13 Jul 2005 11:59:20 +0000 (GMT) (envelope-from shirshegsm@gmail.com) Received: from wproxy.gmail.com (wproxy.gmail.com [64.233.184.197]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6860443D48 for ; Wed, 13 Jul 2005 11:59:20 +0000 (GMT) (envelope-from shirshegsm@gmail.com) Received: by wproxy.gmail.com with SMTP id 71so133521wri for ; Wed, 13 Jul 2005 04:59:19 -0700 (PDT) Received: by 10.54.33.7 with SMTP id g7mr276714wrg; Wed, 13 Jul 2005 04:58:31 -0700 (PDT) Received: from senaskompas.shirshegsm.com ([82.135.152.35]) by mx.gmail.com with ESMTP id g5sm536516wra.2005.07.13.04.58.30; Wed, 13 Jul 2005 04:58:31 -0700 (PDT) Message-Id: <200507131458.32556.shirshegsm@gmail.com> Date: Wed, 13 Jul 2005 14:58:32 +0300 From: Linas Valiukas To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/83379: [patch] net/tspc2 now respects PREFIX 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: Wed, 13 Jul 2005 12:00:37 -0000 >Number: 83379 >Category: ports >Synopsis: [patch] net/tspc2 now respects PREFIX >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jul 13 12:00:28 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Linas Valiukas >Release: FreeBSD 5.4-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD shirshegsm.lan13.satnet.lt 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #0: Wed Jun 1 00:11:23 EEST 2005 root@shirshegsm.lan13.satnet.lt:/usr/obj/usr/src/sys/HUBBLE i386 >Description: Patches have been updated to use PREFIX instead of /usr/local. >How-To-Repeat: >Fix: diff -ruN tspc2.bak/Makefile tspc2/Makefile --- tspc2.bak/Makefile Wed Jul 13 14:28:32 2005 +++ tspc2/Makefile Wed Jul 13 14:41:41 2005 @@ -7,6 +7,7 @@ PORTNAME= tspc2 PORTVERSION= 2.1.1 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://www.hexago.com/files/ DISTNAME= tspc-${PORTVERSION}-src @@ -19,7 +20,12 @@ MAN5= tspc.conf.5 MAN8= tspc.8 USE_RC_SUBR= tspc2.sh +USE_REINPLACE= yes MAKE_ARGS= target=freebsd installdir=${PREFIX} + +post-patch: + @${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|g' ${WRKSRC}/conf/tspc.conf.in + @${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|g' ${WRKSRC}/platform/freebsd/tsp_local.c .include diff -ruN tspc2.bak/files/patch-conf-tspc.conf.in tspc2/files/patch-conf-tspc.conf.in --- tspc2.bak/files/patch-conf-tspc.conf.in Wed Jul 13 14:28:32 2005 +++ tspc2/files/patch-conf-tspc.conf.in Wed Jul 13 14:29:10 2005 @@ -5,7 +5,7 @@ # from $tsp_dir/template # -tsp_dir=@tsp_dir@ -+tsp_dir=/usr/local/share/tspc2 ++tsp_dir=PREFIX/share/tspc2 # # authentication method: diff -ruN tspc2.bak/files/patch-platform-freebsd-tsp_local.c tspc2/files/patch-platform-freebsd-tsp_local.c --- tspc2.bak/files/patch-platform-freebsd-tsp_local.c Wed Jul 13 14:28:32 2005 +++ tspc2/files/patch-platform-freebsd-tsp_local.c Wed Jul 13 14:37:45 2005 @@ -6,14 +6,14 @@ -char *FileName = "tspc.conf"; -char *LogFile = "tspc.log"; -+char *FileName = "/usr/local/etc/tspc.conf"; ++char *FileName = "PREFIX/etc/tspc.conf"; +char *LogFile = "/var/log/tspc.log"; char *LogFileName = NULL; char *ScriptInterpretor = "/bin/sh"; char *ScriptExtension = "sh"; char *ScriptDir = NULL; -char *TspHomeDir = "/usr/local/etc/tsp"; -+char *TspHomeDir = "/usr/local/share/tspc2"; ++char *TspHomeDir = "PREFIX/share/tspc2"; char DirSeparator = '/'; int Verbose = 0; >Release-Note: >Audit-Trail: >Unformatted: