From owner-svn-ports-head@FreeBSD.ORG Sun May 12 13:06:44 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BD7CF7B3; Sun, 12 May 2013 13:06:44 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AEF0EAB9; Sun, 12 May 2013 13:06:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CD6ipb007070; Sun, 12 May 2013 13:06:44 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CD6il0007068; Sun, 12 May 2013 13:06:44 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201305121306.r4CD6il0007068@svn.freebsd.org> From: Max Brazhnikov Date: Sun, 12 May 2013 13:06:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317956 - head/graphics/digikam-kde4-l10n X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 13:06:44 -0000 Author: makc Date: Sun May 12 13:06:43 2013 New Revision: 317956 URL: http://svnweb.freebsd.org/changeset/ports/317956 Log: - Don't install libkipi l10n files, they are provided by kde4-l10n ports [1] - gettext is required during build, change dependence type to build only Reported by: Wolfgang Riegler via kde-freebsd maillist [1] Modified: head/graphics/digikam-kde4-l10n/Makefile head/graphics/digikam-kde4-l10n/pkg-plist Modified: head/graphics/digikam-kde4-l10n/Makefile ============================================================================== --- head/graphics/digikam-kde4-l10n/Makefile Sun May 12 13:00:07 2013 (r317955) +++ head/graphics/digikam-kde4-l10n/Makefile Sun May 12 13:06:43 2013 (r317956) @@ -2,6 +2,7 @@ PORTNAME= digikam-l10n PORTVERSION= ${DIGIKAM_VER} +PORTREVISION= 1 CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org @@ -10,8 +11,12 @@ COMMENT= l10n for digiKam, showFoto, and LATEST_LINK= digikam-kde4-l10n CONFLICTS_INSTALL= digikam-2.* kipi-plugins-2.* libkgeomap-2.* -USES= gettext +USES= gettext:build WRKSRC= ${WRKDIR}/${DISTNAME}/po +pre-configure: +# avoid conflicts with kde4-l10n ports: + ${RM} ${WRKSRC}/*/libkipi.po + .include "${.CURDIR}/../digikam-kde4/Makefile.common" .include Modified: head/graphics/digikam-kde4-l10n/pkg-plist ============================================================================== --- head/graphics/digikam-kde4-l10n/pkg-plist Sun May 12 13:00:07 2013 (r317955) +++ head/graphics/digikam-kde4-l10n/pkg-plist Sun May 12 13:06:43 2013 (r317956) @@ -44,7 +44,6 @@ share/locale/bs/LC_MESSAGES/kipiplugin_s share/locale/bs/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/bs/LC_MESSAGES/kipiplugins.mo share/locale/bs/LC_MESSAGES/libkgeomap.mo -share/locale/bs/LC_MESSAGES/libkipi.mo share/locale/ca/LC_MESSAGES/digikam.mo share/locale/ca/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/ca/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -74,7 +73,6 @@ share/locale/ca/LC_MESSAGES/kipiplugin_s share/locale/ca/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/ca/LC_MESSAGES/kipiplugins.mo share/locale/ca/LC_MESSAGES/libkgeomap.mo -share/locale/ca/LC_MESSAGES/libkipi.mo share/locale/cs/LC_MESSAGES/digikam.mo share/locale/cs/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/cs/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -104,7 +102,6 @@ share/locale/cs/LC_MESSAGES/kipiplugin_s share/locale/cs/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/cs/LC_MESSAGES/kipiplugins.mo share/locale/cs/LC_MESSAGES/libkgeomap.mo -share/locale/cs/LC_MESSAGES/libkipi.mo share/locale/da/LC_MESSAGES/digikam.mo share/locale/da/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/da/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -134,7 +131,6 @@ share/locale/da/LC_MESSAGES/kipiplugin_s share/locale/da/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/da/LC_MESSAGES/kipiplugins.mo share/locale/da/LC_MESSAGES/libkgeomap.mo -share/locale/da/LC_MESSAGES/libkipi.mo share/locale/de/LC_MESSAGES/digikam.mo share/locale/de/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/de/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -164,7 +160,6 @@ share/locale/de/LC_MESSAGES/kipiplugin_s share/locale/de/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/de/LC_MESSAGES/kipiplugins.mo share/locale/de/LC_MESSAGES/libkgeomap.mo -share/locale/de/LC_MESSAGES/libkipi.mo share/locale/el/LC_MESSAGES/digikam.mo share/locale/el/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/el/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -194,7 +189,6 @@ share/locale/el/LC_MESSAGES/kipiplugin_s share/locale/el/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/el/LC_MESSAGES/kipiplugins.mo share/locale/el/LC_MESSAGES/libkgeomap.mo -share/locale/el/LC_MESSAGES/libkipi.mo share/locale/en_GB/LC_MESSAGES/digikam.mo share/locale/en_GB/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/en_GB/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -281,7 +275,6 @@ share/locale/es/LC_MESSAGES/kipiplugin_s share/locale/es/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/es/LC_MESSAGES/kipiplugins.mo share/locale/es/LC_MESSAGES/libkgeomap.mo -share/locale/es/LC_MESSAGES/libkipi.mo share/locale/et/LC_MESSAGES/digikam.mo share/locale/et/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/et/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -311,7 +304,6 @@ share/locale/et/LC_MESSAGES/kipiplugin_s share/locale/et/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/et/LC_MESSAGES/kipiplugins.mo share/locale/et/LC_MESSAGES/libkgeomap.mo -share/locale/et/LC_MESSAGES/libkipi.mo share/locale/eu/LC_MESSAGES/digikam.mo share/locale/eu/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/eu/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -367,7 +359,6 @@ share/locale/fi/LC_MESSAGES/kipiplugin_s share/locale/fi/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/fi/LC_MESSAGES/kipiplugins.mo share/locale/fi/LC_MESSAGES/libkgeomap.mo -share/locale/fi/LC_MESSAGES/libkipi.mo share/locale/fr/LC_MESSAGES/digikam.mo share/locale/fr/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/fr/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -426,7 +417,6 @@ share/locale/ga/LC_MESSAGES/kipiplugin_s share/locale/ga/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/ga/LC_MESSAGES/kipiplugins.mo share/locale/ga/LC_MESSAGES/libkgeomap.mo -share/locale/ga/LC_MESSAGES/libkipi.mo share/locale/gl/LC_MESSAGES/digikam.mo share/locale/gl/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/gl/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -456,7 +446,6 @@ share/locale/gl/LC_MESSAGES/kipiplugin_s share/locale/gl/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/gl/LC_MESSAGES/kipiplugins.mo share/locale/gl/LC_MESSAGES/libkgeomap.mo -share/locale/gl/LC_MESSAGES/libkipi.mo share/locale/he/LC_MESSAGES/digikam.mo share/locale/he/LC_MESSAGES/kipiplugin_calendar.mo share/locale/hi/LC_MESSAGES/digikam.mo @@ -511,7 +500,6 @@ share/locale/hu/LC_MESSAGES/kipiplugin_k share/locale/hu/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/hu/LC_MESSAGES/kipiplugins.mo share/locale/hu/LC_MESSAGES/libkgeomap.mo -share/locale/hu/LC_MESSAGES/libkipi.mo share/locale/is/LC_MESSAGES/digikam.mo share/locale/is/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/is/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -598,7 +586,6 @@ share/locale/ja/LC_MESSAGES/kipiplugin_s share/locale/ja/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/ja/LC_MESSAGES/kipiplugins.mo share/locale/ja/LC_MESSAGES/libkgeomap.mo -share/locale/kk/LC_MESSAGES/libkipi.mo share/locale/km/LC_MESSAGES/digikam.mo share/locale/km/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/km/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -635,7 +622,6 @@ share/locale/ko/LC_MESSAGES/kipiplugin_j share/locale/ko/LC_MESSAGES/kipiplugin_metadataedit.mo share/locale/ko/LC_MESSAGES/kipiplugin_rawconverter.mo share/locale/ko/LC_MESSAGES/kipiplugin_sendimages.mo -share/locale/ko/LC_MESSAGES/libkipi.mo share/locale/lt/LC_MESSAGES/digikam.mo share/locale/lt/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/lt/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -665,7 +651,6 @@ share/locale/lt/LC_MESSAGES/kipiplugin_s share/locale/lt/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/lt/LC_MESSAGES/kipiplugins.mo share/locale/lt/LC_MESSAGES/libkgeomap.mo -share/locale/lt/LC_MESSAGES/libkipi.mo share/locale/lv/LC_MESSAGES/digikam.mo share/locale/lv/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/lv/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -708,7 +693,6 @@ share/locale/nb/LC_MESSAGES/kipiplugin_s share/locale/nb/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/nb/LC_MESSAGES/kipiplugins.mo share/locale/nb/LC_MESSAGES/libkgeomap.mo -share/locale/nb/LC_MESSAGES/libkipi.mo share/locale/nds/LC_MESSAGES/digikam.mo share/locale/nds/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/nds/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -768,7 +752,6 @@ share/locale/nl/LC_MESSAGES/kipiplugin_s share/locale/nl/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/nl/LC_MESSAGES/kipiplugins.mo share/locale/nl/LC_MESSAGES/libkgeomap.mo -share/locale/nl/LC_MESSAGES/libkipi.mo share/locale/nn/LC_MESSAGES/digikam.mo share/locale/nn/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/nn/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -848,7 +831,6 @@ share/locale/pl/LC_MESSAGES/kipiplugin_s share/locale/pl/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/pl/LC_MESSAGES/kipiplugins.mo share/locale/pl/LC_MESSAGES/libkgeomap.mo -share/locale/pl/LC_MESSAGES/libkipi.mo share/locale/pt/LC_MESSAGES/digikam.mo share/locale/pt/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/pt/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -878,7 +860,6 @@ share/locale/pt/LC_MESSAGES/kipiplugin_s share/locale/pt/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/pt/LC_MESSAGES/kipiplugins.mo share/locale/pt/LC_MESSAGES/libkgeomap.mo -share/locale/pt/LC_MESSAGES/libkipi.mo share/locale/pt_BR/LC_MESSAGES/digikam.mo share/locale/pt_BR/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/pt_BR/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -908,7 +889,6 @@ share/locale/pt_BR/LC_MESSAGES/kipiplugi share/locale/pt_BR/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/pt_BR/LC_MESSAGES/kipiplugins.mo share/locale/pt_BR/LC_MESSAGES/libkgeomap.mo -share/locale/pt_BR/LC_MESSAGES/libkipi.mo share/locale/ro/LC_MESSAGES/digikam.mo share/locale/ro/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/ro/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -937,7 +917,6 @@ share/locale/ro/LC_MESSAGES/kipiplugin_s share/locale/ro/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/ro/LC_MESSAGES/kipiplugins.mo share/locale/ro/LC_MESSAGES/libkgeomap.mo -share/locale/ro/LC_MESSAGES/libkipi.mo share/locale/ru/LC_MESSAGES/digikam.mo share/locale/ru/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/ru/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -999,7 +978,6 @@ share/locale/sk/LC_MESSAGES/kipiplugin_s share/locale/sk/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/sk/LC_MESSAGES/kipiplugins.mo share/locale/sk/LC_MESSAGES/libkgeomap.mo -share/locale/sk/LC_MESSAGES/libkipi.mo share/locale/sl/LC_MESSAGES/digikam.mo share/locale/sl/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/sl/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -1027,7 +1005,6 @@ share/locale/sl/LC_MESSAGES/kipiplugin_s share/locale/sl/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/sl/LC_MESSAGES/kipiplugins.mo share/locale/sl/LC_MESSAGES/libkgeomap.mo -share/locale/sl/LC_MESSAGES/libkipi.mo share/locale/sq/LC_MESSAGES/digikam.mo share/locale/sq/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/sq/LC_MESSAGES/kipiplugin_batchprocessimages.mo @@ -1075,7 +1052,6 @@ share/locale/sv/LC_MESSAGES/kipiplugin_s share/locale/sv/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/sv/LC_MESSAGES/kipiplugins.mo share/locale/sv/LC_MESSAGES/libkgeomap.mo -share/locale/sv/LC_MESSAGES/libkipi.mo share/locale/th/LC_MESSAGES/digikam.mo share/locale/th/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/th/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -1162,7 +1138,6 @@ share/locale/uk/LC_MESSAGES/kipiplugin_s share/locale/uk/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/uk/LC_MESSAGES/kipiplugins.mo share/locale/uk/LC_MESSAGES/libkgeomap.mo -share/locale/uk/LC_MESSAGES/libkipi.mo share/locale/vi/LC_MESSAGES/digikam.mo share/locale/zh_CN/LC_MESSAGES/digikam.mo share/locale/zh_CN/LC_MESSAGES/kipiplugin_acquireimages.mo @@ -1193,7 +1168,6 @@ share/locale/zh_CN/LC_MESSAGES/kipiplugi share/locale/zh_CN/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/zh_CN/LC_MESSAGES/kipiplugins.mo share/locale/zh_CN/LC_MESSAGES/libkgeomap.mo -share/locale/zh_CN/LC_MESSAGES/libkipi.mo share/locale/zh_TW/LC_MESSAGES/digikam.mo share/locale/zh_TW/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/zh_TW/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -1223,4 +1197,3 @@ share/locale/zh_TW/LC_MESSAGES/kipiplugi share/locale/zh_TW/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/zh_TW/LC_MESSAGES/kipiplugins.mo share/locale/zh_TW/LC_MESSAGES/libkgeomap.mo -share/locale/zh_TW/LC_MESSAGES/libkipi.mo