Bug 147833 - Update port: security/gorilla change MASTER_SITES + take maintainership
Summary: Update port: security/gorilla change MASTER_SITES + take maintainership
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-06-13 14:10 UTC by Chris Rees
Modified: 2010-07-12 04:10 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Chris Rees 2010-06-13 14:10:01 UTC
	gorilla needed an update, since the origin has moved to github.org MASTER_SITES were changed. I've also copied the tarball onto my web server making another MASTER_SITE

Fix: 

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.--4OuDMNMNTjtIvm6CQjrpO65OLujQWbqt8kn5PKNsZwnTKUXx
Content-Type: text/plain; name="gorilla-1.5.3-patch.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="gorilla-1.5.3-patch.diff"

diff -ruN security/gorilla.orig/Makefile security/gorilla/Makefile
--- security/gorilla.orig/Makefile	2009-11-21 15:28:44.000000000 +0000
+++ security/gorilla/Makefile	2010-06-13 13:56:17.000000000 +0100
@@ -6,28 +6,32 @@
 #
 
 PORTNAME=	gorilla
-PORTVERSION=	1.4
-PORTREVISION=	4
+PORTVERSION=	1.5.3
+DISTVERSIONSUFFIX=	1996106
 CATEGORIES=	security
-MASTER_SITES=	http://www.fpx.de/fp/Software/Gorilla/download/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Password Gorilla is cross-platform Password Manager
-
-LIB_DEPENDS=	itcl.3:${PORTSDIR}/lang/itcl
-RUN_DEPENDS=	${LOCALBASE}/lib/bwidget/init.tcl:${PORTSDIR}/x11-toolkits/bwidget
-
-USE_TCL_RUN=	84
-USE_TK=		84
-GNU_CONFIGURE=	yes
+MASTER_SITES=	http://download.github.com/\
+				http://www.bayofrum.net/dist/gorilla/
+DISTNAME=		zdia-${PORTNAME}-v${DISTVERSION}-0-g${DISTVERSIONSUFFIX}
+
+MAINTAINER=	utisoft@gmail.com
+COMMENT=	Password Gorilla is a cross-platform Password Manager
+
+RUN_DEPENDS=	${LOCALBASE}/lib/bwidget/init.tcl:${PORTSDIR}/x11-toolkits/bwidget \
+				itcl>=3.4:${PORTSDIR}/lang/itcl
+
+WRKSRC=			${WRKDIR}/zdia-${PORTNAME}-${DISTVERSIONSUFFIX}
+USE_TCL_RUN=	85+
+USE_TK=		85+
 NO_BUILD=	yes
