Date: Sun, 28 Oct 2012 20:12:38 +0100 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jgh@FreeBSD.org Subject: ports/173157: [PATCH] graphics/aoi: update to 2.9.2, take maintainership, OptionsNG Message-ID: <20121028191248.61B92430@hub.freebsd.org> Resent-Message-ID: <201210281920.q9SJK18M011707@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173157
>Category: ports
>Synopsis: [PATCH] graphics/aoi: update to 2.9.2, take maintainership, OptionsNG
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 28 19:20:01 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 2.9.2
- Take maintainership
Added file(s):
- files/aoi.in
- files/pkg-message.in
Removed file(s):
- files/aoi.sh.in
Makefile changed:
+LICENSE= GPLv2
+PORTDOCS= HISTORY README
+SUB_FILES= ${PORTNAME} \
+ pkg-message
+DESKTOP_ENTRIES=
+.include <bsd.port.options.mk>
Changed and refined
do-install:
+post-install:
pkg-descr
pkg-plist
Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
portlint -A
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
0 fatal errors and 1 warning found.
port test: clean
Build log
https://redports.org/buildarchive/20121028153757-7575/
>Fix:
--- aoi-2.9.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/aoi/Makefile ./Makefile
--- /usr/ports/graphics/aoi/Makefile 2011-07-21 07:02:36.000000000 +0200
+++ ./Makefile 2012-10-28 19:38:09.000000000 +0100
@@ -6,40 +6,57 @@
#
PORTNAME= aoi
-PORTVERSION= 2.5.1
-PORTREVISION= 2
+PORTVERSION= 2.9.2
CATEGORIES= graphics java
MASTER_SITES= SF/${PORTNAME}/ArtOfIllusion/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
+DIST_SUBDIR= java
-MAINTAINER= ports@FreeBSD.org
-COMMENT= An open source Java written 3D modelling and rendering studio
+MAINTAINER= nemysis@gmx.ch
+COMMENT= Open source Java written 3D modelling and rendering studio
+
+LICENSE= GPLv2
RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper
+USE_ZIP= yes
+EXTRACT_BEFORE_ARGS= -a -q
USE_JAVA= yes
JAVA_VERSION= 1.5+
-USE_ZIP= yes
NO_BUILD= yes
-WRKSRC= ${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g}
-EXTRACT_BEFORE_ARGS= -a -q
+WRKSRC= ${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g}
+PORTDOCS= HISTORY README
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
-SUB_FILES= aoi.sh
+SUB_FILES= ${PORTNAME} \
+ pkg-message
+
+DESKTOP_ENTRIES="Art of Illusion" "${COMMENT}" "${PORTNAME}" \
+ "${PORTNAME}" "Application;Graphics;" ${FALSE}
+
+.include <bsd.port.options.mk>
do-install:
- @${ECHO_MSG} -n ">> Installing ..."
- ${MKDIR} ${DATADIR}
- (cd ${WRKSRC} && ${FIND} ArtOfIllusion.jar Icons Plugins Scripts | \
- ${CPIO} -pdmuv -R${SHAREOWN}:${SHAREGRP} ${DATADIR})
- ${INSTALL_SCRIPT} ${WRKDIR}/aoi.sh ${PREFIX}/bin/aoi
+ ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+.for d in Icons Plugins Scripts lib *.jar
+ @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
+.endfor
+ @(cd ${WRKSRC} && ${CP} -r "Textures and Materials" ${DATADIR})
+
+post-install:
+# Fix Permission that user can write in Plugins and Scripts
+ @(cd ${DATADIR} && ${CHMOD} -R 774 Plugins Scripts)
+ ${LN} -sf ${DATADIR}/Icons/48x48.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
-.if !defined(NOPORTDOCS)
- @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
- (cd ${WRKSRC} && ${INSTALL_DATA} HISTORY LICENSE README ${DOCSDIR})
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
.endif
+ @${ECHO_CMD}
+ @${CAT} ${PKGMESSAGE}
+ @${ECHO_CMD}
+
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/aoi/distinfo ./distinfo
--- /usr/ports/graphics/aoi/distinfo 2011-07-03 16:11:00.000000000 +0200
+++ ./distinfo 2012-10-28 15:24:46.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (aoi251.zip) = 9a7ad546a4afb6ae40d9370c35eb3177550dc2b1014c0d1ddda116233e1a0a85
-SIZE (aoi251.zip) = 4532523
+SHA256 (java/aoi292.zip) = 17654da91aa78de15df712b486060676e27f17d8dda5053fd0a46adbdba2b220
+SIZE (java/aoi292.zip) = 6418282
diff -ruN --exclude=CVS /usr/ports/graphics/aoi/files/aoi.in ./files/aoi.in
--- /usr/ports/graphics/aoi/files/aoi.in 1970-01-01 01:00:00.000000000 +0100
+++ ./files/aoi.in 2012-10-28 13:19:15.000000000 +0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/graphics/aoi/files/aoi.sh.in,v 1.1 2005/02/03 00:51:59 hq Exp $
+
+export JAVA_VERSION="%%JAVA_VERSION%%"
+
+cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
+-Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/ArtOfIllusion.jar" "${@}"
diff -ruN --exclude=CVS /usr/ports/graphics/aoi/files/aoi.sh.in ./files/aoi.sh.in
--- /usr/ports/graphics/aoi/files/aoi.sh.in 2005-02-03 01:51:59.000000000 +0100
+++ ./files/aoi.sh.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/graphics/aoi/files/aoi.sh.in,v 1.1 2005/02/03 00:51:59 hq Exp $
-
-
-( cd "%%DATADIR%%" && \
- "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/ArtOfIllusion.jar" "${@}" )
diff -ruN --exclude=CVS /usr/ports/graphics/aoi/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/graphics/aoi/files/pkg-message.in 1970-01-01 01:00:00.000000000 +0100
+++ ./files/pkg-message.in 2012-10-28 20:05:56.000000000 +0100
@@ -0,0 +1,26 @@
+===============================================================================
+
+Art of Illusion has been installed.
+
+This package does not include all Plugins and Scripts.
+
+You could use Scripts & Plugins Manager to install additional
+Plugins and Scripts
+
+ http://aoisp.sourceforge.net/spmanagement.html
+
+In addition, you can search for additional Plugins and Scripts here:
+
+ http://aoisp.sourceforge.net/AoIRepository/
+
+and other Sites and put it in:
+
+ %%DATADIR%%/Plugins
+ %%DATADIR%%/Scripts/...
+
+After deinstallation, some files may stay in %%DATADIR%%,
+you can delete them with
+
+ rm -fr %%DATADIR%%
+
+===============================================================================
diff -ruN --exclude=CVS /usr/ports/graphics/aoi/pkg-descr ./pkg-descr
--- /usr/ports/graphics/aoi/pkg-descr 2007-03-23 09:52:40.000000000 +0100
+++ ./pkg-descr 2012-10-28 15:32:04.000000000 +0100
@@ -1,6 +1,7 @@
-Art of Illusion is a free, open source 3D modelling and rendering
-studio.
-
-Visit these following web pages for more information:
+Art of Illusion is a free, open source 3D modelling and rendering studio.
+Many of its capabilities rival those found in commercial programs.
+Highlights include subdivision surface based modelling tools,
+skeleton based animation, and a graphical language for designing procedural
+textures and materials..
WWW: http://aoi.sourceforge.net/
diff -ruN --exclude=CVS /usr/ports/graphics/aoi/pkg-plist ./pkg-plist
--- /usr/ports/graphics/aoi/pkg-plist 2008-11-16 22:29:03.000000000 +0100
+++ ./pkg-plist 2012-10-28 15:47:11.000000000 +0100
@@ -1,13 +1,10 @@
bin/aoi
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
%%DATADIR%%/ArtOfIllusion.jar
%%DATADIR%%/Icons/32x32.png
%%DATADIR%%/Icons/48x48.png
%%DATADIR%%/Icons/64x64.png
%%DATADIR%%/Plugins/Help/AOIHelp.zip
-%%DATADIR%%/Plugins/Help/helpgui-1.1a.jar
+%%DATADIR%%/Plugins/Help/helpgui-1.1b.jar
%%DATADIR%%/Plugins/Help/jhall.jar
%%DATADIR%%/Plugins/Help/jhelpaction.jar
%%DATADIR%%/Plugins/Help/pircbot.jar
@@ -29,6 +26,27 @@
%%DATADIR%%/Scripts/Tools/Sculpt.bsh
%%DATADIR%%/Scripts/Tools/Text.bsh
%%DATADIR%%/Scripts/Tools/Thicken.bsh
+%%DATADIR%%/Textures and Materials/Library/.DS_Store
+%%DATADIR%%/Textures and Materials/Library/Building Materials.aoi
+%%DATADIR%%/Textures and Materials/Library/Effects.aoi
+%%DATADIR%%/Textures and Materials/Library/Fire.aoi
+%%DATADIR%%/Textures and Materials/Library/Geography.aoi
+%%DATADIR%%/Textures and Materials/Library/Metal.aoi
+%%DATADIR%%/Textures and Materials/Library/Sky.aoi
+%%DATADIR%%/Textures and Materials/Library/Water.aoi
+%%DATADIR%%/Textures and Materials/Library/Wood.aoi
+%%DATADIR%%/lib/Buoy.jar
+%%DATADIR%%/lib/Buoyx.jar
+%%DATADIR%%/lib/Jama-1.0.2.jar
+%%DATADIR%%/lib/QuickTimeWriter.jar
+%%DATADIR%%/lib/beanshell.jar
+%%DATADIR%%/lib/gluegen-rt.jar
+%%DATADIR%%/lib/jogl.jar
+%%DATADIR%%/lib/svgSalamander.jar
+share/pixmaps/aoi.png
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/Textures and Materials/Library
+@dirrm %%DATADIR%%/Textures and Materials
@dirrm %%DATADIR%%/Scripts/Tools
@dirrm %%DATADIR%%/Scripts/Startup
@dirrm %%DATADIR%%/Scripts/Objects
@@ -37,4 +55,3 @@
@dirrm %%DATADIR%%/Plugins
@dirrm %%DATADIR%%/Icons
@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- aoi-2.9.2.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?20121028191248.61B92430>