diff options
| author | mef <mef@pkgsrc.org> | 2015-01-08 01:49:31 +0000 |
|---|---|---|
| committer | mef <mef@pkgsrc.org> | 2015-01-08 01:49:31 +0000 |
| commit | 5dc79e859e25f71b7d206bf34e56a074f93791f4 (patch) | |
| tree | 369e55f153ddbdfb24cd0110ecf2dff7d664ab60 /www/album | |
| parent | 01e60e97aad3f3ae3a0d1d996111c06b816b3044 (diff) | |
| download | pkgsrc-5dc79e859e25f71b7d206bf34e56a074f93791f4.tar.gz | |
Update 3.07 to 4.12
-------------------
+ : new feature
- : deprecated feature
* : bugfix
Version 4.12, 2014/02/23
------------------------
* Small bugfix for specifying clip time for movie thumbnails: "[thumb=3.2s]"
Version 4.11, 2014/02/03
------------------------
+ New plugins: social/facebook-comments and social/facebook-like
+ New plugins: images/exactimage (Thanks F. Breitling)
+ Plugin speedup: images/autorot (Thanks Simon Oosthoek)
* Small 'has_thumb' bugfix (Thanks Brian Carlstrom, bdc carlstrom com)
* Small fix for 'modify_caption' hook so it only gets called once.
Version 4.10, 2013/05/30
------------------------
* Cleaned up much of the 'perl -cw' warnings
Version 4.09, 2013/05/04
------------------------
+ New plugin: utils/keynavigation.alp (Thanks Matti Laitala, matti.laitala gmail com)
+ Added 'album::add_image_head' for image specific <head> code
* Updated 'write_image_page' hook so that is was consistent for theme/notheme
+ Updated to avconv instead of deprecated ffmpeg
(To keep using ffmpeg: '-ffmpeg ffmpeg')
* Cleaned up much of the 'perl -cw' warnings
Version 4.08, 2012/09/27
------------------------
[[[update digikam at thebarters with new modify_caption plugin format]]]
[[update google_analytics plugin]]
+ Updated simmer_theme (3.11) and updated all themes (RSS support!)
+ Updated plugin: extra/rss (Thanks Guy Albertelli II - from 2007, sorry it got lost!)
+ New option: -theme_full_info - major speedups for themes (when not used)
+ -sort exif for exif date sorting (Thanks Mihkel Ader, nodscytale gmail com)
+ New plugin: social/flattr (Thanks Volker Sauer)
+ New plugin: format/piwik (Thanks Volker Sauer)
+ New plugin: images/exactimage (Thanks Frank Breitling)
+ Can now have multiple hooks for 'do_album' (things like 'google_analytics')
as well as modify_caption and modify_dir_caption
+ Can specify clip time for movies in captions.txt (i.e. "[thumb=3.2s]");
(May need to use -force and -force_html)
* Handling of multi-page pdf/ps files (Thanks Matthew Probst)
Version 4.07, 2010/08/12
------------------------
+ New plugin: images/annotate-medium (Thanks Joe Botha)
+ Plugins can call back the function that hooked them without a recursive loop
* jhead used for 'JPG' as well as 'jpg' (Thanks Kevin Barter)
+ Russian language support (Thanks Stas Degteff)
+ New theme: hover (Thanks Todd Foster)
* Fixed man page missing NAME (Thanks Eriberto, debian maintainer!)
Version 4.06, 2009/08/12
------------------------
+ No longer fatals out on corrupted images
(Thanks Alex Roper, alexr ugcs caltech edu)
* Fixed missing files in packages
Version 4.05, 2008/12/21
------------------------
+ WINDOWS GUI (galbum)
+ Windows ActiveState Perl theme support!
+ New hooks added for media style plugins (like media/flv)
+ Added media/flv plugin for FLV support!
+ Added album:: routines for plugins add_head, add_header, add_footer
+ Added piclens plugin for piclens slideshow support!
(Thanks Reidar D. Midtun, reidar midtun dyndns org)
+ Added exif/gps plugin for gps exif support
(Thanks Andreas K Huettel, http://www.akhuettel.de/)
+ New plugin: format/google_analytics
+ Added Hungarian docs (Thanks György Károly http://www.me.bme.hu/~karolyi/indexe.html)
* digikam.alp fix for finding top directory (Thanks Kevin Barter)
* Overlay type (Thanks again Laura Baldwin, boojum mit edu)
* Now checking for -medium changes to deciding if we need to rewrite img pages
(Thanks Rick Baartman, baartman lin12 triumf ca)
+ Added -crf and -license options for GUI support
Version 4.04, 2008/03/13
------------------------
* Fixed overlay of images (now needs "px"?) (Thanks Laura Baldwin, boojum mit edu)
+ Added wmv to movie types (Thanks Kevin Walton, kevin unseen org)
Version 4.03, 2007/12/20
------------------------
+ Fixed up album for CygWin changes - files are no longer quoted, no spaces in filenames!
(Thanks to the patient Amarsena Reddy, Amarsena.Reddy varian com)
+ Added -usage for seeing as many options as you want
+ Added -thumb_post (Thanks Dave Hansen, dave sr71 net)
+ Added -folder_count (Thanks Dave Hansen, dave sr71 net)
+ Added hidden -dtheme and -Dtheme options
* Fixed deprecated option output
* Fixed dependency checking for image HTML lost in v4.00
* exif/mouseover plugin now works for child albums
(Thanks George Hansper, georgeh anstat com au)
* Improved XHTML output (replaced 'td background=...')
+ Language: French is mostly complete, as well as docs
+ Better handling of convert animated gif file renaming bugs (Thanks Jon Daley)
* Proper handling of thumbs in other dirs (due to plugins) (Thanks Dave Hansen)
Version 4.02, 2007/01/19
------------------------
+ Language: German now 100%, added Spanish and Catalan
* Bugfix for new installs (two subs named 'install_language')
Version 4.01, 2007/01/08
------------------------
+ New languages: fr, zh-cn, cs, it, ko, de
+ Themes can now support multi-lingual images.
(Easy using update of simmer_theme) See example: Themes/Blue/lang/nl/
+ Themes have more translations (number of images, More albums, etc..)
+ Added -check_lang and -list_html_trans support
+ New plugin: images/xy_cache
* Fixed empty directory thumbnail bug
* Fixed/improved _curr_plugin/_curr_hook API.
* Plugged captions/db/digikam db resource leak (Thanks Anders Bolager, anders bolager com)
* Fixed '\\' bug with -make_lang
* Small get_option fix for plugins (and option_changed)
Version 4.00, 2006/12/17
------------------------
+ Full language/i18n support! See -lang, -list_langs, and -lang_path
+ New languages: (en), he, nl, pl as well as banner, l33t and swedish_chef
+ Option -make_lang for creating easy language templates
+ New plugin: captions/exif/mouseover
+ New plugin: org/link
(Thanks Matt Forrest, mforrest scs ryerson ca)
+ Added 3gp support using ffmpeg. Another other movie formats people need?
+ Added -nothumbs support (Thanks Marten van Wezel, marten arago utwente nl)
+ Changed -hash_width option to -screen_width
* Fixed save_conf multiple-saving of multiple array/code values
* Errors now pass non-zero exit value
* Fixed -noknown_images (Thanks Dougie Nisbet, album highmoor co uk)
* Return to XHTML valid (Thanks Markus Mayer, mmayer blastwave org)
Version 3.13, 2006/10/10
------------------------
+ New plugin: format/meta
+ Cleaned up image preloading and added "AddOnload" javascript for plugins
(Update your themes for proper image preloading)
+ Themes can now do num(This_Image) (Thanks Daniel K, DKml xs4all nl)
* Better fix for double exif captioning (Thanks Joseph Dery, joedery gmail com)
* Fix for medium_scale_opts (Thanks Glyn Davies, agdavies gmail com)
* Removed unnecessary zips and tars in Themes packaging
Version 3.12, 2006/06/14
------------------------
+ Added -create_plugin plugin code
+ New -slideshow support (for most themes)
+ Added overlay thumbnail support. Themes are simpler and cooler!
See FunLand as an example. Also updated simmer_theme.
+ Added 'album -mv' syntax (just a shortcut for the 'utils/mv' plugin)
+ Added -credit (global footer) (Thanks Dave Hansen, dave sr71 net)
+ Added -case_sort option (used to be default!)
(Thanks Samuel Denis D'Ortun, sddproductions.com)
* Changed ImageMagick calls to handle new syntax (~v6.25)
(Thanks John Westlund, john.westlund gmail com)
+ Added -follow_symlinks (Thanks Dave Hansen, dave sr71 net)
+ Added hide_album hook (Thanks Dave Hansen, dave sr71 net)
+ Add hook 'end_handle_file' (needed for plugin: format/hide_regex)
* Fixed handling of -no_* in plugin options.
* Fixed caption_edit.cgi directory caption problem (upgrade to CGI v1.07!)
(Thanks Kathryn Hogg, kjh flyballdogs com)
* Moved dir_thumb hook so it still counts images/folders
+ Patches: full path to find files
(Thanks Scott Bertin, scottbertin yahoo com)
+ Added data-> head and body_tag
Version 3.11, 2006/04/09
------------------------
+ Changed ffmpeg option from singlejpeg to mjpeg, ffmpeg also now handles mp4
+ Changed 'do_album*' hooks to skip album generation on false
+ Added hooks: gather_contents, gather_contents_item
* Patches: Fix stop_hashes hook, thumbnail/medium hooks, -burn 'index.html'
(Thanks Scott Bertin, scottbertin yahoo com)
* Double exif captioning (Thanks Roland Rosenfeld, roenv spinnaker de
and John Sellens, jsellens generalconcepts com)
+ Plugin: images/epeg (Thanks Scott J. Bertin, scottbertin yahoo com)
+ New theme: Stamp. Updated theme: W_Peterman
* Change for themes: Get($dir, 'dir') -> Get($dir, 'file')
* Fixed issue with old 'medium *\\>' album.conf options.
(Thanks Waldy Wisniewski, waldy wizfamily co uk)
* Fixed -h/-plugin_usage bug
* Fixed -clean to also include commented out images.
Version 3.10, 2005/11/01
------------------------
+ Plugin support
+ New plugins: utils/mv, many others
+ Massively improved/corrected/clarified arg saving in conf files
+ Improved dependency checking
+ Use (fast!) Image::Size if available (Thanks Dave Hansen, dave sr71 net)
+ Can now clear array options with -no
* -transform_url fix for %s
* diff_path now handles ActiveState windows paths for all cases
+ Added image overlay support for themes (see simmer_theme.3.03 & OldPhoto)
+ Added "Indexes:" progress bar for slower machines (like mine!)
+ Added -no_virgin_check option (for caption_edit and other CGI)
+ Added -image_headers for no_theme output (and set default to 0)
+ Medium/thumbnail images regenerated only when -medium/-geometry changed.
(Thanks Andy Somerville, andy.somerville gmail com)
* -no_image_loop now works with no_theme output
* Default output is now Valid XHTML 1.0 Transitional
(Thanks Goran Sandin, Goran.Sandin abc se)
* Fixed poor quoting of img alt and title tags
+ Added link tags for First/Last and album Up
* Improved -name_length shortening algorithm to avoid bad HTML
+ Replaced -date_sort and -name_sort with -sort [captions,name,date]
+ Added perldocs to caption_edit.cgi
* Fixed saving '#' in config files (Thanks Diego Liziero, diegoliz gmail com)
* Fixed problem with using movies as directory thumbnails
* Fixed inability to add non-images with -no_known_images
* Small path fix for "Your album has moved" false negative
* Fixed stupid split_path bug that disliked the letter 'Q'. The shame..
(also fixed StoryCaption bug and alignment problem)
* Initial config menus now support ~/path (Thanks Dylan G., dylang thock com)
(Thanks Friedrich Pukelsheim, pukelsheim math uni-augsburg de)
* Can handle '# commented' captions with spaces after '#'
(Thanks Matt Roberts, matt.roberts bigfoot com)
* Fixed clean case-sensitivity, -medium_type and parentheses bugs
(Thanks Matthew J. Probst, mprobst probst org)
* Fixed incorrect "Your album has been moved" trigger
(Thanks Dwight Dover, dwidov alltel net)
* Default theme now supports -no_album_captions
* Fixed attempt_require for Cwd so that it doesn't error (nobody told me!)
Diffstat (limited to 'www/album')
| -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; |