[pkgsrc/trunk]: pkgsrc/www/jalbum Update www/jalbum to 8.4

[martti <martti%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a4dfe511883d
branches:  trunk
changeset: 399130:a4dfe511883d
user:      martti <martti%pkgsrc.org@localhost>
date:      Sun Sep 13 17:28:03 2009 +0000

description:
Update www/jalbum to 8.4

Lost of updates and fixes.

diffstat:

 www/jalbum/Makefile |    27 +-
 www/jalbum/PLIST    |  2438 +++++++++++++++++++-------------------------------
 www/jalbum/distinfo |     8 +-
 3 files changed, 940 insertions(+), 1533 deletions(-)

diffs (truncated from 3154 to 300 lines):

diff -r c4d0b6d8fb5d -r a4dfe511883d www/jalbum/Makefile
--- a/www/jalbum/Makefile       Sun Sep 13 16:40:22 2009 +0000
+++ b/www/jalbum/Makefile       Sun Sep 13 17:28:03 2009 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2009/07/07 19:07:35 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2009/09/13 17:28:03 martti Exp $
 
-DISTNAME=              JAlbum${VERSION}
+DISTNAME=              Jalbum${VERSION}
 PKGNAME=               jalbum-${VERSION}
 #PKGREVISION=          1
 CATEGORIES=            www
@@ -11,29 +11,34 @@
 MAINTAINER=            martti%NetBSD.org@localhost
 HOMEPAGE=              http://jalbum.net/
 COMMENT=               Web photo album generator
+
 LICENSE=               gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-VERSION=               7.1
+VERSION=               8.4
 
 USE_JAVA=              run
-PKG_JVMS_ACCEPTED=     blackdown-jdk13 kaffe sun-jdk13 sun-jdk14 sun-jdk15
+PKG_JVMS_ACCEPTED=     sun-jdk15 sun-jdk6
 
-WRKSRC=                        ${WRKDIR}/JAlbum
+WRKSRC=                        ${WRKDIR}/Jalbum
 
-INSTALLATION_DIRS+=    ${PREFIX:Q}/share/jalbum
+INSTALLATION_DIRS+=    ${PREFIX}/share/jalbum
 
 USE_TOOLS+=            pax
 
+post-extract:
+       ${ECHO} "===> Removing invalid skins"
+       (cd ${WRKSRC} && rm -rf skins/Chameleon/styles/Black*)
+
 do-build:
-       sed     -e s#@PKG_JAVA_HOME@#${PKG_JAVA_HOME:Q}#g       \
-               -e s#@PREFIX@#${PREFIX:Q}#g                     \
-               < ${FILESDIR:Q}/jalbum > ${WRKDIR:Q}/jalbum
+       sed     -e s#@PKG_JAVA_HOME@#${PKG_JAVA_HOME}#g         \
+               -e s#@PREFIX@#${PREFIX}#g                       \
+               < ${FILESDIR}/jalbum > ${WRKDIR}/jalbum
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKDIR:Q}/jalbum ${DESTDIR}${PREFIX}/bin
-       (cd ${WRKDIR:Q}/JAlbum && pax -rw * ${DESTDIR}${PREFIX}/share/jalbum)
+       ${INSTALL_SCRIPT} ${WRKDIR}/jalbum ${DESTDIR}${PREFIX}/bin
+       (cd ${WRKDIR}/Jalbum && pax -rw * ${DESTDIR}${PREFIX}/share/jalbum)
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c4d0b6d8fb5d -r a4dfe511883d www/jalbum/PLIST
--- a/www/jalbum/PLIST  Sun Sep 13 16:40:22 2009 +0000
+++ b/www/jalbum/PLIST  Sun Sep 13 17:28:03 2009 +0000
@@ -1,63 +1,72 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 22:00:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/09/13 17:28:03 martti Exp $
 bin/jalbum
+share/jalbum/JAlbum.jar
 share/jalbum/StartJAlbum.bat
-share/jalbum/JAlbum.jar
-share/jalbum/includes/shutterfly.inc
+share/jalbum/distribution.txt
+share/jalbum/ext/InstantPreview.jar
+share/jalbum/ext/JCameraInfo.jar
+share/jalbum/ext/JPrint.jar
+share/jalbum/ext/JTextPad.jar
+share/jalbum/ext/JalbumFilters.jar
+share/jalbum/icons/JalbumApp.ico
+share/jalbum/icons/JalbumDoc.ico
+share/jalbum/icons/JalbumInstaller.ico
+share/jalbum/icons/JalbumSkin.ico
 share/jalbum/includes/printing.bsh
 share/jalbum/includes/printing.inc
+share/jalbum/includes/shutterfly.inc
 share/jalbum/includes/test.inc
-share/jalbum/res/folder.gif
-share/jalbum/res/djvu.gif
-share/jalbum/res/doc.gif
-share/jalbum/res/movie.gif
-share/jalbum/res/img.gif
-share/jalbum/res/mdb.gif
-share/jalbum/res/ooo_base.gif
-share/jalbum/res/ooo.gif
-share/jalbum/res/ooo_impress.gif
-share/jalbum/res/ooo_calc.gif
-share/jalbum/res/ooo_draw.gif
-share/jalbum/res/ooo_writer.gif
-share/jalbum/res/pdf.gif
-share/jalbum/res/ppt.gif
-share/jalbum/res/txt.gif
-share/jalbum/res/unknown.gif
-share/jalbum/res/xls.gif
-share/jalbum/res/xml.gif
-share/jalbum/res/zip.gif
-share/jalbum/filetypes.xml
-share/jalbum/license/sbbi-upnplib/other.pdf
-share/jalbum/license/sbbi-upnplib/mx4j.txt
+share/jalbum/lib/adobe-xmpcore-1.jar
+share/jalbum/lib/bsh-2.0b4.jar
+share/jalbum/lib/commons-collections-3.1.jar
+share/jalbum/lib/commons-logging.jar
+share/jalbum/lib/edtftpj-1.5.4.jar
+share/jalbum/lib/incors-alloy-1.4.4.jar
+share/jalbum/lib/jalbum-core.jar
+share/jalbum/lib/javax.servlet.jar
+share/jalbum/lib/javazoom-jlayer-1.0.jar
+share/jalbum/lib/jcraft-jsch-0.1.41.jar
+share/jalbum/lib/jdic-20061102.jar
+share/jalbum/lib/jdic_fileutil.jar
+share/jalbum/lib/linux/jdic_stub.jar
+share/jalbum/lib/linux/x86/libtray.so
+share/jalbum/lib/metadata-extractor.jar
+share/jalbum/lib/miglayout-3.7-swing.jar
+share/jalbum/lib/org.mortbay.jetty.jar
+share/jalbum/lib/sbbi-upnplib-1.0.4.jar
+share/jalbum/lib/sunos/jdic_stub.jar
+share/jalbum/lib/sunos/sparc/libtray.so
+share/jalbum/lib/sunos/x86/libtray.so
+share/jalbum/lib/swing-worker-1.2.jar
+share/jalbum/lib/windows/jdic_stub.jar
+share/jalbum/lib/windows/x86/jdic_fileutil.dll
+share/jalbum/lib/windows/x86/tray.dll
+share/jalbum/license/JSCH.txt
+share/jalbum/license/Jetty.txt
+share/jalbum/license/XMPCore.txt
+share/jalbum/license/edtFTPj.txt
+share/jalbum/license/jdic.txt
 share/jalbum/license/sbbi-upnplib/jakarta-common-jxpath.txt
 share/jalbum/license/sbbi-upnplib/jakarta-common-logging.txt
+share/jalbum/license/sbbi-upnplib/mx4j.txt
+share/jalbum/license/sbbi-upnplib/other.pdf
 share/jalbum/license/sbbi-upnplib/sbbi-bootstrap.txt
 share/jalbum/license/sbbi-upnplib/upnp-lib.pdf
 share/jalbum/license/sbbi-upnplib/upnp-lib.txt
-share/jalbum/license/edtFTPj.txt
-share/jalbum/license/jdic.txt
-share/jalbum/license/Jetty.txt
-share/jalbum/license/JSCH.txt
 share/jalbum/license/thirdparty-overview.html
-share/jalbum/init.bsh
-share/jalbum/linux/x86/libtray.so
-share/jalbum/linux/jdic_stub.jar
-share/jalbum/plugins/FixedShapeFilter.class
 share/jalbum/plugins/BlurFilter.class
 share/jalbum/plugins/BlurFilter.java
 share/jalbum/plugins/Compile.bat
+share/jalbum/plugins/FixedShapeFilter.class
 share/jalbum/plugins/FixedShapeFilter.java
 share/jalbum/plugins/GrayscaleFilter.class
 share/jalbum/plugins/GrayscaleFilter.java
 share/jalbum/plugins/LogoFilter.class
 share/jalbum/plugins/LogoFilter.java
-share/jalbum/plugins/makedoc.bat
 share/jalbum/plugins/Printing.class
 share/jalbum/plugins/Printing.java
-share/jalbum/plugins/readme.txt
 share/jalbum/plugins/PropertySettingFilterWrapper.class
 share/jalbum/plugins/PropertySettingFilterWrapper.java
-share/jalbum/plugins/WatermarkFilter.class
-share/jalbum/plugins/TextFilter.class
 share/jalbum/plugins/RotationFilter.class
 share/jalbum/plugins/RotationFilter.java
 share/jalbum/plugins/ShadowTextFilter.class
@@ -66,469 +75,176 @@
 share/jalbum/plugins/SharpenFilter.java
 share/jalbum/plugins/SimpleFilter.class
 share/jalbum/plugins/SimpleFilter.java
+share/jalbum/plugins/TextFilter.class
 share/jalbum/plugins/TextFilter.java
 share/jalbum/plugins/TintFilter.class
 share/jalbum/plugins/TintFilter.java
+share/jalbum/plugins/WatermarkFilter.class
 share/jalbum/plugins/WatermarkFilter.java
-share/jalbum/plugins/wishlist.txt
 share/jalbum/plugins/XBorderFilter.class
 share/jalbum/plugins/XBorderFilter.java
 share/jalbum/plugins/ZoomFilter.class
 share/jalbum/plugins/ZoomFilter.java
-share/jalbum/skins/BananAlbum/res/bananatree/arial-no-icon.swf
-share/jalbum/skins/BananAlbum/res/bananatree/arial-tree.swf
-share/jalbum/skins/BananAlbum/res/bananatree/chicago-tree.swf
-share/jalbum/skins/BananAlbum/res/bananatree/custom-tree.fla
-share/jalbum/skins/BananAlbum/res/bananatree/custom-tree.swf
-share/jalbum/skins/BananAlbum/res/bananatree/monaco-tree.swf
-share/jalbum/skins/BananAlbum/res/bananatree/no-icon.swf
-share/jalbum/skins/BananAlbum/res/bananatree/rudinpx-tree.swf
-share/jalbum/skins/BananAlbum/res/BananAlbum.swf
-share/jalbum/skins/BananAlbum/res/typefaces/arial.swf
-share/jalbum/skins/BananAlbum/res/typefaces/chicago.swf
-share/jalbum/skins/BananAlbum/res/typefaces/custom1.fla
-share/jalbum/skins/BananAlbum/res/typefaces/custom1.swf
-share/jalbum/skins/BananAlbum/res/typefaces/monaco.swf
-share/jalbum/skins/BananAlbum/res/typefaces/rudinpx.swf
-share/jalbum/skins/BananAlbum/res/download.html
-share/jalbum/skins/BananAlbum/res/download.php
-share/jalbum/skins/BananAlbum/res/folder.gif
-share/jalbum/skins/BananAlbum/res/loading.gif
-share/jalbum/skins/BananAlbum/res/scripts.js
-share/jalbum/skins/BananAlbum/styles/BananAlbum.css
-share/jalbum/skins/BananAlbum/comment.txt
-share/jalbum/skins/BananAlbum/hints.jap
-share/jalbum/skins/BananAlbum/index.htt
-share/jalbum/skins/BananAlbum/init.bsh
-share/jalbum/skins/BananAlbum/onload.bsh
-share/jalbum/skins/BananAlbum/preview.jpg
-share/jalbum/skins/BananAlbum/slide.htt
-share/jalbum/skins/BananAlbum/top.htt
-share/jalbum/skins/BluPlusPlus/bsh/slide-original.bsh
-share/jalbum/skins/BluPlusPlus/bsh/index.bsh
-share/jalbum/skins/BluPlusPlus/bsh/slide.bsh
-share/jalbum/skins/BluPlusPlus/config/audio-hidden-block.inc
-share/jalbum/skins/BluPlusPlus/config/audio-block.inc
-share/jalbum/skins/BluPlusPlus/config/cameras.properties
-share/jalbum/skins/BluPlusPlus/config/supported-audios.txt
-share/jalbum/skins/BluPlusPlus/config/supported-videos.txt
-share/jalbum/skins/BluPlusPlus/config/video-block.inc
-share/jalbum/skins/BluPlusPlus/docs/InstallationGuide.txt
-share/jalbum/skins/BluPlusPlus/docs/ChangesHistory.txt
-share/jalbum/skins/BluPlusPlus/docs/UserGuide.txt
-share/jalbum/skins/BluPlusPlus/docs/ReadMe.txt
-share/jalbum/skins/BluPlusPlus/res/actions/black/first_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/download.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/first.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/folder_small.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/folder.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/index.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/help.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/movie.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/info.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/last.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/previous.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/info_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/last_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/movie_small.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/next.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/next_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/order_print.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/pause.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/play.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/sound_small.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/sound.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/previous_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/black/up.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/first_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/download.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/first.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/folder_small.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/folder.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/index.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/help.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/movie.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/info.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/last.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/previous.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/info_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/last_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/movie_small.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/next.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/next_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/order_print.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/pause.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/play.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/sound_small.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/sound.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/previous_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/bright-matte/up.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/first_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/download.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/first.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/folder_small.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/folder.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/index.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/help.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/movie.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/info.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/last.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/previous.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/info_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/last_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/movie_small.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/next.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/next_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/order_print.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/pause.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/play.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/sound_small.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/sound.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/previous_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/dark-matte/up.gif
-share/jalbum/skins/BluPlusPlus/res/actions/universal/first_disabled.gif
-share/jalbum/skins/BluPlusPlus/res/actions/universal/download.gif
-share/jalbum/skins/BluPlusPlus/res/actions/universal/first.gif
-share/jalbum/skins/BluPlusPlus/res/actions/universal/folder_small.gif
-share/jalbum/skins/BluPlusPlus/res/actions/universal/folder.gif