+SUB_FILES=	gorilla
+SUB_LIST=	WISH=wish
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/gorilla
-	@${INSTALL_SCRIPT} ${WRKSRC}/*.tcl ${PREFIX}/lib/gorilla
-	${TAR} -C ${WRKSRC} -cf - blowfish pics pwsafe twofish sha1 | \
+	@${INSTALL_SCRIPT} ${WRKSRC}/sources/*.tcl ${PREFIX}/lib/gorilla
+	${TAR} -C ${WRKSRC}/sources -cf - blowfish pics pwsafe twofish sha1 | \
 		${TAR} -C ${PREFIX}/lib/gorilla --unlink -xf -
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 
 post-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gorilla
diff -ruN security/gorilla.orig/distinfo security/gorilla/distinfo
--- security/gorilla.orig/distinfo	2006-08-23 12:41:37.000000000 +0100
+++ security/gorilla/distinfo	2010-06-13 13:56:17.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (gorilla-1.4.tar.gz) = 9914efa3ddaf309de76f083c43f57dce
-SHA256 (gorilla-1.4.tar.gz) = 3184ff802d0f96250302e2ce1a966d5eca328e8e0becc44e037208af32ee0551
-SIZE (gorilla-1.4.tar.gz) = 190766
+MD5 (zdia-gorilla-v1.5.3-0-g1996106.tar.gz) = 441f7599e758fe83b942d812f3c5414a
+SHA256 (zdia-gorilla-v1.5.3-0-g1996106.tar.gz) = cbb9d7c4af96b29a9337df4311853b9df5427aa3ff0b4c1e51b11d1471b1e580
+SIZE (zdia-gorilla-v1.5.3-0-g1996106.tar.gz) = 350166
diff -ruN security/gorilla.orig/files/gorilla.in security/gorilla/files/gorilla.in
--- security/gorilla.orig/files/gorilla.in	1970-01-01 01:00:00.000000000 +0100
+++ security/gorilla/files/gorilla.in	2010-06-13 13:56:18.000000000 +0100
@@ -0,0 +1,10 @@
+#! /bin/sh
+# the next line restarts using wish \
+exec %%WISH%% "$0" ${1+"$@"}
+set myName [info script]
+if {![catch {
+    set linkName [file readlink $myName]
+}]} {
+    set myName $linkName
+}
+source [file join [file dirname $myName] %%PREFIX%%/lib/gorilla/gorilla.tcl]
diff -ruN security/gorilla.orig/files/patch-gorilla.in security/gorilla/files/patch-gorilla.in
--- security/gorilla.orig/files/patch-gorilla.in	2006-03-20 19:20:10.000000000 +0000
+++ security/gorilla/files/patch-gorilla.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
---- gorilla.in.orig	Sun Dec  5 22:21:54 2004
-+++ gorilla.in	Sat Feb 11 12:30:44 2006
-@@ -7,4 +7,4 @@
- }]} {
-     set myName $linkName
- }
--source [file join [file dirname $myName] gorilla.tcl]
-+source [file join [file dirname $myName] @prefix@/lib/gorilla/gorilla.tcl]
diff -ruN security/gorilla.orig/pkg-descr security/gorilla/pkg-descr
--- security/gorilla.orig/pkg-descr	2006-03-26 15:27:11.000000000 +0100
+++ security/gorilla/pkg-descr	2010-06-13 13:57:21.000000000 +0100
@@ -2,4 +2,4 @@
 compatible with "Password Safe" from Windows.
 It uses TCL/Tk and runs on most platforms supported by Tcl/Tk.
 
-WWW:	http://www.fpx.de/fp/Software/Gorilla
+WWW:	http://github.com/zdia/gorilla
diff -ruN security/gorilla.orig/pkg-plist security/gorilla/pkg-plist
--- security/gorilla.orig/pkg-plist	2006-10-03 09:55:22.000000000 +0100
+++ security/gorilla/pkg-plist	2010-06-13 13:56:18.000000000 +0100
@@ -6,6 +6,7 @@
 lib/gorilla/blowfish/blowfish.tcl
 lib/gorilla/blowfish/blowtest.tcl
 lib/gorilla/blowfish/pkgIndex.tcl
+lib/gorilla/pics/browse.gif
 lib/gorilla/pics/gorilla-16x16.gif
 lib/gorilla/pics/gorilla-32x32.gif
 lib/gorilla/pics/gorilla-48x48.gif
Comment 1 Chris Rees 2010-06-13 14:31:09 UTC
Sorry, forgot to mention that files/patch-gorilla.in was deleted.

So the directory tree afterwards should be:


[chris@amnesiac]/usr/ports% find security/gorilla/
security/gorilla/
security/gorilla/files
security/gorilla/files/gorilla.in
security/gorilla/Makefile
security/gorilla/distinfo
security/gorilla/pkg-descr
security/gorilla/pkg-plist
[chris@amnesiac]/usr/ports%


Sorry about that!
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2010-06-13 18:09:41 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

I'll take it.
Comment 3 Martin Wilke freebsd_committer freebsd_triage 2010-07-12 04:04:32 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2010-07-12 04:04:35 UTC
miwi        2010-07-12 03:04:22 UTC

  FreeBSD ports repository

  Modified files:
    security/gorilla     Makefile distinfo pkg-descr pkg-plist 
  Added files:
    security/gorilla/files gorilla.in 
  Removed files:
    security/gorilla/files patch-gorilla.in 
  Log:
  - Update to 1.5.3
  - Pass maintainership to submitter
  
  PR:             147833
  Submitted by:   Chris Rees <utisoft@gmail.com>
  
  Revision  Changes    Path
  1.12      +20 -16    ports/security/gorilla/Makefile
  1.3       +3 -3      ports/security/gorilla/distinfo
  1.1       +10 -0     ports/security/gorilla/files/gorilla.in (new)
  1.2       +0 -8      ports/security/gorilla/files/patch-gorilla.in (dead)
  1.3       +1 -1      ports/security/gorilla/pkg-descr
  1.4       +2 -1      ports/security/gorilla/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"