From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 2 07:40:07 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 557F016A420 for ; Thu, 2 Feb 2006 07:40:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5E8443D53 for ; Thu, 2 Feb 2006 07:40:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k127e645058854 for ; Thu, 2 Feb 2006 07:40:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k127e6YA058853; Thu, 2 Feb 2006 07:40:06 GMT (envelope-from gnats) Resent-Date: Thu, 2 Feb 2006 07:40:06 GMT Resent-Message-Id: <200602020740.k127e6YA058853@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Jason E. Hale" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D31BD16A422 for ; Thu, 2 Feb 2006 07:34:48 +0000 (GMT) (envelope-from jhale2000@hotmail.com) Received: from hotmail.com (bay101-dav8.bay101.hotmail.com [64.4.56.80]) by mx1.FreeBSD.org (Postfix) with ESMTP id 790E843D46 for ; Thu, 2 Feb 2006 07:34:46 +0000 (GMT) (envelope-from jhale2000@hotmail.com) Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC; Wed, 1 Feb 2006 23:34:46 -0800 Received: from 24.3.133.137 by BAY101-DAV8.phx.gbl with DAV; Thu, 02 Feb 2006 07:34:44 +0000 Message-Id: Date: 1 Feb 2006 23:34:46 -0800 From: "Jason E. Hale" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: shelton@granch.ru Subject: ports/92720: [UNBREAK] graphics/showimg and update to 0.95 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Jason E. Hale" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 07:40:07 -0000 >Number: 92720 >Category: ports >Synopsis: [UNBREAK] graphics/showimg and update to 0.95 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Feb 02 07:40:05 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jason E. Hale >Release: FreeBSD 6.0-RELEASE-p4 i386 >Organization: none >Environment: System: FreeBSD 6.0-RELEASE-p4 i386 KDE 3.5.0, MySQL 4.1, only tested on FreeBSD 6.0 >Description: o Port has been marked BROKEN since 2005-11-14. Unbreak by updating to the latest release. o Makefile changes: - Give the user some OPTIONS. - A MySQL client does need to be installed to build the MySQL plugin Plugin was tested with MySQL 4.1 - PostgreSQL disabled since there is no actual way to configure it in the program. Plugin does build, however, but is useless. - For either DB plugin to build, KEXIDB must be enabled, so the OPTIONS make it fool-proof - Add an additional MASTER_SITES - Patch ${WRKSRC}/Makefile.in. Otherwise, it tries to run aclocal-1.7 and runs the configure script twice o pkg-plist changes: - Several more files - Installs different files for different OPTIONS - Don't try to remove directories created by kdehier >How-To-Repeat: Apply the supplied diff. NOTE: a new patch file is included: showimg/files/patch-showimg_showimg_imagelistview.cpp This patch fixes the build whenever showimg is built without KEXIDB >Fix: --- showimg.diff begins here --- diff -ruN showimg.orig/Makefile showimg/Makefile --- showimg.orig/Makefile Mon Jan 2 18:07:49 2006 +++ showimg/Makefile Thu Feb 2 00:52:49 2006 @@ -7,37 +7,61 @@ # 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/${PORTNAME}/download/${PORTVERSION}/ \ + http://vxj-se.lunar-linux.org/lunar/cache/ MAINTAINER= shelton@granch.ru COMMENT= A picture viewer designed to run under KDE 3.x -LIB_DEPENDS= kipi:${PORTSDIR}/graphics/libkipi \ - kexif:${PORTSDIR}/graphics/libkexif - -BROKEN= Does not compile - -USE_BZIP2= yes +USE_BZIP2= yes +USE_GMAKE= yes USE_KDEBASE_VER= 3 -USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_REINPLACE= yes - -INSTALLS_SHLIB= yes -LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 - -CONFIGURE_ARGS+= --disable-debug - -post-extract: - @${TOUCH} ${WRKSRC}/config.h.in +GNU_CONFIGURE= yes +INSTALLS_SHLIB= yes +CONFIGURE_ARGS+= --disable-pgsql +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} + +OPTIONS= KIPI "Support for libkipi" on \ + KEXIF "Support for kexif" on \ + KEXIDB "Support for KexiDB/ShowimgDB" on \ + MYSQL "Build MySQL plugin for KexiDB" off \ + +.include + +.if defined(WITHOUT_KIPI) +CONFIGURE_ARGS+=--disable-libkipi +.else +LIB_DEPENDS+= kipi:${PORTSDIR}/graphics/libkipi +.endif + +.if defined(WITHOUT_KEXIF) +CONFIGURE_ARGS+=--without-kexif +.else +LIB_DEPENDS+= kexif:${PORTSDIR}/graphics/libkexif +.endif + +.if defined(WITHOUT_KEXIDB) && defined(WITHOUT_MYSQL) +CONFIGURE_ARGS+=--without-showimgdb +PLIST_SUB+= KEXIDB="@comment " +.else +PLIST_SUB+= KEXIDB="" +.endif + +.if defined(WITH_MYSQL) +USE_MYSQL= yes +PLIST_SUB+= MYSQL="" +.else +CONFIGURE_ARGS+=--disable-mysql +PLIST_SUB+= MYSQL="@comment " +.endif post-patch: - @${REINPLACE_CMD} -e 's|-O2||g' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e '347,365d' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} -.include +.include diff -ruN showimg.orig/distinfo showimg/distinfo --- showimg.orig/distinfo Wed Feb 1 22:39:37 2006 +++ showimg/distinfo Mon Jan 30 19:33:00 2006 @@ -1,3 +1,3 @@ -MD5 (showimg-0.9.5-rc1.tar.bz2) = 69a8b6d6d0097a900d8741e227911a50 -SHA256 (showimg-0.9.5-rc1.tar.bz2) = c559110b78f5eff72f6df24ff0366bb0d877df9d0e963ba2d229ceff4b1f6ccc -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 Wed Dec 31 19:00:00 1969 +++ showimg/files/patch-showimg_showimg_imagelistview.cpp Tue Jan 31 09:32:40 2006 @@ -0,0 +1,13 @@ +diff -ruN showimg/showimg/imagelistview.cpp showimg/showimg/imagelistview.cpp +--- showimg/showimg/imagelistview.cpp Sat Jan 7 03:48:04 2006 ++++ showimg/showimg/imagelistview.cpp Tue Jan 31 09:26:04 2006 +@@ -542,7 +542,9 @@ + //////// + m_popup->insertSeparator(); + aImageInfo->plug(m_popup); ++#ifdef WANT_LIBKEXIDB + if(mw->getCategoryDBManager()->isConnected()) aCategoryProperties->plug(m_popup); ++#endif + aFileProperties->plug(m_popup); + } + diff -ruN showimg.orig/pkg-plist showimg/pkg-plist --- showimg.orig/pkg-plist Sun Jan 29 21:56:26 2006 +++ showimg/pkg-plist Wed Feb 1 18:42:54 2006 @@ -1,24 +1,31 @@ bin/showimg -bin/sidbtest +%%KEXIDB%%bin/sidbtest +lib/kde3/libshowimgpart.la +lib/kde3/libshowimgpart.so +%%MYSQL%%lib/kde3/showimg_kexidb_mysqldriver.la +%%MYSQL%%lib/kde3/showimg_kexidb_mysqldriver.so +%%KEXIDB%%lib/kde3/showimg_kexidb_sqlite2driver.la +%%KEXIDB%%lib/kde3/showimg_kexidb_sqlite2driver.so +%%KEXIDB%%lib/kde3/showimg_kexidb_sqlite3driver.la +%%KEXIDB%%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.0 -lib/libshowimgkexidbparser.la -lib/libshowimgkexidbparser.so.1 -lib/libshowimgkexiutils.la -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 +%%KEXIDB%%lib/libshowimgkexidb.la +%%KEXIDB%%lib/libshowimgkexidb.so +%%KEXIDB%%lib/libshowimgkexidb.so.0 +%%KEXIDB%%lib/libshowimgkexidbparser.la +%%KEXIDB%%lib/libshowimgkexidbparser.so +%%KEXIDB%%lib/libshowimgkexidbparser.so.1 +%%KEXIDB%%lib/libshowimgkexisql2.la +%%KEXIDB%%lib/libshowimgkexisql2.so +%%KEXIDB%%lib/libshowimgkexisql2.so.2 +%%KEXIDB%%lib/libshowimgkexisql3.la +%%KEXIDB%%lib/libshowimgkexisql3.so +%%KEXIDB%%lib/libshowimgkexisql3.so.3 +%%KEXIDB%%lib/libshowimgkexiutils.la +%%KEXIDB%%lib/libshowimgkexiutils.so +%%KEXIDB%%lib/libshowimgkexiutils.so.1 share/applnk/Graphics/showimg.desktop share/apps/konqueror/servicemenus/konqshowimg.desktop share/apps/showimg/convert2png.pl @@ -90,6 +97,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 +145,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 +193,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 +204,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 +219,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 +235,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 +244,21 @@ share/locale/zh_CN/LC_MESSAGES/showimg.mo share/mimelnk/image/x-psd.desktop share/mimelnk/image/x-sia.desktop +%%MYSQL%%share/services/showimg_kexidb_mysqldriver.desktop +%%KEXIDB%%share/services/showimg_kexidb_sqlite2driver.desktop +%%KEXIDB%%share/services/showimg_kexidb_sqlite3driver.desktop share/services/showimgpart.desktop -share/services/showimg_kexidb_sqlite3driver.desktop -share/services/showimg_kexidb_sqlite2driver.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 +%%KEXIDB%%share/servicetypes/showimg_kexidb_driver.desktop +@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 +282,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 --- showimg.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: