Mapivi updated to latest version (0.97). Enabled Exif and splash screen (p5-Tk-Splash is required). Cheers Giovanni
Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/mapivi/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile 27 Dec 2007 22:49:14 -0000 1.5 +++ Makefile 21 Mar 2008 07:53:40 -0000 @@ -4,8 +4,8 @@ PKG_ARCH= * COMMENT= image viewer and organizer -DISTNAME= mapivi091 -PKGNAME= mapivi-0.91p2 +DISTNAME= mapivi097 +PKGNAME= mapivi-0.97 CATEGORIES= graphics x11 HOMEPAGE= http://mapivi.de.vu/ @@ -18,15 +18,15 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -EXTRACT_SUFX= .tgz - MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mapivi/} RUN_DEPENDS= :p5-Tk->=804.025:x11/p5-Tk \ + ::graphics/p5-Image-ExifTool \ ::graphics/p5-Image-Info \ ::graphics/p5-Image-MetaData-JPEG \ ::graphics/ImageMagick \ - ::graphics/jhead + ::graphics/jhead \ + ::x11/p5-Tk-Splash USE_X11= Yes NO_BUILD= Yes @@ -38,7 +38,10 @@ pre-configure: do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/mapivi ${INSTALL_DATA_DIR} ${PREFIX}/share/mapivi/PlugIns - ${INSTALL_DATA} ${WRKSRC}/pics/* ${PREFIX}/share/mapivi/ + ${INSTALL_DATA_DIR} ${PREFIX}/share/mapivi/pics + ${INSTALL_DATA_DIR} ${PREFIX}/share/mapivi/icons + ${INSTALL_DATA} ${WRKSRC}/pics/* ${PREFIX}/share/mapivi/pics + ${INSTALL_DATA} ${WRKSRC}/icons/* ${PREFIX}/share/mapivi/icons ${INSTALL_SCRIPT} ${WRKSRC}/PlugIns/* ${PREFIX}/share/mapivi/PlugIns ${INSTALL_SCRIPT} ${WRKSRC}/mapivi ${PREFIX}/bin Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/mapivi/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 29 May 2007 17:08:59 -0000 1.1.1.1 +++ distinfo 21 Mar 2008 07:53:40 -0000 @@ -1,5 +1,5 @@ -MD5 (mapivi091.tgz) = fE+1RJKXhBffBa0bfrCcBw== -RMD160 (mapivi091.tgz) = UIFyUUhiSWuZUIDX5WBcHY4/Das= -SHA1 (mapivi091.tgz) = U9KFzUP9hBjKq8KYJ1oEcwioFkM= -SHA256 (mapivi091.tgz) = VlUJD7Sss1Ax8YgGsEMjLp5WT/F0hl3DT1uRBMsRUq0= -SIZE (mapivi091.tgz) = 359537 +MD5 (mapivi097.tar.gz) = 8UMsuwAzwaGjJGUdvAcAsg== +RMD160 (mapivi097.tar.gz) = Gu5kN0DxH5IH0hNnZ3pEvSV4Fqg= +SHA1 (mapivi097.tar.gz) = NzKqKlPBqA2BpR2ULM9azZNph+4= +SHA256 (mapivi097.tar.gz) = fJBb7AB0AtYm204aCL6OB9/WXu7hVgO0uEHKQFlsYUE= +SIZE (mapivi097.tar.gz) = 407886 Index: patches/patch-mapivi =================================================================== RCS file: /cvs/ports/graphics/mapivi/patches/patch-mapivi,v retrieving revision 1.3 diff -u -p -r1.3 patch-mapivi --- patches/patch-mapivi 27 Dec 2007 22:49:14 -0000 1.3 +++ patches/patch-mapivi 21 Mar 2008 07:53:40 -0000 @@ -1,25 +1,39 @@ $OpenBSD: patch-mapivi,v 1.3 2007/12/27 22:49:14 kili Exp $ ---- mapivi.orig Tue Oct 31 04:21:59 2006 -+++ mapivi Fri Dec 21 22:35:08 2007 -@@ -341,7 +341,7 @@ my $nrToConvert = 0; +--- mapivi.orig Thu Feb 21 21:53:44 2008 ++++ mapivi Thu Mar 13 20:25:24 2008 +@@ -148,11 +148,11 @@ if (($EvilOS) and (defined $ENV{APPDATA}) and ($maprog + # for windows we use this path + $maprogsdir = $ENV{APPDATA}."/maprogs" if defined $ENV{APPDATA}; + my $configdir = "$maprogsdir/mapivi"; # the configuration dir +-my $icon_path = "$configdir/icons"; # the icon dir ++my $icon_path = "!!PREFIX!!/share/mapivi/icons"; # the icon dir + + my $splashAvail = (eval "require Tk::Splash") ? 1 : 0 ; + my $splash; +-my $logo = "$configdir/logo.jpg"; ++my $logo = "!!PREFIX!!/share/mapivi/pics/logo.jpg"; + if ($splashAvail and -f $logo) { + # Splash->Show parameters: $image, $width, $height, $title, $overrideredirect + $splash = Tk::Splash->Show($logo, 844, 259, "", 1); +@@ -360,7 +360,7 @@ my $nrToConvert = 0; my $maxCommentLength = 2**16 - 3; # a comment block may have max 64kB my $trashdir = "$configdir/trash"; # the trashcan -my $plugindir = "$configdir/PlugIns"; # the mapivi plugin dir +my $plugindir = "!!PREFIX!!/share/mapivi/PlugIns"; # the mapivi plugin dir - my $iptcdir = "$configdir/IPTC_templates"; # the IPTC templates directory + my $iptcdir = "$configdir/IPTC_templates"; # the IPTC templates folder my $configFile = "$configdir/mapivirc"; # the configuration file my $file_Entry_values = "$configdir/Entry_values"; -@@ -422,7 +422,7 @@ my %new_keywords; +@@ -445,7 +445,7 @@ my %new_keywords; my %ignore_keywords; # external programs used by mapivi --my %exprogs = qw/convert 0 composite 0 jhead 0 jpegtran 0 jpegpixi 0 mogrify 0 gimp-remote 0 gimp-win-remote 0 montage 0 xwd 0 identify 0 thunderbird 0 exiftool 0/; +-my %exprogs = qw/convert 0 composite 0 jhead 0 jpegtran 0 jpegpixi 0 mogrify 0 gimp-remote 0 gimp-win-remote 0 montage 0 xwd 0 identify 0 thunderbird 0 mozilla-thunderbird 0 exiftool 0/; +my %exprogs = qw/convert 0 composite 0 jhead 0 jpegtran 0 jpegpixi 0 mogrify 0 gimp-remote 0 montage 0 identify 0 exiftool 0/; # short comment about the usage of the external programs my %exprogscom = ( "convert" => "build thumbnails", -@@ -433,10 +433,7 @@ my %exprogscom = ( +@@ -456,10 +456,7 @@ my %exprogscom = ( "mogrify" => "change the size/quality of pictures", "montage" => "combine pictures to e.g. index prints", "gimp-remote" => "edit pictures with The GIMP (only UNIX)", @@ -27,56 +41,55 @@ $OpenBSD: patch-mapivi,v 1.3 2007/12/27 - "xwd" => "make a screenshot of a window or desktop", "identify" => "describe the format and characteristics of a picture", - "thunderbird" => "send pictures via email", + "mozilla-thunderbird" => "send pictures via email", "exiftool" => "Read/write meta information in image files", ); - # where to find the external programs (resources) -@@ -449,9 +446,7 @@ my %exprogsres = ( +@@ -473,9 +470,7 @@ my %exprogsres = ( "mogrify" => "Image Magick http://www.imagemagick.org";, "montage" => "Image Magick http://www.imagemagick.org";, "gimp-remote" => "The GIMP http://www.gimp.org";, - "gimp-win-remote"=> "gimp-win-remote http://sourceforge.net/projects/gimp-win-remote/";, "identify" => "Image Magick http://www.imagemagick.org";, - "thunderbird" => "http://www.mozilla.org/projects/thunderbird/";, + "mozilla-thunderbird" => "http://www.mozilla.org/projects/thunderbird/";, "exiftool" => "http://owl.phy.queensu.ca/~phil/exiftool/";, ); - -@@ -505,7 +500,7 @@ my %config = ( +@@ -544,7 +539,7 @@ my %config = ( "ColorThumbBG" => "azure3", "ColorProgress" => "#106dba", - "ColorPicker" => "red", # last color selected with color picker + "ColorPicker" => "#efefef", # last color selected with color picker - "DefaultThumb" => "$configdir/EmptyThumb.jpg", -+ "DefaultThumb" => "!!PREFIX!!/share/mapivi/EmptyThumb.jpg", ++ "DefaultThumb" => "!!PREFIX!!/share/mapivi/pics/EmptyThumb.jpg", "Copyright" => "copyright (c) $copyright_year Herrmann", "Comment" => "This picture was taken in south africa ...", "MaxProcs" => 1, -@@ -1854,9 +1849,7 @@ sub startup { - if ($config{NrOfRuns} == 0) { - #whereIsPerl(); - makeConfigDir(); -- copyConfigPics(); - copyOtherStuff(); -- copyPlugIns(); - } - $config{NrOfRuns}++; - gratulation() if (($config{NrOfRuns} % 1000 == 0) and ($config{NrOfRuns} > 0)); # modulo -@@ -13073,8 +13066,6 @@ sub createMenubar { +@@ -739,7 +734,6 @@ my %config = ( + "LineLength" => 30, # length of one line in the thumbnail table e.g. for comments + "ExtViewer" => 'display', # name of external picture viewer + "ExtViewerMulti" => 0, # bool +- "ExtBGApp" => "wmsetbg -a", # name of external app to set desktop background (with options) + "ConvertUmlaut" => 1, # convert german umlaute (e.g. รค -> ae etc.) + "DeadPixelStr" => "1300,846,3 85,411,3 7,365,3 1529,185,3 1593,201,3 1387,1003,3 1957,1057,3 50,1043,2 615,935,3", # info about the dead pixels of your camera see: http://www.zero-based.org/software/jpegpixi/ + "DeadPixelMethod" => "linear", +@@ -1083,7 +1077,7 @@ ENIIJZtY4oUFGKCwQgw13KBDDz8UcUQTPlBc0cUSAhEEwAANVLBBCC + dKyyLnF00kjQlkTSR9GqxBKzyS6bEbY0EestAAEBADs= + EOF + my $mapiviicon = $top->Photo(-data => $icon_data); +-my $mapiviiconfile = "$configdir/MapiviIcon.gif"; ++my $mapiviiconfile = "$icon_path/MapiviIcon.gif"; + $mapiviiconfile = "$configdir/MapiviIcon32.gif" if $EvilOS; + #my $mapiviicon = $top->Photo(-file => $mapiviiconfile) if (-f $mapiviiconfile); + $top->idletasks if $EvilOS; # this line is crucial (at least on windows) +@@ -13567,8 +13561,6 @@ sub createMenubar { } slideshow(); }, -accelerator => "<s>"); -- $view_menu->command(-label => "use actual picture as desktop background", +- $view_menu->command(-label => "use actual picture as desktop background", - -command => \&setBackground); - $view_menu->command(-label => "smart update", - -command => sub { smart_update(); }); - -@@ -13217,7 +13208,6 @@ sub addFileActionsMenu { - $fop_menu->command(-label => "copy to ...", -command => sub { copyPicsDialog(COPY, $lb); } ); - $fop_menu->command(-label => "link to ...", -command => \&linkPicsDialog) if (!$EvilOS); - $fop_menu->command(-label => "move to ...", -command => sub { movePicsDialog($lb); } ); -- $fop_menu->command(-label => "send to ...", -command => sub { sendTo($lb); } ); - $fop_menu->command(-label => "convert ...", -command => sub { convertPics($lb); } ); - $fop_menu->command(-label => "copy to print ...", -command => sub { copyToPrint($lb); }, -accelerator => "<Ctrl-p>"); - $fop_menu->command(-label => "rename ...", -command => sub { renamePic($lb); }, -accelerator => "<r>"); -@@ -15630,7 +15620,7 @@ sub makeButton { + + $view_menu->separator; + my $layout_menu = $view_menu->cascade(-label => "Window layout ..."); +@@ -16381,7 +16373,7 @@ sub makeButton { my $picName = shift; my $func = shift; @@ -85,15 +98,7 @@ $OpenBSD: patch-mapivi,v 1.3 2007/12/27 my $image = $parentWidget->Photo(-file => $pic) if -f $pic; if ($image) { -@@ -17178,7 +17168,6 @@ If this option is enabled one viewer will be started l - "viewer pic1.jpg pic2.jpg pic3.jpg", - if not 3 viewers will be started like this: - "viewer pic1.jpg" "viewer pic2.jpg" "viewer pic3.jpg".'); -- labeledEntry($dF, 'top', $w, "Tool to set the desktop background",\$tmpconf{ExtBGApp}); - - # ############### button frame ######################## - -@@ -24417,7 +24406,7 @@ sub GIMPedit { +@@ -25698,7 +25690,7 @@ sub GIMPedit { # check if file is a link and get the real target next if (!getRealFile(\$dpic)); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/mapivi/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 29 May 2007 17:08:59 -0000 1.1.1.1 +++ pkg/PLIST 21 Mar 2008 07:53:40 -0000 @@ -1,12 +1,6 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2007/05/29 17:08:59 ajacoutot Exp $ bin/mapivi share/mapivi/ -share/mapivi/EmptyThumb.jpg -share/mapivi/MapiviIcon.gif -share/mapivi/MapiviIcon32.gif -share/mapivi/MapiviIcon32.ico -share/mapivi/MiniPic.jpg -share/mapivi/MiniPicMulti.jpg share/mapivi/PlugIns/ share/mapivi/PlugIns/Channel-Separator share/mapivi/PlugIns/Channel-Separator.txt @@ -18,11 +12,59 @@ share/mapivi/PlugIns/filelist-plugin share/mapivi/PlugIns/filelist-plugin.txt share/mapivi/PlugIns/test-plugin share/mapivi/PlugIns/test-plugin.txt -share/mapivi/StopPic.gif -share/mapivi/add.gif -share/mapivi/delete.gif -share/mapivi/edit.gif -share/mapivi/exif.gif -share/mapivi/iptc.gif -share/mapivi/logo.jpg -share/mapivi/thumbExample.jpg +share/mapivi/icons/ +share/mapivi/icons/accessories-text-editor.png +share/mapivi/icons/applications-graphics.png +share/mapivi/icons/applications-internet.png +share/mapivi/icons/camera-photo.png +share/mapivi/icons/dialog-error.png +share/mapivi/icons/dialog-information.png +share/mapivi/icons/edit-copy.png +share/mapivi/icons/edit-cut.png +share/mapivi/icons/edit-find.png +share/mapivi/icons/edit-paste.png +share/mapivi/icons/edit-redo.png +share/mapivi/icons/emblem-favorite.png +share/mapivi/icons/folder-new.png +share/mapivi/icons/folder.png +share/mapivi/icons/go-first.png +share/mapivi/icons/go-last.png +share/mapivi/icons/go-next.png +share/mapivi/icons/go-previous.png +share/mapivi/icons/help-browser.png +share/mapivi/icons/image-x-generic-bw.png +share/mapivi/icons/image-x-generic.png +share/mapivi/icons/input-keyboard.png +share/mapivi/icons/list-add.png +share/mapivi/icons/list-remove.png +share/mapivi/icons/mail-message-new.png +share/mapivi/icons/media-floppy.png +share/mapivi/icons/media-playback-start.png +share/mapivi/icons/preferences-system.png +share/mapivi/icons/printer.png +share/mapivi/icons/system-log-out.png +share/mapivi/icons/system-search.png +share/mapivi/icons/transform-rotate.png +share/mapivi/icons/transform-scale.png +share/mapivi/icons/user-desktop.png +share/mapivi/icons/user-trash.png +share/mapivi/icons/utilities-system-monitor.png +share/mapivi/icons/view-fullscreen.png +share/mapivi/icons/view-refresh.png +share/mapivi/icons/weather-overcast.png +share/mapivi/icons/x-office-calendar.png +share/mapivi/pics/ +share/mapivi/pics/EmptyThumb.jpg +share/mapivi/pics/MapiviIcon.gif +share/mapivi/pics/MapiviIcon32.gif +share/mapivi/pics/MapiviIcon32.ico +share/mapivi/pics/MiniPic.jpg +share/mapivi/pics/MiniPicMulti.jpg +share/mapivi/pics/StopPic.gif +share/mapivi/pics/add.gif +share/mapivi/pics/delete.gif +share/mapivi/pics/edit.gif +share/mapivi/pics/exif.gif +share/mapivi/pics/iptc.gif +share/mapivi/pics/logo.jpg +share/mapivi/pics/thumbExample.jpg
