Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Nov 2012 16:53:53 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/174015: [PATCH] finance/venice: update to 0.751beta, take maintainership, added desktop entry, icons, license
Message-ID:  <20121130155356.E51A9732@hub.freebsd.org>
Resent-Message-ID: <201211301600.qAUG007A099290@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         174015
>Category:       ports
>Synopsis:       [PATCH] finance/venice: update to 0.751beta, take maintainership, added desktop entry, icons, license
>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:   Fri Nov 30 16:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:
- Update to 0.751beta
- Take maintainership

Added file(s):
- files/venice.in
- pkg-plist

Makefile changed:
+MASTER_SITES=
+DIST_SUBDIR=	java
+LICENSE=	GPLv2
+INSTALLS_ICONS=
+DESKTOP_ENTRIES=
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDOCS}

Documentation refined
+PORTDOCS=	*
+DOCSRCDIR1=
+DOC_FILES1=

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

portlint -A
looks fine.

port test: clean

>Fix:

--- venice-0.751.b.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/finance/venice/Makefile ./Makefile
--- /usr/ports/finance/venice/Makefile	2012-11-16 09:02:11.000000000 +0100
+++ ./Makefile	2012-11-30 16:41:37.000000000 +0100
@@ -6,51 +6,63 @@
 #
 
 PORTNAME=	venice
-DISTVERSION=	0.71beta
+DISTVERSION=	0.751beta
 CATEGORIES=	finance java
-MASTER_SITES=	SF/mov/${PORTNAME}/0.71%20beta
-DISTNAME=	${PORTNAME}-${DISTVERSION}
+MASTER_SITES=	SF/mov/${PORTNAME}/0.751%20beta/ \
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}_icons${EXTRACT_SUFX}:icons
+DIST_SUBDIR=	java
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Merchant Of Venice, a stock market trading program
 
-NO_BUILD=	yes
+LICENSE=	GPLv2
+
 USE_JAVA=	yes
-JAVA_RUN=	yes
 JAVA_VERSION=	1.5+
+NO_BUILD=	yes
 
-JARFILE=	${PORTNAME}.jar
+PORTDOCS=	*
 
-PLIST_FILES=	bin/venice \
-		%%JAVAJARDIR%%/${JARFILE}
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	changelog.txt readme.txt
 
-# docs
-DOC_FILES=	doc/manual.txt \
-		doc/manual.html \
-		changelog.txt \
-		readme.txt
+DOCSRCDIR2=	${WRKSRC}/doc
+DOCSDIR2=	${DOCSDIR}/doc
+DOC_FILES2=	manual.html manual.txt
 
-.ifndef(NOPORTDOCS)
-PORTDOCS=	*
-.endif
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
+SUB_FILES=	${PORTNAME}
+
+INSTALLS_ICONS=	yes
+ICON_SIZES=	32x32 48x48 64x64 72x72 96x96 128x128
 
-.include <bsd.port.pre.mk>
+DESKTOP_ENTRIES="Venice" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Office;Finance;" ${FALSE}
 
-post-patch:
-	${REINPLACE_CMD} -e s,venice.jar,${JAVAJARDIR}/${JARFILE}, ${WRKSRC}/venice
+.include <bsd.port.options.mk>
 
 do-install:
-# docs
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar ${DATADIR}
+
+post-install:
+.for s in ${ICON_SIZES}
+	${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
+		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
+
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
 .endif
-# wrapper
-	@${INSTALL_SCRIPT} ${WRKSRC}/venice ${PREFIX}/bin/
-# jar
-	@${MKDIR} ${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${JAVAJARDIR}/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/finance/venice/distinfo ./distinfo
--- /usr/ports/finance/venice/distinfo	2012-11-16 09:02:11.000000000 +0100
+++ ./distinfo	2012-11-30 15:01:54.000000000 +0100
@@ -1,2 +1,4 @@
-SHA256 (venice-0.71beta.tar.gz) = fd5e1dfc069d194b27c9566c3fd3a627a4f839589390b7426ad5255341d40ca5
-SIZE (venice-0.71beta.tar.gz) = 3553122
+SHA256 (java/venice-0.751beta.tar.gz) = 47005ab8dd013f24828f969f086a7249876f50c10445c4229431f721a26379d0
+SIZE (java/venice-0.751beta.tar.gz) = 4187889
+SHA256 (java/venice_icons.tar.gz) = 88d377528717a6a1a98a705f3e46fd0f818dd5f3aa3ad25122361127ee9b9858
+SIZE (java/venice_icons.tar.gz) = 92672
diff -ruN --exclude=CVS /usr/ports/finance/venice/files/venice.in ./files/venice.in
--- /usr/ports/finance/venice/files/venice.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/venice.in	2012-11-30 15:37:02.000000000 +0100
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+export JAVA_VERSION="%%JAVA_VERSION%%"
+
+cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
+-Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/venice.jar" "${@}"
diff -ruN --exclude=CVS /usr/ports/finance/venice/pkg-descr ./pkg-descr
--- /usr/ports/finance/venice/pkg-descr	2012-11-16 09:02:11.000000000 +0100
+++ ./pkg-descr	2012-11-30 10:00:38.000000000 +0100
@@ -1,5 +1,3 @@
-[ excerpt taken from developer's web site ]
-
 Venice is a stock market trading program that supports portfolio
 management, charting, technical analysis, paper trading and
 experimental methods like genetic programming. Venice runs in a
diff -ruN --exclude=CVS /usr/ports/finance/venice/pkg-plist ./pkg-plist
--- /usr/ports/finance/venice/pkg-plist	1970-01-01 01:00:00.000000000 +0100
+++ ./pkg-plist	2012-11-30 15:04:37.000000000 +0100
@@ -0,0 +1,24 @@
+bin/venice
+share/icons/hicolor/128x128/apps/venice.png
+share/icons/hicolor/32x32/apps/venice.png
+share/icons/hicolor/48x48/apps/venice.png
+share/icons/hicolor/64x64/apps/venice.png
+share/icons/hicolor/72x72/apps/venice.png
+share/icons/hicolor/96x96/apps/venice.png
+%%DATADIR%%/venice.jar
+share/pixmaps/venice.png
+@dirrm %%DATADIR%%
+@dirrmtry share/icons/hicolor/96x96/apps
+@dirrmtry share/icons/hicolor/96x96
+@dirrmtry share/icons/hicolor/72x72/apps
+@dirrmtry share/icons/hicolor/72x72
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
--- venice-0.751.b.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121130155356.E51A9732>