- Update to digiKam and Kipi Plugins ports to 3.1.0

- Split documentations and l10ns to separate ports
- Split kipi-plugins-kde4 port

Approved by:	portmgr (miwi)

3 files changed, 4 insertions, 66 deletions

diff --git a/astro/libkgeomap/Makefile b/astro/libkgeomap/Makefile
index ae9f2f5fa286..cdb7fe2d6c6e 100644
--- a/astro/libkgeomap/Makefile
+++ b/astro/libkgeomap/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for:	libkgeomap
-# Date created:				2012-05-12
-# Whom:					Jason E. Hale <bsdkaffee@gmail.com>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libkgeomap
 PORTVERSION=	${DIGIKAM_VER}
-PORTREVISION=	2
 CATEGORIES=	astro kde
 
 MAINTAINER=	kde@FreeBSD.org
@@ -16,21 +10,10 @@ COMMENT=	KDE4 library for browsing photos on a map
 .include "${.CURDIR}/../../graphics/digikam-kde4/Makefile.common"
 
 USE_KDE4+=	libkexiv2 marble
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CMAKE_ARGS+=	-DWITH_NLS:BOOL=OFF
-PLIST_SUB+=	NLS="@comment "
-.endif
+USE_LDCONFIG=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
 		${WRKSRC}/CMakeLists.txt
-	${LN} -s ../../po ${WRKSRC}/po
-	${RM} ${WRKSRC}/po/*/digikam.po ${WRKSRC}/po/*/kipi*
 
 .include <bsd.port.mk>
diff --git a/astro/libkgeomap/files/patch-CMakeLists.txt b/astro/libkgeomap/files/patch-CMakeLists.txt
index 6477b530df69..a86a098b2514 100644
--- a/astro/libkgeomap/files/patch-CMakeLists.txt
+++ b/astro/libkgeomap/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- ./CMakeLists.txt.orig	2012-06-08 00:20:53.000000000 -0400
-+++ ./CMakeLists.txt	2012-06-08 00:23:05.000000000 -0400
-@@ -94,15 +94,22 @@
+--- ./CMakeLists.txt.orig	2013-03-11 08:24:22.000000000 +0000
++++ ./CMakeLists.txt	2013-03-27 12:48:34.236663211 +0000
+@@ -94,9 +94,9 @@
  
  SUBDIRS(libkgeomap)
  SUBDIRS(test)
@@ -12,16 +12,3 @@
      MESSAGE(STATUS "kexiv2 found, the demo application will be compiled.")
  ELSE(KEXIV2_FOUND)
      MESSAGE(STATUS "kexiv2 NOT found, the demo application will NOT be compiled.")
- ENDIF(KEXIV2_FOUND)
- SUBDIRS(data)
- 
-+OPTION(WITH_NLS "NLS Support" ON)
-+IF(WITH_NLS)
-+    FIND_PACKAGE(Msgfmt REQUIRED)
-+    FIND_PACKAGE(Gettext REQUIRED)
-+    ADD_SUBDIRECTORY(po)
-+ENDIF(WITH_NLS)
-+
- IF(NOT WIN32)
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkgeomap.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc)
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkgeomap.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.lsm)
diff --git a/astro/libkgeomap/pkg-plist b/astro/libkgeomap/pkg-plist
index 6c4a0eee90fc..8dde1b93636b 100644
--- a/astro/libkgeomap/pkg-plist
+++ b/astro/libkgeomap/pkg-plist
@@ -51,37 +51,5 @@ share/apps/libkgeomap/marker-ffff00-selected.png
 share/apps/libkgeomap/marker-ffff00-someselected.png
 share/apps/libkgeomap/marker-ffff00.png
 share/apps/libkgeomap/marker-icon-16x16.png
-%%NLS%%share/locale/bg/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/bs/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/da/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/el/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/et/LC_MESSAGES/libkgeomap.mo
-%%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
-%%NLS%%share/locale/km/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libkgeomap.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/libkgeomap.mo
 @dirrm share/apps/libkgeomap
 @dirrm include/libkgeomap