diff options
-rw-r--r-- | astro/libkgeomap/Makefile | 17 | ||||
-rw-r--r-- | astro/libkgeomap/distinfo | 2 | ||||
-rw-r--r-- | astro/libkgeomap/pkg-plist | 1 | ||||
-rw-r--r-- | graphics/digikam-kde4/Makefile | 20 | ||||
-rw-r--r-- | graphics/digikam-kde4/Makefile.common | 26 | ||||
-rw-r--r-- | graphics/digikam-kde4/distinfo | 4 | ||||
-rw-r--r-- | graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp | 11 | ||||
-rw-r--r-- | graphics/digikam-kde4/pkg-message | 9 | ||||
-rw-r--r-- | graphics/kipi-plugins-kde4/Makefile | 16 | ||||
-rw-r--r-- | graphics/kipi-plugins-kde4/distinfo | 2 | ||||
-rw-r--r-- | graphics/kipi-plugins-kde4/pkg-plist | 31 | ||||
-rw-r--r-- | graphics/libkface/Makefile | 15 | ||||
-rw-r--r-- | graphics/libkface/distinfo | 2 | ||||
-rw-r--r-- | net/libkvkontakte/Makefile | 15 | ||||
-rw-r--r-- | net/libkvkontakte/distinfo | 2 | ||||
-rw-r--r-- | net/libmediawiki/Makefile | 15 | ||||
-rw-r--r-- | net/libmediawiki/distinfo | 2 |
17 files changed, 88 insertions, 102 deletions
diff --git a/astro/libkgeomap/Makefile b/astro/libkgeomap/Makefile index f620ef64f988..f013e527f15d 100644 --- a/astro/libkgeomap/Makefile +++ b/astro/libkgeomap/Makefile @@ -6,26 +6,15 @@ # PORTNAME= libkgeomap -PORTVERSION= 2.7.0 +PORTVERSION= ${DIGIKAM_VER} CATEGORIES= astro kde -MASTER_SITES= SF/digikam/digikam/${PORTVERSION} -DISTNAME= digikam-${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE4 library for browsing photos on a map -LICENSE= GPLv2 +.include "${.CURDIR}/../../graphics/digikam-kde4/Makefile.common" -OPTIONS_DEFINE= NLS - -USE_BZIP2= yes -USE_CMAKE= yes -USE_KDE4= automoc4 kdehier kdeprefix kdelibs libkexiv2 marble -USE_QT4= qmake_build moc_build rcc_build uic_build -USE_LDCONFIG= yes -MAKE_JOBS_SAFE= yes - -WRKSRC= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME} +USE_KDE4+= libkexiv2 marble .include <bsd.port.options.mk> diff --git a/astro/libkgeomap/distinfo b/astro/libkgeomap/distinfo deleted file mode 100644 index f52060d5d477..000000000000 --- a/astro/libkgeomap/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (digikam-2.7.0.tar.bz2) = 2782b0f047cd0ae58af04095e2d03ea4a9d621fbef9d385f1465851fb62f5bab -SIZE (digikam-2.7.0.tar.bz2) = 55696444 diff --git a/astro/libkgeomap/pkg-plist b/astro/libkgeomap/pkg-plist index 6238637846bc..6c4a0eee90fc 100644 --- a/astro/libkgeomap/pkg-plist +++ b/astro/libkgeomap/pkg-plist @@ -64,6 +64,7 @@ share/apps/libkgeomap/marker-icon-16x16.png %%NLS%%share/locale/fi/LC_MESSAGES/libkgeomap.mo %%NLS%%share/locale/fr/LC_MESSAGES/libkgeomap.mo %%NLS%%share/locale/ga/LC_MESSAGES/libkgeomap.mo +%%NLS%%share/locale/gl/LC_MESSAGES/libkgeomap.mo %%NLS%%share/locale/hu/LC_MESSAGES/libkgeomap.mo %%NLS%%share/locale/it/LC_MESSAGES/libkgeomap.mo %%NLS%%share/locale/ja/LC_MESSAGES/libkgeomap.mo diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile index e432243fb4d9..41db693f6950 100644 --- a/graphics/digikam-kde4/Makefile +++ b/graphics/digikam-kde4/Makefile @@ -6,15 +6,14 @@ # PORTNAME= digikam -PORTVERSION= 2.7.0 +PORTVERSION= ${DIGIKAM_VER} PORTEPOCH= 1 CATEGORIES= graphics kde -MASTER_SITES= SF MAINTAINER= kde@FreeBSD.org -COMMENT= An advanced digital photo management application for KDE4 +COMMENT= KDE4 digital photo management application -LICENSE= GPLv2 +.include "${.CURDIR}/Makefile.common" LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ lcms:${PORTSDIR}/graphics/lcms \ @@ -35,13 +34,9 @@ NO_OPTIONS_SORT= yes GPHOTO2_DESC= Enable gphoto2 camera support PIMLIBS_DESC= Enable address book support -MAKE_JOBS_SAFE= yes -USE_BZIP2= yes -USE_KDE4= automoc4 kdehier kdeprefix kdelibs libkdcraw libkexiv2 libkipi -USE_QT4= sql-sqlite3_run \ - qmake_build moc_build rcc_build uic_build -USE_CMAKE= yes -USE_LDCONFIG= yes +USE_PKGCONFIG= build +USE_KDE4+= libkdcraw libkexiv2 libkipi +USE_QT4+= sql-sqlite3_run MAN1= digitaglinktree.1 \ cleanup_digikamdb.1 @@ -86,7 +81,4 @@ post-patch: ${LN} -s ../po ${WRKSRC}/po ${RM} ${WRKSRC}/po/*/libkgeomap.po ${WRKSRC}/po/*/kipi* -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.mk> diff --git a/graphics/digikam-kde4/Makefile.common b/graphics/digikam-kde4/Makefile.common new file mode 100644 index 000000000000..bf7d6508d91f --- /dev/null +++ b/graphics/digikam-kde4/Makefile.common @@ -0,0 +1,26 @@ +# $FreeBSD$ +# +# Make sure when DIGIKAM_VER is updated that the following ports are updated: +# astro/libkgeomap +# graphics/digikam-kde4 +# graphics/kipi-plugins-kde4 +# graphics/libkface +# net/libkvkontakte +# net/libmediawiki + +DIGIKAM_VER= 2.9.0 +MASTER_SITES= SF/digikam/digikam/${DIGIKAM_VER} +DISTNAME= digikam-${DIGIKAM_VER} + +LICENSE?= GPLv2 + +USE_BZIP2= yes +USE_CMAKE= yes +USE_KDE4+= automoc4 kdehier kdeprefix kdelibs +USE_QT4+= qmake_build moc_build rcc_build uic_build +USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes + +WRKSRC?= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME} + +DISTINFO_FILE= ${.CURDIR}/../../graphics/digikam-kde4/distinfo diff --git a/graphics/digikam-kde4/distinfo b/graphics/digikam-kde4/distinfo index f52060d5d477..076961537ef5 100644 --- a/graphics/digikam-kde4/distinfo +++ b/graphics/digikam-kde4/distinfo @@ -1,2 +1,2 @@ -SHA256 (digikam-2.7.0.tar.bz2) = 2782b0f047cd0ae58af04095e2d03ea4a9d621fbef9d385f1465851fb62f5bab -SIZE (digikam-2.7.0.tar.bz2) = 55696444 +SHA256 (digikam-2.9.0.tar.bz2) = 73dd0f3820fc44bba7b72c98cab73d0391e98687674da8be11ff07590c703ba0 +SIZE (digikam-2.9.0.tar.bz2) = 56765772 diff --git a/graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp b/graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp new file mode 100644 index 000000000000..efec65a1df73 --- /dev/null +++ b/graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp @@ -0,0 +1,11 @@ +--- ./digikam/album/albumwatch.cpp.orig 2012-09-05 19:38:42.000000000 -0400 ++++ ./digikam/album/albumwatch.cpp 2012-09-05 19:40:59.000000000 -0400 +@@ -221,7 +221,7 @@ + #ifdef Q_WS_MAC + d->dirWatch->addDir(dir, KDirWatch::WatchDirOnly); + #else +- d->dirWatch->addDir(dir, KDirWatch::WatchFiles | KDirWatch::WatchDirOnly); ++ d->dirWatch->addDir(dir, KDirWatch::WatchDirOnly); + #endif + } + } diff --git a/graphics/digikam-kde4/pkg-message b/graphics/digikam-kde4/pkg-message deleted file mode 100644 index ee13bb8c94ea..000000000000 --- a/graphics/digikam-kde4/pkg-message +++ /dev/null @@ -1,9 +0,0 @@ -============================================================================= - You might want to consider increasing the kern.maxfiles tunable using - sysctl(8) if you have a large photo collection. Otherwise, Digikam may - crash upon startup. - - Add the following line to /boot/loader.conf, then reboot the system: - - kern.maxfiles="25000" -============================================================================= diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile index c38838d13b15..37a8bca40115 100644 --- a/graphics/kipi-plugins-kde4/Makefile +++ b/graphics/kipi-plugins-kde4/Makefile @@ -6,16 +6,14 @@ # PORTNAME= kipi-plugins -PORTVERSION= 2.7.0 +PORTVERSION= ${DIGIKAM_VER} PORTEPOCH= 1 CATEGORIES= graphics kde -MASTER_SITES= SF/digikam/digikam/${PORTVERSION} -DISTNAME= digikam-${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE4 kipi graphics plugins -LICENSE= GPLv2 +.include "${.CURDIR}/../digikam-kde4/Makefile.common" LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ qjson:${PORTSDIR}/devel/qjson @@ -36,18 +34,12 @@ MEDIAWIKI_DESC= Enable MediaWiki plugin OPENCV_DESC= Enable Red Eye Removal plugin PIMLIBS_DESC= Enable Calendar plugins -USE_BZIP2= yes -USE_CMAKE= yes +USE_PKGCONFIG= build USE_GL= glu -USE_KDE4= automoc4 kdehier kdeprefix kdelibs libkdcraw libkexiv2 libkipi -USE_QT4= qmake_build moc_build rcc_build uic_build -USE_LDCONFIG= yes -MAKE_JOBS_SAFE= yes +USE_KDE4+= libkdcraw libkexiv2 libkipi CMAKE_ARGS= -DCMAKE_PREFIX_PATH:PATH=${KDE4_PREFIX} -WRKSRC= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME} - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} diff --git a/graphics/kipi-plugins-kde4/distinfo b/graphics/kipi-plugins-kde4/distinfo deleted file mode 100644 index f52060d5d477..000000000000 --- a/graphics/kipi-plugins-kde4/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (digikam-2.7.0.tar.bz2) = 2782b0f047cd0ae58af04095e2d03ea4a9d621fbef9d385f1465851fb62f5bab -SIZE (digikam-2.7.0.tar.bz2) = 55696444 diff --git a/graphics/kipi-plugins-kde4/pkg-plist b/graphics/kipi-plugins-kde4/pkg-plist index 15624049a91b..26bdebb491d1 100644 --- a/graphics/kipi-plugins-kde4/pkg-plist +++ b/graphics/kipi-plugins-kde4/pkg-plist @@ -177,8 +177,15 @@ share/apps/kipiplugin_printimages/templates/templates.xml %%OPENCV%%share/apps/kipiplugin_removeredeyes/removeredeyes_classifier_eye_20_20.xml share/apps/photolayoutseditor/photolayoutseditorui.rc share/config.kcfg/PLEConfigSkeleton.kcfgc -share/doc/HTML/en/kipi-plugins/acquire-savetargetpreview.png -share/doc/HTML/en/kipi-plugins/acquire-screenshotpreview.png +share/doc/HTML/en/kipi-plugins/acquire-final-button.png +share/doc/HTML/en/kipi-plugins/acquire-main-window.png +share/doc/HTML/en/kipi-plugins/acquire-multiple-selections.png +share/doc/HTML/en/kipi-plugins/acquire-no-scanner-found.png +share/doc/HTML/en/kipi-plugins/acquire-other-options.png +share/doc/HTML/en/kipi-plugins/acquire-preview-button.png +share/doc/HTML/en/kipi-plugins/acquire-scanning.png +share/doc/HTML/en/kipi-plugins/acquire-zoom-in.png +share/doc/HTML/en/kipi-plugins/acquire-zoom-to-fit.png share/doc/HTML/en/kipi-plugins/acquireimages.docbook share/doc/HTML/en/kipi-plugins/colorimages.docbook share/doc/HTML/en/kipi-plugins/common @@ -679,14 +686,32 @@ share/kde4/servicetypes/photolayoutseditoreffectplugin.desktop %%NLS%%share/locale/eu/LC_MESSAGES/kipiplugin_smug.mo %%NLS%%share/locale/eu/LC_MESSAGES/kipiplugin_timeadjust.mo %%NLS%%share/locale/eu/LC_MESSAGES/kipiplugins.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_acquireimages.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_advancedslideshow.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_batchprocessimages.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_calendar.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_dngconverter.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_expoblending.mo %%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_facebook.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_flashexport.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_flickrexport.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_galleryexport.mo %%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_gpssync.mo %%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_htmlexport.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_imageviewer.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_ipodexport.mo %%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_jpeglossless.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_kioexportimport.mo %%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_metadataedit.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_picasawebexport.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_piwigoexport.mo %%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_printimages.mo %%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_rawconverter.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_removeredeyes.mo %%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_sendimages.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_shwup.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_smug.mo +%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_timeadjust.mo %%NLS%%share/locale/fi/LC_MESSAGES/kipiplugins.mo %%NLS%%share/locale/fr/LC_MESSAGES/kipiplugin_acquireimages.mo %%NLS%%share/locale/fr/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -807,6 +832,7 @@ share/kde4/servicetypes/photolayoutseditoreffectplugin.desktop %%NLS%%share/locale/hr/LC_MESSAGES/kipiplugin_timeadjust.mo %%NLS%%share/locale/hr/LC_MESSAGES/kipiplugins.mo %%NLS%%share/locale/hu/LC_MESSAGES/kipiplugin_facebook.mo +%%NLS%%share/locale/hu/LC_MESSAGES/kipiplugin_htmlexport.mo %%NLS%%share/locale/hu/LC_MESSAGES/kipiplugin_imageviewer.mo %%NLS%%share/locale/hu/LC_MESSAGES/kipiplugins.mo %%NLS%%share/locale/is/LC_MESSAGES/kipiplugin_acquireimages.mo @@ -1256,6 +1282,7 @@ share/kde4/servicetypes/photolayoutseditoreffectplugin.desktop %%NLS%%share/locale/sl/LC_MESSAGES/kipiplugin_advancedslideshow.mo %%NLS%%share/locale/sl/LC_MESSAGES/kipiplugin_calendar.mo %%NLS%%share/locale/sl/LC_MESSAGES/kipiplugin_dngconverter.mo +%%NLS%%share/locale/sl/LC_MESSAGES/kipiplugin_facebook.mo %%NLS%%share/locale/sl/LC_MESSAGES/kipiplugins.mo %%NLS%%share/locale/sq/LC_MESSAGES/kipiplugin_acquireimages.mo %%NLS%%share/locale/sq/LC_MESSAGES/kipiplugin_batchprocessimages.mo diff --git a/graphics/libkface/Makefile b/graphics/libkface/Makefile index 67542dcffdd1..1db8c43c97e2 100644 --- a/graphics/libkface/Makefile +++ b/graphics/libkface/Makefile @@ -6,27 +6,16 @@ # PORTNAME= libkface -PORTVERSION= 2.7.0 +PORTVERSION= ${DIGIKAM_VER} CATEGORIES= graphics kde -MASTER_SITES= SF/digikam/digikam/${PORTVERSION} -DISTNAME= digikam-${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE4 library for face recognition -LICENSE= GPLv2 +.include "${.CURDIR}/../digikam-kde4/Makefile.common" LIB_DEPENDS= opencv_legacy:${PORTSDIR}/graphics/opencv -USE_BZIP2= yes -USE_CMAKE= yes -USE_KDE4= automoc4 kdehier kdeprefix kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build -USE_LDCONFIG= yes -MAKE_JOBS_SAFE= yes - -WRKSRC= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME} - post-patch: ${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \ ${WRKSRC}/CMakeLists.txt diff --git a/graphics/libkface/distinfo b/graphics/libkface/distinfo deleted file mode 100644 index f52060d5d477..000000000000 --- a/graphics/libkface/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (digikam-2.7.0.tar.bz2) = 2782b0f047cd0ae58af04095e2d03ea4a9d621fbef9d385f1465851fb62f5bab -SIZE (digikam-2.7.0.tar.bz2) = 55696444 diff --git a/net/libkvkontakte/Makefile b/net/libkvkontakte/Makefile index 47d6a1ca9ab7..56b5957fa94c 100644 --- a/net/libkvkontakte/Makefile +++ b/net/libkvkontakte/Makefile @@ -6,25 +6,14 @@ # PORTNAME= libkvkontakte -PORTVERSION= 2.7.0 +PORTVERSION= ${DIGIKAM_VER} CATEGORIES= net kde -MASTER_SITES= SF/digikam/digikam/${PORTVERSION} -DISTNAME= digikam-${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE4 library for accessing vk.com -LICENSE= GPLv2 +.include "${.CURDIR}/../../graphics/digikam-kde4/Makefile.common" LIB_DEPENDS= qjson:${PORTSDIR}/devel/qjson -USE_BZIP2= yes -USE_CMAKE= yes -USE_KDE4= automoc4 kdehier kdeprefix kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build -USE_LDCONFIG= yes -MAKE_JOBS_SAFE= yes - -WRKSRC= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME} - .include <bsd.port.mk> diff --git a/net/libkvkontakte/distinfo b/net/libkvkontakte/distinfo deleted file mode 100644 index f52060d5d477..000000000000 --- a/net/libkvkontakte/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (digikam-2.7.0.tar.bz2) = 2782b0f047cd0ae58af04095e2d03ea4a9d621fbef9d385f1465851fb62f5bab -SIZE (digikam-2.7.0.tar.bz2) = 55696444 diff --git a/net/libmediawiki/Makefile b/net/libmediawiki/Makefile index 51c8aa4b8508..2a7d3f937de8 100644 --- a/net/libmediawiki/Makefile +++ b/net/libmediawiki/Makefile @@ -6,24 +6,13 @@ # PORTNAME= libmediawiki -PORTVERSION= 2.7.0 +PORTVERSION= ${DIGIKAM_VER} CATEGORIES= net kde -MASTER_SITES= SF/digikam/digikam/${PORTVERSION} -DISTNAME= digikam-${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE4 library for accessing MediaWiki sites -LICENSE= GPLv2 - -USE_BZIP2= yes -USE_CMAKE= yes -USE_KDE4= automoc4 kdehier kdeprefix kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build -USE_LDCONFIG= yes -MAKE_JOBS_SAFE= yes - -WRKSRC= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME} +.include "${.CURDIR}/../../graphics/digikam-kde4/Makefile.common" post-patch: ${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \ diff --git a/net/libmediawiki/distinfo b/net/libmediawiki/distinfo deleted file mode 100644 index f52060d5d477..000000000000 --- a/net/libmediawiki/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (digikam-2.7.0.tar.bz2) = 2782b0f047cd0ae58af04095e2d03ea4a9d621fbef9d385f1465851fb62f5bab -SIZE (digikam-2.7.0.tar.bz2) = 55696444 |