Update to 2.1.0

Remove multiple instances of USES=qt:4; one is enough
This commit is contained in:
Jason E. Hale 2018-07-31 17:47:53 +00:00
parent ff3097295f
commit 9e6fe680a1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=476011
6 changed files with 77 additions and 93 deletions

View File

@ -1,10 +1,9 @@
# $FreeBSD$
PORTNAME= krecipes
DISTVERSION= 2.0-beta2
PORTREVISION= 11
PORTVERSION= 2.1.0
CATEGORIES= misc kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src/
MAINTAINER= jhale@FreeBSD.org
COMMENT= KDE4 recipe database
@ -12,11 +11,11 @@ COMMENT= KDE4 recipe database
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cmake gettext kde:4 qt:4 shared-mime-info
USES= cmake gettext kde:4 qt:4 shared-mime-info tar:xz
USE_GNOME= libxml2 libxslt
USE_QT= corelib dbus gui qt3support sql webkit xml \
moc_build qmake_build rcc_build uic_build
USE_KDE= automoc4 kdelibs qimageblitz
USE_KDE= automoc4 kdelibs
LDFLAGS+= -Wl,--as-needed
@ -24,14 +23,13 @@ OPTIONS_MULTI= DB
OPTIONS_MULTI_DB= SQLITE MYSQL PGSQL
OPTIONS_DEFAULT= SQLITE
SQLITE_USES= qt:4 sqlite
SQLITE_USES= sqlite
SQLITE_USE= QT=sql-sqlite3_run
SQLITE_CMAKE_BOOL= WITH_Sqlite
MYSQL_USES= mysql qt:4
MYSQL_USES= mysql
MYSQL_USE= QT=sql-mysql_run
PGSQL_USES= pgsql qt:4
PGSQL_USES= pgsql
PGSQL_USE= QT=sql-pgsql_run
.include <bsd.port.mk>

View File

@ -1,2 +1,3 @@
SHA256 (krecipes-2.0-beta2.tar.gz) = 11800d57c5b6151b0bc1a9a48e750ec4be546342b7cebdd099f912604d85c596
SIZE (krecipes-2.0-beta2.tar.gz) = 6939714
TIMESTAMP = 1533054548
SHA256 (krecipes-2.1.0.tar.xz) = fdc4d318a08cf419ecfbb3e34aa7be345ca5a8f4cacc9cf09fede0b7d4ec6874
SIZE (krecipes-2.1.0.tar.xz) = 4882668

View File

@ -0,0 +1,21 @@
Set CMake minimum version and remove duplicate doc directory which violates
CMP0013
--- CMakeLists.txt.orig 2015-03-23 21:04:09 UTC
+++ CMakeLists.txt
@@ -1,5 +1,7 @@
project(krecipes)
+cmake_minimum_required(VERSION 2.8.9)
+
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake
${CMAKE_MODULE_PATH})
@@ -21,7 +23,6 @@ add_subdirectory( pics )
add_subdirectory( data )
add_subdirectory( layouts )
add_subdirectory( mimetypes )
-add_subdirectory( doc )
include(MacroOptionalAddSubdirectory)
macro_optional_add_subdirectory( po )

View File

@ -1,12 +0,0 @@
--- ./src/CMakeLists.txt.orig 2010-11-01 15:45:20.000000000 -0400
+++ ./src/CMakeLists.txt 2011-02-15 21:12:42.000000000 -0500
@@ -2,8 +2,7 @@
include(FindLibXslt)
include(FindQImageBlitz)
-find_package(Sqlite2)
-find_package(Sqlite)
+macro_optional_find_package(Sqlite)
find_package(QImageBlitz)
include_directories( ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}
${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR} ${QIMAGEBLITZ_INCLUDES}

View File

@ -1,10 +0,0 @@
--- ./src/dialogs/similarcategoriesdialog.cpp.orig 2011-02-15 21:13:12.000000000 -0500
+++ ./src/dialogs/similarcategoriesdialog.cpp 2011-02-15 21:13:27.000000000 -0500
@@ -202,7 +202,6 @@
/*****************************************************/
#include <stdlib.h>
-#include <malloc.h>
#include <string.h>
int levenshtein_distance(const char *s,const char*t);
int minimum(int a,int b,int c);

View File

