From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 2 20:20:01 2008 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 5282E1065674 for ; Mon, 2 Jun 2008 20:20:01 +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 413808FC17 for ; Mon, 2 Jun 2008 20:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m52KK13Z045305 for ; Mon, 2 Jun 2008 20:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m52KK103045304; Mon, 2 Jun 2008 20:20:01 GMT (envelope-from gnats) Resent-Date: Mon, 2 Jun 2008 20:20:01 GMT Resent-Message-Id: <200806022020.m52KK103045304@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, Beat Gätzi Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9D791065670 for ; Mon, 2 Jun 2008 20:11:54 +0000 (UTC) (envelope-from beat@chruetertee.ch) Received: from marvin.chruetertee.ch (marvin.chruetertee.ch [217.150.245.55]) by mx1.freebsd.org (Postfix) with ESMTP id 97B2E8FC1F for ; Mon, 2 Jun 2008 20:11:54 +0000 (UTC) (envelope-from beat@chruetertee.ch) Received: from _HOSTNAME_ (7-38.78-83.cust.bluewin.ch [83.78.38.7]) (authenticated bits=0) by marvin.chruetertee.ch (8.14.2/8.13.6) with ESMTP id m52KBpVY091615 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Mon, 2 Jun 2008 20:11:52 GMT (envelope-from beat@chruetertee.ch) Received: by _HOSTNAME_ (sSMTP sendmail emulation); Mon, 2 Jun 2008 22:12:09 +0200 Message-Id: <200806022011.m52KBpVY091615@marvin.chruetertee.ch> Date: Mon, 2 Jun 2008 22:12:09 +0200 From: "Beat Gätzi" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/124219: [MAINTAINER] deskutils/thinkingrock: update to 2.0.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Beat Gätzi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2008 20:20:01 -0000 >Number: 124219 >Category: ports >Synopsis: [MAINTAINER] deskutils/thinkingrock: update to 2.0.1 >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: Mon Jun 02 20:20:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Beat Gätzi >Release: FreeBSD 6.3-RELEASE i386 >Organization: >Environment: System: FreeBSD daedalus.network.local 6.3-RELEASE FreeBSD 6.3-RELEASE #0: Fri Jan 25 10:02:00 CET 2008 root@daedalus.network.local:/usr/obj/usr/src/sys/BEASTIE i386 >Description: - update thinkingrock to version 2.0.1 >How-To-Repeat: >Fix: --- thinkingrock.patch begins here --- diff -Naur thinkingrock.orig/Makefile thinkingrock/Makefile --- thinkingrock.orig/Makefile 2008-01-12 17:13:58.000000000 +0100 +++ thinkingrock/Makefile 2008-06-02 21:53:04.000000000 +0200 @@ -6,15 +6,14 @@ # PORTNAME= thinkingrock -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= deskutils java MASTER_SITES= SF -DISTNAME= tr-${PORTVERSION}.epsilon +DISTNAME= tr-${PORTVERSION} MAINTAINER= beat@chruetertee.ch COMMENT= Application for collecting and processing your thoughts -USE_ZIP= yes USE_JAVA= yes JAVA_VERSION= 1.5+ NO_BUILD= yes @@ -22,18 +21,21 @@ .include post-patch: - @${RM} ${WRKSRC}/bin/thinkingrock.exe - @${RM} ${WRKSRC}/bin/thinkingrock_w.exe - @${RM} ${WRKSRC}/bin/thinkingrock.orig - @${RM} ${WRKSRC}/bin/xdg-email.orig - @${RM} ${WRKSRC}/bin/xdg-open.orig + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/bin/tr + @${RM} ${WRKSRC}/install.html~ + @${RM} ${WRKSRC}/bin/tr.bak + @${RM} ${WRKSRC}/bin/tr.orig do-install: @${MKDIR} ${PREFIX}/${PORTNAME} @${CP} -r ${WRKSRC}/* ${PREFIX}/${PORTNAME} @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${PORTNAME} - @${LN} -sf ${PREFIX}/${PORTNAME}/bin/${PORTNAME} ${PREFIX}/bin/${PORTNAME} + @${LN} -sf ${PREFIX}/${PORTNAME}/bin/tr ${PREFIX}/bin/${PORTNAME} + @${LN} -sf ${PREFIX}/${PORTNAME}/bin/xdg-email ${PREFIX}/bin/xdg-email + @${LN} -sf ${PREFIX}/${PORTNAME}/bin/xdg-open ${PREFIX}/bin/xdg-open @${ECHO} bin/${PORTNAME} >> ${TMPPLIST} + @${ECHO} bin/xdg-email >> ${TMPPLIST} + @${ECHO} bin/xdg-open >> ${TMPPLIST} @(cd ${WRKSRC}; ${FIND} . ! -type d) | ${SORT} | ${SED} "s|^.|${PORTNAME}|" >> ${TMPPLIST} @(cd ${WRKSRC}; ${FIND} . -type d) | ${SORT} -r | ${SED} "s|^.|@dirrm ${PORTNAME}|" >> ${TMPPLIST} @(cd ${WRKSRC}; ${FIND} . -type d -empty) | ${SORT} -r | ${SED} "s|^.|@exec mkdir -p ${PORTNAME}|" >> ${TMPPLIST} diff -Naur thinkingrock.orig/distinfo thinkingrock/distinfo --- thinkingrock.orig/distinfo 2008-01-12 17:13:58.000000000 +0100 +++ thinkingrock/distinfo 2008-06-01 23:43:02.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (tr-2.0.epsilon.zip) = 404cd094a4f905366f79b54faef568a7 -SHA256 (tr-2.0.epsilon.zip) = 3c8ddf37c0b8d840f078c12ecca441565a43377f21126317e64013c21d60486d -SIZE (tr-2.0.epsilon.zip) = 17160643 +MD5 (tr-2.0.1.tar.gz) = 31f5472a8d5b7bb77aac12127d21a9b6 +SHA256 (tr-2.0.1.tar.gz) = c71b9498fe1971eba1643a7f3fdd7259675fe5f18bd03628811c983f5e19a565 +SIZE (tr-2.0.1.tar.gz) = 26135271 diff -Naur thinkingrock.orig/files/patch-bin_thinkingrock thinkingrock/files/patch-bin_thinkingrock --- thinkingrock.orig/files/patch-bin_thinkingrock 2008-01-12 17:13:58.000000000 +0100 +++ thinkingrock/files/patch-bin_thinkingrock 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ ---- bin/thinkingrock.orig Wed Jan 2 12:29:07 2008 -+++ bin/thinkingrock Wed Jan 2 12:29:15 2008 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # - # resolve symlinks diff -Naur thinkingrock.orig/files/patch-bin_tr thinkingrock/files/patch-bin_tr --- thinkingrock.orig/files/patch-bin_tr 1970-01-01 01:00:00.000000000 +0100 +++ thinkingrock/files/patch-bin_tr 2008-06-02 22:01:34.000000000 +0200 @@ -0,0 +1,22 @@ +--- bin/tr.orig 2008-05-31 03:33:36.000000000 +0200 ++++ bin/tr 2008-06-02 21:52:26.000000000 +0200 +@@ -4,7 +4,7 @@ + # resolve symlinks + # + +-PRG=$0 ++PRG=%%PREFIX%%/thinkingrock/bin/tr + + while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` +@@ -17,7 +17,9 @@ + done + + progdir=`dirname "$PRG"` +-APPNAME=`basename "$0"` ++APPNAME=tr ++ ++cd $progdir + + if [ -f "$progdir/../etc/$APPNAME".conf ] ; then + . "$progdir/../etc/$APPNAME".conf diff -Naur thinkingrock.orig/files/patch-bin_xdg-email thinkingrock/files/patch-bin_xdg-email --- thinkingrock.orig/files/patch-bin_xdg-email 2008-01-12 17:13:58.000000000 +0100 +++ thinkingrock/files/patch-bin_xdg-email 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ ---- bin/xdg-email.orig Wed Jan 2 12:29:26 2008 -+++ bin/xdg-email Wed Jan 2 12:29:47 2008 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - #--------------------------------------------- - # xdg-email - # diff -Naur thinkingrock.orig/files/patch-bin_xdg-open thinkingrock/files/patch-bin_xdg-open --- thinkingrock.orig/files/patch-bin_xdg-open 2008-01-12 17:13:58.000000000 +0100 +++ thinkingrock/files/patch-bin_xdg-open 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ ---- bin/xdg-open.orig Wed Jan 2 12:29:33 2008 -+++ bin/xdg-open Wed Jan 2 12:29:40 2008 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - #--------------------------------------------- - # xdg-open - # --- thinkingrock.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: