Date: Thu, 5 Jan 2006 16:13:11 -0600 From: "Jason E. Hale" <jhale@bluebottle.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: hank@millerfarm.com Subject: ports/91361: [UPDATE] misc/krecipes to version 0.9.1, unbreak on 4.x Message-ID: <200601060413.k064DbtE002525@fe4.bluebottle.com> Resent-Message-ID: <200601052220.k05MK4um044315@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 91361
>Category: ports
>Synopsis: [UPDATE] misc/krecipes to version 0.9.1, unbreak on 4.x
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 05 22:20:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jason E. Hale
>Release: FreeBSD 6.0-RELEASE i386
>Organization:
none
>Environment:
System: FreeBSD black.attbi.com 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 13:53:40 EST 2005 Jason@black.attbi.com:/usr/obj/usr/src/sys/BLACK i386
Tested on: FreeBSD 4.11-RELEASE
FreeBSD 6.0-RELEASE
FreeBSD 7.0-CURRENT
>Description:
o Update Krecipes to version 0.9.1.
o New version builds on FreeBSD 4.11 ... unbreak for 4.x
o Clean up Makefile
- OPTIONS cleanup
- Use USE_SQLITE
- Remove unneccesary -O2 optimization from configure script
- Disable databases not selected in OPTIONS so startup Wizard disables
unavailable selections
o New version no longer installs a shared lib and the pkg-plist is the same
for any chosen database(s)
o Make pkg-descr a little more concise and list available backends
>How-To-Repeat:
Copy the attached krecipes.diff into /usr/ports/misc/krecipes and run:
patch <krecipes.diff
>Fix:
--- krecipes.diff begins here ---
diff -ruN krecipes.old/Makefile krecipes/Makefile
--- krecipes.old/Makefile Sat Nov 5 00:19:38 2005
+++ krecipes/Makefile Thu Jan 5 16:26:50 2006
@@ -6,53 +6,50 @@
#
PORTNAME= krecipes
-PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTVERSION= 0.9.1
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= krecipes_beta_0.7.1
MAINTAINER= hank@millerfarm.com
COMMENT= Recipe database for cooks
-OPTIONS+= SQLITE "Support for sqlite backend" on
-OPTIONS+= MYSQL "Support for MySQL backend" off
-OPTIONS+= POSTGRESQL "Support for PostgreSQL backend" off
-
-USE_KDELIBS_VER= 3
-GNU_CONFIGURE= yes
-
-WRKSRC= ${WRKDIR}/krecipes-0.7.1
-
-INSTALLS_SHLIB= yes
+USE_KDELIBS_VER=3
+GNU_CONFIGURE= yes
+USE_REINPLACE= yes
+
+OPTIONS= SQLITE "Support for SQLite backend" on \
+ MYSQL "Support for MySQL backend" off \
+ POSTGRESQL "Support for PostgreSQL backend" off
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-BROKEN= Does not compile.
-.endif
-
.if defined(WITHOUT_SQLITE)
CONFIGURE_ARGS+= --without-sqlite
-PLIST_SUB+= SQLITE="@comment "
.else
-LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3
-PLIST_SUB+= SQLITE=""
+USE_SQLITE= yes
.endif
.if defined(WITH_MYSQL)
RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin
+.else
+CONFIGURE_ARGS+= --without-mysql
.endif
.if defined(WITH_POSTGRESQL)
RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin
+.else
+CONFIGURE_ARGS+= --without-postgresql
.endif
+post-extract:
+ @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+
pre-configure:
-. if defined(WITHOUT_SQLITE) && !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
+.if defined(WITHOUT_SQLITE) && !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
@${ECHO} "You must have at least one database backend"
@exit 1
-. endif
+.endif
.include <bsd.port.post.mk>
+
diff -ruN krecipes.old/distinfo krecipes/distinfo
--- krecipes.old/distinfo Fri Jun 10 14:50:56 2005
+++ krecipes/distinfo Thu Jan 5 16:27:01 2006
@@ -1,2 +1,4 @@
-MD5 (krecipes_beta_0.7.1.tar.gz) = 6cb93fd1e055b814e9eff784987d831b
-SIZE (krecipes_beta_0.7.1.tar.gz) = 5587596
+MD5 (krecipes-0.9.1.tar.gz) = 7414fd5210561801ba04ee3dad6561d9
+SHA256 (krecipes-0.9.1.tar.gz) = 6efdb751f26ab2460d84c39be25042d0bea013becf8c6b1a5ae2a5c46998a0f3
+SIZE (krecipes-0.9.1.tar.gz) = 7791658
+
diff -ruN krecipes.old/pkg-descr krecipes/pkg-descr
--- krecipes.old/pkg-descr Fri Jun 10 14:50:56 2005
+++ krecipes/pkg-descr Thu Jan 5 16:27:13 2006
@@ -1,8 +1,9 @@
-Port of krecipes, a program that lets you to manage your recipes, create
-shopping lists, choose a recipe based on available ingredients and plan
-your menu/diet in advance.
+Krecipes lets you manage your recipes, create shopping lists, choose a
+recipe based on available ingredients, and plan your menu/diet in advance.
+Uses your choice of SQLite, MySQL, or PostgreSQL as a database backend.
WWW: http://krecipes.sourceforge.net/
- Hank
hank@millerfarm.com
+
diff -ruN krecipes.old/pkg-plist krecipes/pkg-plist
--- krecipes.old/pkg-plist Mon Jun 20 07:11:45 2005
+++ krecipes/pkg-plist Thu Jan 5 16:27:46 2006
@@ -1,22 +1,17 @@
bin/krecipes
-%%SQLITE%%include/krecqsqlitedb.h
-%%SQLITE%%include/krecqsqliteresult.h
-lib/libkrecipesexporters.la
-lib/libkrecipesexporters.so
-lib/libkrecipesexporters.so.0
-%%SQLITE%%lib/libkrecqsqlite.la
-%%SQLITE%%lib/libkrecqsqlite.so
-%%SQLITE%%lib/libkrecqsqlite.so.0
share/applnk/Utilities/krecipes.desktop
share/apps/krecipes/data/abbrev.txt
share/apps/krecipes/data/data.sql
+share/apps/krecipes/data/samples-cs_CZ.kreml
share/apps/krecipes/data/samples-en_US.kreml
+share/apps/krecipes/icons/crystalsvg/128x128/mimetypes/krecipes_file.png
share/apps/krecipes/icons/crystalsvg/16x16/actions/categories.png
share/apps/krecipes/icons/crystalsvg/16x16/actions/diet.png
share/apps/krecipes/icons/crystalsvg/16x16/actions/ingredients.png
share/apps/krecipes/icons/crystalsvg/16x16/actions/properties.png
share/apps/krecipes/icons/crystalsvg/16x16/actions/trolley.png
share/apps/krecipes/icons/crystalsvg/16x16/actions/units.png
+share/apps/krecipes/icons/crystalsvg/16x16/mimetypes/krecipes_file.png
share/apps/krecipes/icons/crystalsvg/22x22/actions/categories.png
share/apps/krecipes/icons/crystalsvg/22x22/actions/diet.png
share/apps/krecipes/icons/crystalsvg/22x22/actions/ingredients.png
@@ -30,35 +25,59 @@
share/apps/krecipes/icons/crystalsvg/32x32/actions/properties.png
share/apps/krecipes/icons/crystalsvg/32x32/actions/trolley.png
share/apps/krecipes/icons/crystalsvg/32x32/actions/units.png
+share/apps/krecipes/icons/crystalsvg/32x32/mimetypes/krecipes_file.png
share/apps/krecipes/icons/crystalsvg/48x48/actions/categories.png
share/apps/krecipes/icons/crystalsvg/48x48/actions/diet.png
share/apps/krecipes/icons/crystalsvg/48x48/actions/ingredients.png
share/apps/krecipes/icons/crystalsvg/48x48/actions/properties.png
share/apps/krecipes/icons/crystalsvg/48x48/actions/trolley.png
share/apps/krecipes/icons/crystalsvg/48x48/actions/units.png
+share/apps/krecipes/icons/crystalsvg/64x64/mimetypes/krecipes_file.png
share/apps/krecipes/krecipesui.rc
share/apps/krecipes/layouts/default.klo
+share/apps/krecipes/layouts/default_print.klo
share/apps/krecipes/layouts/one_column.klo
share/apps/krecipes/pics/dbpermissions.png
share/apps/krecipes/pics/menubg.png
share/apps/krecipes/pics/network.png
+share/apps/krecipes/pics/rating0.png
+share/apps/krecipes/pics/rating1.png
+share/apps/krecipes/pics/rating2.png
+share/apps/krecipes/pics/rating3.png
+share/apps/krecipes/pics/rating4.png
+share/apps/krecipes/pics/rating5.png
share/apps/krecipes/pics/recipes.png
share/apps/krecipes/pics/save.png
+share/apps/krecipes/pics/star_half.png
+share/apps/krecipes/pics/star_off.png
+share/apps/krecipes/pics/star_on.png
share/apps/krecipes/pics/startlogo.png
share/apps/krecipes/pics/wizard.png
+share/doc/HTML/da/krecipes/common
+share/doc/HTML/da/krecipes/index.cache.bz2
+share/doc/HTML/da/krecipes/index.docbook
+share/doc/HTML/en/krecipes/1leftarrow.png
+share/doc/HTML/en/krecipes/1rightarrow.png
+share/doc/HTML/en/krecipes/2leftarrow.png
+share/doc/HTML/en/krecipes/2rightarrow.png
+share/doc/HTML/en/krecipes/adv-cat-search.png
share/doc/HTML/en/krecipes/adv-recipe-found.png
+share/doc/HTML/en/krecipes/adv-search-parts.png
+share/doc/HTML/en/krecipes/adv-srch-multi.png
share/doc/HTML/en/krecipes/authors-adding.png
share/doc/HTML/en/krecipes/back.png
share/doc/HTML/en/krecipes/categories.png
share/doc/HTML/en/krecipes/clear_left.png
share/doc/HTML/en/krecipes/common
share/doc/HTML/en/krecipes/computer3.png
+share/doc/HTML/en/krecipes/config-email.png
share/doc/HTML/en/krecipes/configure-shortcuts-adv.png
share/doc/HTML/en/krecipes/configure-shortcuts-basic.png
share/doc/HTML/en/krecipes/configure-shortcuts.png
share/doc/HTML/en/krecipes/configure-toolbars.png
share/doc/HTML/en/krecipes/diet-help.png
share/doc/HTML/en/krecipes/down.png
+share/doc/HTML/en/krecipes/editpaste.png
share/doc/HTML/en/krecipes/enter-recipe-tabs.png
share/doc/HTML/en/krecipes/filenew.png
share/doc/HTML/en/krecipes/formatting.png
@@ -77,16 +96,65 @@
share/doc/HTML/en/krecipes/menu.png
share/doc/HTML/en/krecipes/no.png
share/doc/HTML/en/krecipes/page-setup.png
+share/doc/HTML/en/krecipes/parser.png
+share/doc/HTML/en/krecipes/performance.png
share/doc/HTML/en/krecipes/prep-method.png
share/doc/HTML/en/krecipes/properties.png
+share/doc/HTML/en/krecipes/ratings.png
share/doc/HTML/en/krecipes/recipe-description-tab.png
share/doc/HTML/en/krecipes/recipe-ingredients-tab.png
share/doc/HTML/en/krecipes/recipe-instructions-tab.png
+share/doc/HTML/en/krecipes/restore-msg.png
share/doc/HTML/en/krecipes/server-settings.png
share/doc/HTML/en/krecipes/shop-list.png
+share/doc/HTML/en/krecipes/smiley.png
+share/doc/HTML/en/krecipes/submit-bug.png
share/doc/HTML/en/krecipes/unit-conversions.png
share/doc/HTML/en/krecipes/units.png
share/doc/HTML/en/krecipes/up.png
+share/doc/HTML/es/krecipes/adv-cat-search.png
+share/doc/HTML/es/krecipes/adv-search-parts.png
+share/doc/HTML/es/krecipes/adv-srch-multi.png
+share/doc/HTML/es/krecipes/authors-adding.png
+share/doc/HTML/es/krecipes/back.png
+share/doc/HTML/es/krecipes/categories.png
+share/doc/HTML/es/krecipes/clear_left.png
+share/doc/HTML/es/krecipes/configure-shortcuts-adv.png
+share/doc/HTML/es/krecipes/configure-shortcuts-basic.png
+share/doc/HTML/es/krecipes/configure-shortcuts.png
+share/doc/HTML/es/krecipes/configure-toolbars.png
+share/doc/HTML/es/krecipes/diet-help.png
+share/doc/HTML/es/krecipes/down.png
+share/doc/HTML/es/krecipes/enter-recipe-tabs.png
+share/doc/HTML/es/krecipes/filenew.png
+share/doc/HTML/es/krecipes/formatting.png
+share/doc/HTML/es/krecipes/forward.png
+share/doc/HTML/es/krecipes/import-other-sql.png
+share/doc/HTML/es/krecipes/import-recipe-screen.png
+share/doc/HTML/es/krecipes/import-settings.png
+share/doc/HTML/es/krecipes/import-sqlite.png
+share/doc/HTML/es/krecipes/ingredient-match.png
+share/doc/HTML/es/krecipes/ingredients.png
+share/doc/HTML/es/krecipes/krecipes-main.png
+share/doc/HTML/es/krecipes/krectip.png
+share/doc/HTML/es/krecipes/locationbar_erase.png
+share/doc/HTML/es/krecipes/menu.png
+share/doc/HTML/es/krecipes/no.png
+share/doc/HTML/es/krecipes/page-setup.png
+share/doc/HTML/es/krecipes/performance.png
+share/doc/HTML/es/krecipes/prep-method.png
+share/doc/HTML/es/krecipes/properties.png
+share/doc/HTML/es/krecipes/recipe-description-tab.png
+share/doc/HTML/es/krecipes/recipe-ingredients-tab.png
+share/doc/HTML/es/krecipes/recipe-instructions-tab.png
+share/doc/HTML/es/krecipes/server-settings.png
+share/doc/HTML/es/krecipes/shop-list.png
+share/doc/HTML/es/krecipes/unit-conversions.png
+share/doc/HTML/es/krecipes/units.png
+share/doc/HTML/es/krecipes/up.png
+share/doc/HTML/et/krecipes/common
+share/doc/HTML/et/krecipes/index.cache.bz2
+share/doc/HTML/et/krecipes/index.docbook
share/doc/HTML/pt/krecipes/common
share/doc/HTML/pt/krecipes/index.cache.bz2
share/doc/HTML/pt/krecipes/index.docbook
@@ -121,6 +189,10 @@
share/doc/HTML/sv/krecipes/shop-list.png
share/doc/HTML/sv/krecipes/unit-conversions.png
share/doc/HTML/sv/krecipes/units.png
+share/icons/crystalsvg/128x128/mimetypes/krecipes_file.png
+share/icons/crystalsvg/16x16/mimetypes/krecipes_file.png
+share/icons/crystalsvg/32x32/mimetypes/krecipes_file.png
+share/icons/crystalsvg/64x64/mimetypes/krecipes_file.png
share/icons/hicolor/128x128/apps/krecipes.png
share/icons/hicolor/16x16/apps/krecipes.png
share/icons/hicolor/22x22/apps/krecipes.png
@@ -131,9 +203,11 @@
share/locale/bg/LC_MESSAGES/krecipes.mo
share/locale/br/LC_MESSAGES/krecipes.mo
share/locale/ca/LC_MESSAGES/krecipes.mo
+share/locale/cs/LC_MESSAGES/krecipes.mo
share/locale/cy/LC_MESSAGES/krecipes.mo
share/locale/da/LC_MESSAGES/krecipes.mo
share/locale/de/LC_MESSAGES/krecipes.mo
+share/locale/el/LC_MESSAGES/krecipes.mo
share/locale/en_GB/LC_MESSAGES/krecipes.mo
share/locale/es/LC_MESSAGES/krecipes.mo
share/locale/et/LC_MESSAGES/krecipes.mo
@@ -151,27 +225,39 @@
share/locale/pt_BR/LC_MESSAGES/krecipes.mo
share/locale/ro/LC_MESSAGES/krecipes.mo
share/locale/ru/LC_MESSAGES/krecipes.mo
+share/locale/rw/LC_MESSAGES/krecipes.mo
share/locale/sl/LC_MESSAGES/krecipes.mo
share/locale/sr/LC_MESSAGES/krecipes.mo
+share/locale/sr@Latn/LC_MESSAGES/krecipes.mo
share/locale/sv/LC_MESSAGES/krecipes.mo
share/locale/ta/LC_MESSAGES/krecipes.mo
share/locale/tr/LC_MESSAGES/krecipes.mo
-share/nls/POSIX
-share/nls/en_US.US-ASCII
-@dirrm /share/doc/HTML/sv/krecipes
-@dirrm /share/doc/HTML/pt/krecipes
-@dirrm /share/doc/HTML/en/krecipes
-@dirrm /share/apps/krecipes/pics
-@dirrm /share/apps/krecipes/layouts
-@dirrm /share/apps/krecipes/icons/crystalsvg/48x48/actions
-@dirrm /share/apps/krecipes/icons/crystalsvg/48x48
-@dirrm /share/apps/krecipes/icons/crystalsvg/32x32/actions
-@dirrm /share/apps/krecipes/icons/crystalsvg/32x32
-@dirrm /share/apps/krecipes/icons/crystalsvg/22x22/actions
-@dirrm /share/apps/krecipes/icons/crystalsvg/22x22
-@dirrm /share/apps/krecipes/icons/crystalsvg/16x16/actions
-@dirrm /share/apps/krecipes/icons/crystalsvg/16x16
-@dirrm /share/apps/krecipes/icons/crystalsvg
-@dirrm /share/apps/krecipes/icons
-@dirrm /share/apps/krecipes/data
-@dirrm /share/apps/krecipes
+share/mimelnk/application/x-krecipes-backup.desktop
+share/mimelnk/application/x-krecipes-recipes.desktop
+@dirrm share/doc/HTML/sv/krecipes
+@dirrm share/doc/HTML/pt/krecipes
+@dirrm share/doc/HTML/et/krecipes
+@dirrm share/doc/HTML/es/krecipes
+@dirrm share/doc/HTML/en/krecipes
+@dirrm share/doc/HTML/da/krecipes
+@dirrm share/apps/krecipes/pics
+@dirrm share/apps/krecipes/layouts
+@dirrm share/apps/krecipes/icons/crystalsvg/64x64/mimetypes
+@dirrm share/apps/krecipes/icons/crystalsvg/64x64
+@dirrm share/apps/krecipes/icons/crystalsvg/48x48/actions
+@dirrm share/apps/krecipes/icons/crystalsvg/48x48
+@dirrm share/apps/krecipes/icons/crystalsvg/32x32/mimetypes
+@dirrm share/apps/krecipes/icons/crystalsvg/32x32/actions
+@dirrm share/apps/krecipes/icons/crystalsvg/32x32
+@dirrm share/apps/krecipes/icons/crystalsvg/22x22/actions
+@dirrm share/apps/krecipes/icons/crystalsvg/22x22
+@dirrm share/apps/krecipes/icons/crystalsvg/16x16/mimetypes
+@dirrm share/apps/krecipes/icons/crystalsvg/16x16/actions
+@dirrm share/apps/krecipes/icons/crystalsvg/16x16
+@dirrm share/apps/krecipes/icons/crystalsvg/128x128/mimetypes
+@dirrm share/apps/krecipes/icons/crystalsvg/128x128
+@dirrm share/apps/krecipes/icons/crystalsvg
+@dirrm share/apps/krecipes/icons
+@dirrm share/apps/krecipes/data
+@dirrm share/apps/krecipes
+
--- krecipes.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601060413.k064DbtE002525>