@ -55,9 +55,6 @@ share/doc/HTML/en/krecipes/authors-adding.png
share/doc/HTML/en/krecipes/categories.png
share/doc/HTML/en/krecipes/clear_right.png
share/doc/HTML/en/krecipes/common
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
@ -107,61 +104,56 @@ share/doc/HTML/en/krecipes/units.png
share/doc/HTML/en/krecipes/up.png
share/doc/HTML/en/krecipes/volume-convert.png
share/doc/HTML/en/krecipes/wildcard-table.png
share/doc/HTML/pt/krecipes/common
share/doc/HTML/pt/krecipes/index.cache.bz2
share/doc/HTML/pt/krecipes/index.docbook
share/doc/HTML/pt_BR/krecipes/common
share/doc/HTML/pt_BR/krecipes/index.cache.bz2
share/doc/HTML/pt_BR/krecipes/index.docbook
share/doc/HTML/sv/krecipes/addunit.png
share/doc/HTML/sv/krecipes/adv-cat-search.png
share/doc/HTML/sv/krecipes/adv-recipe-found.png
share/doc/HTML/sv/krecipes/adv-search-parts.png
share/doc/HTML/sv/krecipes/adv-srch-multi.png
share/doc/HTML/sv/krecipes/authors-adding.png
share/doc/HTML/sv/krecipes/categories.png
share/doc/HTML/sv/krecipes/common
share/doc/HTML/sv/krecipes/config-email.png
share/doc/HTML/sv/krecipes/configure-shortcuts-adv.png
share/doc/HTML/sv/krecipes/configure-shortcuts-basic.png
share/doc/HTML/sv/krecipes/configure-shortcuts.png
share/doc/HTML/sv/krecipes/configure-toolbars.png
share/doc/HTML/sv/krecipes/diet-help.png
share/doc/HTML/sv/krecipes/enter-recipe-tabs.png
share/doc/HTML/sv/krecipes/formatting.png
share/doc/HTML/sv/krecipes/import-other-sql.png
share/doc/HTML/sv/krecipes/import-recipe-screen.png
share/doc/HTML/sv/krecipes/import-settings.png
share/doc/HTML/sv/krecipes/import-sqlite.png
share/doc/HTML/sv/krecipes/index.cache.bz2
share/doc/HTML/sv/krecipes/index.docbook
share/doc/HTML/sv/krecipes/ingredient-match.png
share/doc/HTML/sv/krecipes/ingredients.png
share/doc/HTML/sv/krecipes/krecipes-main.png
share/doc/HTML/sv/krecipes/mass-convert.png
share/doc/HTML/sv/krecipes/measure-convert.png
share/doc/HTML/sv/krecipes/menu.png
share/doc/HTML/sv/krecipes/page-setup.png
share/doc/HTML/sv/krecipes/parser.png
share/doc/HTML/sv/krecipes/performance.png
share/doc/HTML/sv/krecipes/prep-method.png
share/doc/HTML/sv/krecipes/print-preview.png
share/doc/HTML/sv/krecipes/properties.png
share/doc/HTML/sv/krecipes/property_details.png
share/doc/HTML/sv/krecipes/ratings.png
share/doc/HTML/sv/krecipes/recipe-description-tab.png
share/doc/HTML/sv/krecipes/recipe-ingredients-tab.png
share/doc/HTML/sv/krecipes/recipe-instructions-tab.png
share/doc/HTML/sv/krecipes/restore-msg.png
share/doc/HTML/sv/krecipes/server-settings.png
share/doc/HTML/sv/krecipes/shop-list.png
share/doc/HTML/sv/krecipes/submit-bug.png
share/doc/HTML/sv/krecipes/unit-conversions.png
share/doc/HTML/sv/krecipes/units.png
share/doc/HTML/sv/krecipes/volume-convert.png
share/doc/HTML/uk/krecipes/addunit.png
share/doc/HTML/uk/krecipes/adv-cat-search.png
share/doc/HTML/uk/krecipes/adv-recipe-found.png
share/doc/HTML/uk/krecipes/adv-search-parts.png
share/doc/HTML/uk/krecipes/adv-srch-multi.png
share/doc/HTML/uk/krecipes/authors-adding.png
share/doc/HTML/uk/krecipes/categories.png
share/doc/HTML/uk/krecipes/common
share/doc/HTML/uk/krecipes/configure-shortcuts.png
share/doc/HTML/uk/krecipes/configure-toolbars.png
share/doc/HTML/uk/krecipes/diet-help.png
share/doc/HTML/uk/krecipes/edit-property-information.png
share/doc/HTML/uk/krecipes/enter-recipe-tabs.png
share/doc/HTML/uk/krecipes/formatting.png
share/doc/HTML/uk/krecipes/import-other-sql.png
share/doc/HTML/uk/krecipes/import-recipe-screen.png
share/doc/HTML/uk/krecipes/import-settings.png
share/doc/HTML/uk/krecipes/import-sqlite.png
share/doc/HTML/uk/krecipes/index.cache.bz2
share/doc/HTML/uk/krecipes/index.docbook
share/doc/HTML/uk/krecipes/ingredient-match.png
share/doc/HTML/uk/krecipes/ingredients.png
share/doc/HTML/uk/krecipes/krecipes-main.png
share/doc/HTML/uk/krecipes/mass-convert.png
share/doc/HTML/uk/krecipes/measure-convert.png
share/doc/HTML/uk/krecipes/page-setup.png
share/doc/HTML/uk/krecipes/parser.png
share/doc/HTML/uk/krecipes/performance.png
share/doc/HTML/uk/krecipes/prep-method.png
share/doc/HTML/uk/krecipes/print-preview.png
share/doc/HTML/uk/krecipes/properties.png
share/doc/HTML/uk/krecipes/property_details.png
share/doc/HTML/uk/krecipes/ratings.png
share/doc/HTML/uk/krecipes/recipe-description-tab.png
share/doc/HTML/uk/krecipes/recipe-ingredients-tab.png
share/doc/HTML/uk/krecipes/recipe-instructions-tab.png
share/doc/HTML/uk/krecipes/recipe-ratings-tab.png
share/doc/HTML/uk/krecipes/restore-msg.png
share/doc/HTML/uk/krecipes/server-settings.png
share/doc/HTML/uk/krecipes/shop-list.png
share/doc/HTML/uk/krecipes/submit-bug.png
share/doc/HTML/uk/krecipes/units.png
share/doc/HTML/uk/krecipes/volume-convert.png
share/doc/HTML/uk/krecipes/wildcard-table.png
share/icons/hicolor/128x128/apps/krecipes.png
share/icons/hicolor/16x16/apps/krecipes.png
share/icons/hicolor/22x22/apps/krecipes.png
@ -205,7 +197,7 @@ share/icons/oxygen/48x48/actions/properties.png
share/icons/oxygen/48x48/actions/units.png
share/icons/oxygen/64x64/mimetypes/application-x-krecipes-backup.png
share/icons/oxygen/64x64/mimetypes/application-x-krecipes-recipes.png
share/locale/bg/LC_MESSAGES/krecipes.mo
share/locale/bs/LC_MESSAGES/krecipes.mo
share/locale/ca/LC_MESSAGES/krecipes.mo
share/locale/ca@valencia/LC_MESSAGES/krecipes.mo
share/locale/cs/LC_MESSAGES/krecipes.mo
@ -213,30 +205,24 @@ 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/eo/LC_MESSAGES/krecipes.mo
share/locale/es/LC_MESSAGES/krecipes.mo
share/locale/et/LC_MESSAGES/krecipes.mo
share/locale/fi/LC_MESSAGES/krecipes.mo
share/locale/fr/LC_MESSAGES/krecipes.mo
share/locale/ga/LC_MESSAGES/krecipes.mo
share/locale/gl/LC_MESSAGES/krecipes.mo
share/locale/hi/LC_MESSAGES/krecipes.mo
share/locale/hne/LC_MESSAGES/krecipes.mo
share/locale/hr/LC_MESSAGES/krecipes.mo
share/locale/hu/LC_MESSAGES/krecipes.mo
share/locale/is/LC_MESSAGES/krecipes.mo
share/locale/it/LC_MESSAGES/krecipes.mo
share/locale/ja/LC_MESSAGES/krecipes.mo
share/locale/lt/LC_MESSAGES/krecipes.mo
share/locale/mai/LC_MESSAGES/krecipes.mo
share/locale/kk/LC_MESSAGES/krecipes.mo
share/locale/nb/LC_MESSAGES/krecipes.mo
share/locale/nds/LC_MESSAGES/krecipes.mo
share/locale/nl/LC_MESSAGES/krecipes.mo
share/locale/nn/LC_MESSAGES/krecipes.mo
share/locale/pl/LC_MESSAGES/krecipes.mo
share/locale/pt/LC_MESSAGES/krecipes.mo
share/locale/pt_BR/LC_MESSAGES/krecipes.mo
share/locale/ro/LC_MESSAGES/krecipes.mo
share/locale/ru/LC_MESSAGES/krecipes.mo
share/locale/sk/LC_MESSAGES/krecipes.mo
share/locale/sl/LC_MESSAGES/krecipes.mo
share/locale/sv/LC_MESSAGES/krecipes.mo
share/locale/tr/LC_MESSAGES/krecipes.mo
share/locale/uk/LC_MESSAGES/krecipes.mo