diff options
| -rw-r--r-- | www/album/Makefile | 28 | ||||
| -rw-r--r-- | www/album/PLIST | 183 | ||||
| -rw-r--r-- | www/album/distinfo | 10 | ||||
| -rw-r--r-- | www/album/patches/patch-aa | 37 |
4 files changed, 228 insertions, 30 deletions
diff --git a/www/album/Makefile b/www/album/Makefile index 9c7a54932d9..d3107992c00 100644 --- a/www/album/Makefile +++ b/www/album/Makefile @@ -1,15 +1,16 @@ -# $NetBSD: Makefile,v 1.18 2014/08/12 18:21:34 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2015/01/08 01:49:31 mef Exp $ DISTNAME= album -ALBUMREV= 3.07 +ALBUMREV= 4.12 PKGNAME= ${DISTNAME}-${ALBUMREV} -PKGREVISION= 9 CATEGORIES= www MASTER_SITES= http://marginalhacks.com/bin/ +DIST_SUBDIR= ${PKGNAME_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://marginalhacks.com/Hacks/album/ COMMENT= Generate HTML albums of images +#LICENSE= http://marginalhacks.com/License/ DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick DEPENDS+= jhead>=2.0:../../graphics/jhead @@ -23,12 +24,25 @@ USE_TOOLS+= perl:run REPLACE_PERL= ${MY_SCRIPT} NO_BUILD= YES -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/album/Pics +AUTO_MKDIRS= yes + +SUBST_CLASSES+= prefix +SUBST_MESSAGE.prefix= Adjust Install Path to ${PREFIX} +SUBST_STAGE.prefix= post-patch +SUBST_FILES.prefix= album +SUBST_VARS.prefix= PREFIX do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${MY_SCRIPT} ${DESTDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${MY_SCRIPT}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_DATA} ${WRKSRC}/Docs/[Sa-z]* ${DESTDIR}${PREFIX}/share/doc/album - ${INSTALL_DATA} ${WRKSRC}/Docs/Pics/* ${DESTDIR}${PREFIX}/share/doc/album/Pics + ${INSTALL_MAN} ${WRKSRC}/${MY_SCRIPT}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKSRC}/Docs/Section* ${DESTDIR}${PREFIX}/share/doc/album + ${INSTALL_DATA} ${WRKSRC}/Docs/txt* ${DESTDIR}${PREFIX}/share/doc/album + ${INSTALL_DATA} ${WRKSRC}/Docs/Pics/* ${DESTDIR}${PREFIX}/share/doc/album/Pics + for f in Short.html conf conf.bak flag.png index.html make_docs ; do \ + ${INSTALL_DATA} ${WRKSRC}/Docs/$${f} ${DESTDIR}${PREFIX}/share/doc/album ;\ + done + for d in de es fr hu it nl ru ; do \ + ${INSTALL_DATA} ${WRKSRC}/Docs/$${d}/* ${DESTDIR}${PREFIX}/share/doc/album/$${d} ;\ + done .include "../../mk/bsd.pkg.mk" diff --git a/www/album/PLIST b/www/album/PLIST index 86a6784688f..efea1db3ce4 100644 --- a/www/album/PLIST +++ b/www/album/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 22:00:14 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2015/01/08 01:49:31 mef Exp $ bin/album man/man1/album.1 share/doc/album/Pics/Caption.gif +share/doc/album/Pics/Caption.ru.gif share/doc/album/Section_1.html share/doc/album/Section_2.html share/doc/album/Section_3.html @@ -13,7 +14,187 @@ share/doc/album/Section_8.html share/doc/album/Short.html share/doc/album/conf share/doc/album/conf.bak +share/doc/album/de/Section_1.html +share/doc/album/de/Section_2.html +share/doc/album/de/Section_3.html +share/doc/album/de/Section_4.html +share/doc/album/de/Section_5.html +share/doc/album/de/Section_6.html +share/doc/album/de/Section_7.html +share/doc/album/de/Section_8.html +share/doc/album/de/Short.html +share/doc/album/de/conf +share/doc/album/de/flag.png +share/doc/album/de/index.html +share/doc/album/de/langhtml +share/doc/album/de/langmenu +share/doc/album/de/txt_1 +share/doc/album/de/txt_2 +share/doc/album/de/txt_3 +share/doc/album/de/txt_4 +share/doc/album/de/txt_5 +share/doc/album/de/txt_6 +share/doc/album/de/txt_7 +share/doc/album/de/txt_8 +share/doc/album/es/ATTRIBUTION +share/doc/album/es/Section_1.html +share/doc/album/es/Section_2.html +share/doc/album/es/Section_3.html +share/doc/album/es/Section_4.html +share/doc/album/es/Section_5.html +share/doc/album/es/Section_6.html +share/doc/album/es/Section_7.html +share/doc/album/es/Section_8.html +share/doc/album/es/Short.html +share/doc/album/es/broken.txt_2 +share/doc/album/es/conf +share/doc/album/es/flag.png +share/doc/album/es/index.html +share/doc/album/es/langhtml +share/doc/album/es/langmenu +share/doc/album/es/txt_1 +share/doc/album/es/txt_2 +share/doc/album/es/txt_3 +share/doc/album/es/txt_4 +share/doc/album/es/txt_5 +share/doc/album/es/txt_6 +share/doc/album/es/txt_7 +share/doc/album/es/txt_8 +share/doc/album/flag.png +share/doc/album/fr/=.txt_2 +share/doc/album/fr/Section_1.html +share/doc/album/fr/Section_2.html +share/doc/album/fr/Section_3.html +share/doc/album/fr/Section_4.html +share/doc/album/fr/Section_5.html +share/doc/album/fr/Section_6.html +share/doc/album/fr/Section_7.html +share/doc/album/fr/Section_8.html +share/doc/album/fr/Section_9.html +share/doc/album/fr/Short.html +share/doc/album/fr/conf +share/doc/album/fr/flag.png +share/doc/album/fr/index.html +share/doc/album/fr/langhtml +share/doc/album/fr/langmenu +share/doc/album/fr/new_txt_1 +share/doc/album/fr/new_txt_2 +share/doc/album/fr/new_txt_3 +share/doc/album/fr/new_txt_4 +share/doc/album/fr/new_txt_5 +share/doc/album/fr/new_txt_6 +share/doc/album/fr/new_txt_7 +share/doc/album/fr/new_txt_8 +share/doc/album/fr/old.txt_1 +share/doc/album/fr/old.txt_2 +share/doc/album/fr/old.txt_3 +share/doc/album/fr/old.txt_4 +share/doc/album/fr/old.txt_5 +share/doc/album/fr/old.txt_6 +share/doc/album/fr/old.txt_7 +share/doc/album/fr/old.txt_8 +share/doc/album/fr/txt_1 +share/doc/album/fr/txt_2 +share/doc/album/fr/txt_3 +share/doc/album/fr/txt_4 +share/doc/album/fr/txt_5 +share/doc/album/fr/txt_6 +share/doc/album/fr/txt_7 +share/doc/album/fr/txt_8 +share/doc/album/hu/Section_1.html +share/doc/album/hu/Section_2.html +share/doc/album/hu/Section_3.html +share/doc/album/hu/Section_4.html +share/doc/album/hu/Section_5.html +share/doc/album/hu/Section_6.html +share/doc/album/hu/Section_7.html +share/doc/album/hu/Section_8.html +share/doc/album/hu/Short.html +share/doc/album/hu/conf +share/doc/album/hu/flag.png +share/doc/album/hu/index.html +share/doc/album/hu/langhtml +share/doc/album/hu/langmenu +share/doc/album/hu/latin2.txt_2 +share/doc/album/hu/txt_1 +share/doc/album/hu/txt_2 +share/doc/album/hu/txt_3 +share/doc/album/hu/txt_4 +share/doc/album/hu/txt_5 +share/doc/album/hu/txt_6 +share/doc/album/hu/txt_7 +share/doc/album/hu/txt_8 +share/doc/album/hu/utf8.txt_2 share/doc/album/index.html +share/doc/album/it/Section_1.html +share/doc/album/it/Section_2.html +share/doc/album/it/Section_3.html +share/doc/album/it/Section_4.html +share/doc/album/it/Section_5.html +share/doc/album/it/Section_6.html +share/doc/album/it/Section_7.html +share/doc/album/it/Section_8.html +share/doc/album/it/Short.html +share/doc/album/it/conf +share/doc/album/it/flag.png +share/doc/album/it/index.html +share/doc/album/it/langhtml +share/doc/album/it/langmenu +share/doc/album/it/txt_1 +share/doc/album/it/txt_2 +share/doc/album/it/txt_3 +share/doc/album/it/txt_4 +share/doc/album/it/txt_5 +share/doc/album/it/txt_6 +share/doc/album/it/txt_7 +share/doc/album/it/txt_8 +share/doc/album/make_docs +share/doc/album/nl/Section_1.html +share/doc/album/nl/Section_2.html +share/doc/album/nl/Section_3.html +share/doc/album/nl/Section_4.html +share/doc/album/nl/Section_5.html +share/doc/album/nl/Section_6.html +share/doc/album/nl/Section_7.html +share/doc/album/nl/Section_8.html +share/doc/album/nl/Short.html +share/doc/album/nl/conf +share/doc/album/nl/flag.png +share/doc/album/nl/index.html +share/doc/album/nl/langhtml +share/doc/album/nl/langmenu +share/doc/album/nl/txt_1 +share/doc/album/nl/txt_2 +share/doc/album/nl/txt_2.alt +share/doc/album/nl/txt_3 +share/doc/album/nl/txt_4 +share/doc/album/nl/txt_5 +share/doc/album/nl/txt_6 +share/doc/album/nl/txt_7 +share/doc/album/nl/txt_8 +share/doc/album/ru/Section_1.html +share/doc/album/ru/Section_2.html +share/doc/album/ru/Section_3.html +share/doc/album/ru/Section_4.html +share/doc/album/ru/Section_5.html +share/doc/album/ru/Section_6.html +share/doc/album/ru/Section_7.html +share/doc/album/ru/Section_8.html +share/doc/album/ru/Short.html +share/doc/album/ru/conf +share/doc/album/ru/english-errors.txt_5 +share/doc/album/ru/flag.png +share/doc/album/ru/index.html +share/doc/album/ru/langhtml +share/doc/album/ru/langmenu +share/doc/album/ru/txt_1 +share/doc/album/ru/txt_2 +share/doc/album/ru/txt_3 +share/doc/album/ru/txt_4 +share/doc/album/ru/txt_5 +share/doc/album/ru/txt_6 +share/doc/album/ru/txt_7 +share/doc/album/ru/txt_8 share/doc/album/txt_1 share/doc/album/txt_2 share/doc/album/txt_3 diff --git a/www/album/distinfo b/www/album/distinfo index b8e7c13eaae..22e18c402a4 100644 --- a/www/album/distinfo +++ b/www/album/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/05/02 13:37:16 wiz Exp $ +$NetBSD: distinfo,v 1.3 2015/01/08 01:49:31 mef Exp $ -SHA1 (album.tar.gz) = 8ebf94792c7f98916ffc3624057ac8b3ff682d77 -RMD160 (album.tar.gz) = 6532da2c1d4eef8d28923029836ede651d69b732 -Size (album.tar.gz) = 99600 bytes -SHA1 (patch-aa) = a26b5349c8952fd26cef1bf657566a28c2209f4b +SHA1 (album-4.12/album.tar.gz) = 5522c2b47e47c17bff23459ed18456ec37235c2b +RMD160 (album-4.12/album.tar.gz) = 1e22e89ffe53d5e0103b2ac8fc038d07430fbfbb +Size (album-4.12/album.tar.gz) = 655509 bytes +SHA1 (patch-aa) = c0d2504691615c767e48f4a80fe66e7afb49097e diff --git a/www/album/patches/patch-aa b/www/album/patches/patch-aa index 637630e02dd..76c9219068c 100644 --- a/www/album/patches/patch-aa +++ b/www/album/patches/patch-aa @@ -1,18 +1,21 @@ -$NetBSD: patch-aa,v 1.2 2005/05/02 13:37:16 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2015/01/08 01:49:31 mef Exp $ ---- album.orig 2004-12-31 10:24:04.000000000 +0100 -+++ album -@@ -1308,11 +1308,8 @@ sub install_theme_path { - - unless ($themes) { - # Try to guess path -- $themes = '/var/www/html' unless -x $themes; -- $themes = '/var/www' unless -x $themes; -- $themes = '/home/httpd' unless -x $themes; -- $themes = '/home/http' unless -x $themes; -- $themes = "$ENV{HOME}/public_html" unless -x $themes; -+ $themes = '/usr/pkg/share/httpd/htdocs/Album' unless -x $themes; -+ $themes = '/usr/pkg/share/Album' unless -x $themes; - $themes = '' unless -x $themes; - $themes .= "/Themes" if $themes; - } +Fix Install Path to ${PREFIX}, see SUBST in Makefile + +--- album.orig 2015-01-08 09:54:23.000000000 +0900 ++++ album 2015-01-08 09:55:09.000000000 +0900 +@@ -1997,12 +1997,8 @@ sub install_theme_path { + + unless ($themes) { + # Try to guess path +- $themes = '/var/www/html' unless -x $themes; +- $themes = '/var/www' unless -x $themes; +- $themes = '/home/httpd' unless -x $themes; +- $themes = '/home/http' unless -x $themes; +- $themes = "$ENV{HOME}/public_html" unless -x $themes; +- $themes = '/usr/share/album/themes' unless -x $themes; ++ $themes = '@PREFIX@/share/httpd/htdocs/Album' unless -x $themes; ++ $themes = '@PREFIX@/share/Album' unless -x $themes; + foreach my $dp ( @DATA_PATH ) { + $themes = "$dp/themes" unless -x $themes; + $themes = "$dp/Themes" unless -x $themes; |