diff -ruN showimg.orig/Makefile showimg/Makefile --- showimg.orig/Makefile Sat Jan 28 23:39:12 2006 +++ showimg/Makefile Sun Jan 29 02:34:04 2006 @@ -7,12 +7,10 @@ # PORTNAME= showimg -PORTVERSION= 0.9.5.r.1 -PORTREVISION= 3 +PORTVERSION= 0.9.5 PORTEPOCH= 1 CATEGORIES= graphics -MASTER_SITES= http://www.jalix.org/projects/showimg/download/.0.9.5/distributions/SVN_info/ -DISTNAME= showimg-0.9.5-rc1 +MASTER_SITES= http://www.jalix.org/projects/showimg/download/0.9.5/ MAINTAINER= shelton@granch.ru COMMENT= A picture viewer designed to run under KDE 3.x @@ -20,8 +18,6 @@ LIB_DEPENDS= kipi:${PORTSDIR}/graphics/libkipi \ kexif:${PORTSDIR}/graphics/libkexif -BROKEN= Does not compile - USE_BZIP2= yes USE_KDEBASE_VER= 3 USE_GMAKE= yes @@ -33,11 +29,32 @@ CONFIGURE_ARGS+= --disable-debug -post-extract: - @${TOUCH} ${WRKSRC}/config.h.in +OPTIONS= MYSQL "Enable MySQL support" off \ + POSTGRESQL "Enable PostgreSQL support" off post-patch: + ${TOUCH} -t 200601010000 ${WRKSRC}/Makefile.am.in ${WRKSRC}/subdirs @${REINPLACE_CMD} -e 's|-O2||g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} -.include +.include + +.if defined(WITH_MYSQL) +USE_MYSQL= yes +CONFIGURE_ARGS+= --enable-mysql=yes +PLIST_SUB+= MYSQL="" +.else +CONFIGURE_ARGS+= --enable-mysql=no +PLIST_SUB+= MYSQL="@comment " +.endif + +.if defined(WITH_POSTGRESQL) +USE_PGSQL= yes +CONFIGURE_ARGS+= --enable-pgsql=yes +PLIST_SUB+= PGSQL="" +.else +CONFIGURE_ARGS+= --enable-pgsql=no +PLIST_SUB+= PGSQL="@comment " +.endif + +.include diff -ruN showimg.orig/distinfo showimg/distinfo --- showimg.orig/distinfo Sat Jan 28 23:39:12 2006 +++ showimg/distinfo Sat Jan 28 23:39:50 2006 @@ -1,2 +1,3 @@ -MD5 (showimg-0.9.5-rc1.tar.bz2) = 69a8b6d6d0097a900d8741e227911a50 -SIZE (showimg-0.9.5-rc1.tar.bz2) = 3777555 +MD5 (showimg-0.9.5.tar.bz2) = 281c5f5e65ca14c69810d2099c43a4b8 +SHA256 (showimg-0.9.5.tar.bz2) = d9c5e3174551272fffba1a530e83d2b2db60bb80e88af9dc2c060337e60bc105 +SIZE (showimg-0.9.5.tar.bz2) = 4117897 diff -ruN showimg.orig/files/patch-showimg-showimg-imagelistview.cpp showimg/files/patch-showimg-showimg-imagelistview.cpp --- showimg.orig/files/patch-showimg-showimg-imagelistview.cpp Thu Jan 1 01:00:00 1970 +++ showimg/files/patch-showimg-showimg-imagelistview.cpp Sun Jan 29 01:56:58 2006 @@ -0,0 +1,11 @@ +--- showimg/showimg/imagelistview.cpp.orig Sat Jan 28 23:00:28 2006 ++++ showimg/showimg/imagelistview.cpp Sat Jan 28 23:01:24 2006 +@@ -28,6 +28,8 @@ + * * + ***************************************************************************/ + ++#include ++ + #include "imagelistview.h" + + // Local diff -ruN showimg.orig/files/patch-showimg-showimg-osd.cpp showimg/files/patch-showimg-showimg-osd.cpp --- showimg.orig/files/patch-showimg-showimg-osd.cpp Thu Jan 1 01:00:00 1970 +++ showimg/files/patch-showimg-showimg-osd.cpp Sun Jan 29 01:56:58 2006 @@ -0,0 +1,36 @@ +--- showimg/showimg/osd.cpp.orig Sun Jan 29 01:47:10 2006 ++++ showimg/showimg/osd.cpp Sun Jan 29 01:57:24 2006 +@@ -29,6 +29,16 @@ + // QImage makeShadow( const QPixmap &textPixmap, const QColor &bgColor ); + //} + ++class Grabber : public QWidget { ++public: ++ Grabber( const QRect &r, const QColor &color ) : QWidget( 0, 0 ) { ++ move( 0, 0 ); ++ screen = QPixmap::grabWindow( winId(), r.x(), r.y(), r.width(), r.height() ); ++ KPixmapEffect::fade( screen, 0.80, color ); ++ } ++ KPixmap screen; ++}; ++ + OSDWidget::OSDWidget( QWidget *parent, const char *name ) + : QWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ) + , m_duration( 2000 ) +@@ -51,16 +61,6 @@ + void + OSDWidget::show() //virtual + { +- class Grabber : public QWidget { +- public: +- Grabber( const QRect &r, const QColor &color ) : QWidget( 0, 0 ) { +- move( 0, 0 ); +- screen = QPixmap::grabWindow( winId(), r.x(), r.y(), r.width(), r.height() ); +- KPixmapEffect::fade( screen, 0.80, color ); +- } +- KPixmap screen; +- }; +- + if ( !isEnabled() ) + return; + diff -ruN showimg.orig/pkg-plist showimg/pkg-plist --- showimg.orig/pkg-plist Sat Jan 28 23:39:12 2006 +++ showimg/pkg-plist Sun Jan 29 00:48:08 2006 @@ -1,24 +1,33 @@ bin/showimg bin/sidbtest +lib/kde3/libshowimgpart.la +lib/kde3/libshowimgpart.so +%%MYSQL%%lib/kde3/showimg_kexidb_mysqldriver.la +%%MYSQL%%lib/kde3/showimg_kexidb_mysqldriver.so +%%PGSQL%%lib/kde3/showimg_kexidb_pqxxsqldriver.la +%%PGSQL%%lib/kde3/showimg_kexidb_pqxxsqldriver.so +lib/kde3/showimg_kexidb_sqlite2driver.la +lib/kde3/showimg_kexidb_sqlite2driver.so +lib/kde3/showimg_kexidb_sqlite3driver.la +lib/kde3/showimg_kexidb_sqlite3driver.so lib/libshowimgcore.la lib/libshowimgcore.so lib/libshowimgcore.so.0 -lib/libshowimgkexisql3.la -lib/libshowimgkexisql3.so.3 -lib/libshowimgkexisql2.la -lib/libshowimgkexisql2.so.2 lib/libshowimgkexidb.la +lib/libshowimgkexidb.so lib/libshowimgkexidb.so.0 lib/libshowimgkexidbparser.la +lib/libshowimgkexidbparser.so lib/libshowimgkexidbparser.so.1 +lib/libshowimgkexisql2.la +lib/libshowimgkexisql2.so +lib/libshowimgkexisql2.so.2 +lib/libshowimgkexisql3.la +lib/libshowimgkexisql3.so +lib/libshowimgkexisql3.so.3 lib/libshowimgkexiutils.la +lib/libshowimgkexiutils.so lib/libshowimgkexiutils.so.1 -lib/kde3/libshowimgpart.la -lib/kde3/libshowimgpart.so -lib/kde3/showimg_kexidb_sqlite3driver.la -lib/kde3/showimg_kexidb_sqlite3driver.so -lib/kde3/showimg_kexidb_sqlite2driver.la -lib/kde3/showimg_kexidb_sqlite2driver.so share/applnk/Graphics/showimg.desktop share/apps/konqueror/servicemenus/konqshowimg.desktop share/apps/showimg/convert2png.pl @@ -90,6 +99,7 @@ share/apps/showimg/pics/layout3.png share/apps/showimg/pics/layout4.png share/apps/showimg/pics/logo.png +share/apps/showimg/showimgsimpleui.rc share/apps/showimg/showimgui.rc share/apps/showimg/tips share/apps/showimgpart/showimgpart.rc @@ -137,9 +147,47 @@ share/doc/HTML/en/showimg/index.cache.bz2 share/doc/HTML/en/showimg/index.docbook share/doc/HTML/en/showimg/main-window.png +share/doc/HTML/es/showimg/but-back.png +share/doc/HTML/es/showimg/but-copy.png +share/doc/HTML/es/showimg/but-cut.png +share/doc/HTML/es/showimg/but-forward.png +share/doc/HTML/es/showimg/but-fullscreen.png +share/doc/HTML/es/showimg/but-go_up.png +share/doc/HTML/es/showimg/but-home.png +share/doc/HTML/es/showimg/but-horiz-flip.png +share/doc/HTML/es/showimg/but-horizontal_flip.png +share/doc/HTML/es/showimg/but-next-image.png +share/doc/HTML/es/showimg/but-next_image.png +share/doc/HTML/es/showimg/but-original_size.png +share/doc/HTML/es/showimg/but-paste.png +share/doc/HTML/es/showimg/but-prev-image.png +share/doc/HTML/es/showimg/but-previous_image.png +share/doc/HTML/es/showimg/but-refresh.png +share/doc/HTML/es/showimg/but-reload.png +share/doc/HTML/es/showimg/but-rotate-left.png +share/doc/HTML/es/showimg/but-rotate-right.png +share/doc/HTML/es/showimg/but-rotate_left.png +share/doc/HTML/es/showimg/but-rotate_right.png +share/doc/HTML/es/showimg/but-slide-show.png +share/doc/HTML/es/showimg/but-slide_show.png +share/doc/HTML/es/showimg/but-stop-thumbs.png +share/doc/HTML/es/showimg/but-stop.png +share/doc/HTML/es/showimg/but-toggle-thumbs.png +share/doc/HTML/es/showimg/but-toggle_thumbnails.png +share/doc/HTML/es/showimg/but-vert-flip.png +share/doc/HTML/es/showimg/but-vertical_flip.png +share/doc/HTML/es/showimg/but-zoom-fit-screen.png +share/doc/HTML/es/showimg/but-zoom-in.png +share/doc/HTML/es/showimg/but-zoom-original.png +share/doc/HTML/es/showimg/but-zoom-out.png +share/doc/HTML/es/showimg/but-zoom_in.png +share/doc/HTML/es/showimg/but-zoom_out.png +share/doc/HTML/es/showimg/but-zoom_to_fit.png share/doc/HTML/es/showimg/common +share/doc/HTML/es/showimg/comparison.png share/doc/HTML/es/showimg/index.cache.bz2 share/doc/HTML/es/showimg/index.docbook +share/doc/HTML/es/showimg/main-window.png share/doc/HTML/et/showimg/common share/doc/HTML/et/showimg/index.cache.bz2 share/doc/HTML/et/showimg/index.docbook @@ -147,9 +195,9 @@ share/doc/HTML/fr/showimg/index.cache.bz2 share/doc/HTML/fr/showimg/index.docbook share/doc/HTML/it/showimg/common +share/doc/HTML/it/showimg/comparison.png share/doc/HTML/it/showimg/index.cache.bz2 share/doc/HTML/it/showimg/index.docbook -share/doc/HTML/it/showimg/comparison.png share/doc/HTML/it/showimg/main-window.png share/doc/HTML/pt/showimg/common share/doc/HTML/pt/showimg/index.cache.bz2 @@ -158,13 +206,14 @@ share/doc/HTML/ru/showimg/index.cache.bz2 share/doc/HTML/ru/showimg/index.docbook share/doc/HTML/sv/showimg/common +share/doc/HTML/sv/showimg/comparison.png share/doc/HTML/sv/showimg/index.cache.bz2 share/doc/HTML/sv/showimg/index.docbook -share/doc/HTML/sv/showimg/comparison.png share/doc/HTML/sv/showimg/main-window.png share/icons/hicolor/32x32/apps/showimg.png share/icons/hicolor/48x48/apps/showimg.png share/icons/hicolor/64x64/apps/showimg.png +share/locale/bg/LC_MESSAGES/showimg.mo share/locale/br/LC_MESSAGES/showimg.mo share/locale/bs/LC_MESSAGES/showimg.mo share/locale/ca/LC_MESSAGES/showimg.mo @@ -172,8 +221,8 @@ share/locale/cy/LC_MESSAGES/showimg.mo share/locale/da/LC_MESSAGES/showimg.mo share/locale/de/LC_MESSAGES/showimg.mo -share/locale/en_GB/LC_MESSAGES/showimg.mo share/locale/el/LC_MESSAGES/showimg.mo +share/locale/en_GB/LC_MESSAGES/showimg.mo share/locale/es/LC_MESSAGES/showimg.mo share/locale/et/LC_MESSAGES/showimg.mo share/locale/fr/LC_MESSAGES/showimg.mo @@ -188,7 +237,6 @@ share/locale/pl/LC_MESSAGES/showimg.mo share/locale/pt/LC_MESSAGES/showimg.mo share/locale/pt_BR/LC_MESSAGES/showimg.mo -share/locale/ro/LC_MESSAGES/showimg.mo share/locale/ru/LC_MESSAGES/showimg.mo share/locale/sk/LC_MESSAGES/showimg.mo share/locale/sr/LC_MESSAGES/showimg.mo @@ -198,39 +246,38 @@ share/locale/zh_CN/LC_MESSAGES/showimg.mo share/mimelnk/image/x-psd.desktop share/mimelnk/image/x-sia.desktop -share/services/showimgpart.desktop -share/services/showimg_kexidb_sqlite3driver.desktop +%%MYSQL%%share/services/showimg_kexidb_mysqldriver.desktop +%%PGSQL%%share/services/showimg_kexidb_pqxxsqldriver.desktop share/services/showimg_kexidb_sqlite2driver.desktop +share/services/showimg_kexidb_sqlite3driver.desktop +share/services/showimgpart.desktop share/servicetypes/showimg_kexidb_driver.desktop -@dirrmtry share/mimelnk/image -@dirrmtry share/mimelnk -@dirrmtry share/icons/hicolor/64x64/apps -@dirrmtry share/icons/hicolor/64x64 -@dirrmtry share/icons/hicolor/48x48/apps -@dirrmtry share/icons/hicolor/48x48 -@dirrmtry share/icons/hicolor/32x32/apps -@dirrmtry share/icons/hicolor/32x32 -@dirrmtry share/icons/hicolor -@dirrmtry share/icons +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrm share/doc/HTML/sv/showimg +@dirrm share/doc/HTML/ru/showimg +@dirrm share/doc/HTML/pt/showimg +@dirrm share/doc/HTML/it/showimg +@dirrm share/doc/HTML/fr/showimg +@dirrm share/doc/HTML/et/showimg +@dirrm share/doc/HTML/es/showimg @dirrm share/doc/HTML/en/showimg -@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/da/showimg -@dirrmtry share/doc/HTML/da -@dirrm share/doc/HTML/es/showimg -@dirrmtry share/doc/HTML/es -@dirrm share/doc/HTML/et/showimg -@dirrmtry share/doc/HTML/et -@dirrm share/doc/HTML/fr/showimg -@dirrmtry share/doc/HTML/fr -@dirrm share/doc/HTML/it/showimg -@dirrmtry share/doc/HTML/it -@dirrm share/doc/HTML/pt/showimg -@dirrmtry share/doc/HTML/pt -@dirrm share/doc/HTML/ru/showimg -@dirrmtry share/doc/HTML/ru -@dirrm share/doc/HTML/sv/showimg -@dirrmtry share/doc/HTML/sv -@dirrmtry share/doc/HTML +@dirrm share/apps/showimgpart @dirrm share/apps/showimg/pics @dirrm share/apps/showimg/icons/hicolor/64x64/mimetypes @dirrm share/apps/showimg/icons/hicolor/64x64 @@ -254,9 +301,3 @@ @dirrm share/apps/showimg/icons/crystalsvg @dirrm share/apps/showimg/icons @dirrm share/apps/showimg -@dirrmtry share/apps/konqueror/servicemenus -@dirrmtry share/apps/konqueror -@dirrmtry share/apps/showimgpart -@dirrmtry share/apps -@dirrmtry share/applnk/Graphics -@dirrmtry share/applnk