[csw-devel] SF.net SVN: gar:[20911] csw/mgar/pkg/podofo/trunk

[pfelecan at users.sourceforge.net]

Revision: 20911
          http://gar.svn.sourceforge.net/gar/?rev=20911&view=rev
Author:   pfelecan
Date:     2013-04-30 12:56:40 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
podofo/trunk: mainly fixing stinking CMake stuff

Modified Paths:
--------------
    csw/mgar/pkg/podofo/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/podofo/trunk/files/0002-Build-with-install-RPATH.patch

Modified: csw/mgar/pkg/podofo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/podofo/trunk/Makefile	2013-04-30 12:01:37 UTC (rev 20910)
+++ csw/mgar/pkg/podofo/trunk/Makefile	2013-04-30 12:56:40 UTC (rev 20911)
@@ -19,6 +19,7 @@
 MASTER_SITES	=	$(SF_MIRRORS)
 DISTFILES		=	$(DISTNAME).tar.gz
 PATCHFILES		+=	0001-replace-deprecated-LUA-API-calls.patch
+PATCHFILES		+=	0002-Build-with-install-RPATH.patch
 
 BUILD_DEP_PKGS	+=	CSWcmake
 BUILD_DEP_PKGS	+=	CSWlua-dev
@@ -29,45 +30,23 @@
 
 # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide
 CMAKE_ARGS	+=	-DCMAKE_INSTALL_PREFIX=$(prefix)
-CMAKE_ARGS	+=	-DINSTALL_LAYOUT=RPM
-CMAKE_ARGS	+=	-DMYSQL_DATADIR=$(localstatedir)
-CMAKE_ARGS	+=	-DSYSCONFDIR=$(sysconfdir)
-CMAKE_ARGS	+=	-DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir))
-CMAKE_ARGS	+=	-DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir))
-# CMAKE_ARGS	+=	-DINSTALL_MANDIR=$(subst $(prefix)/,,$(mandir))
-CMAKE_ARGS	+=	-DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir))
-CMAKE_ARGS	+=	-DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/plugin
-CMAKE_ARGS	+=	-DWITH_READLINE=1
-CMAKE_ARGS	+=	-DWITH_LIBWRAP=1
-CMAKE_ARGS	+=	-DWITH_SSL=system
-CMAKE_ARGS	+=	-DWITH_ZLIB=system
-CMAKE_ARGS	+=	-DDEFAULT_CHARSET=utf8
-CMAKE_ARGS	+=	-DDEFAULT_COLLATION=utf8_general_ci
-CMAKE_ARGS	+=	-DWITH_COMMENT='OpenCSW'
 CMAKE_ARGS	+=	-DCMAKE_C_FLAGS="$(CFLAGS)"
 CMAKE_ARGS	+=	-DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
-CMAKE_ARGS	+=	-DBUILD_CONFIG=mysql_release
-# CMAKE_ARGS	+=	-DOPENSSL_INCLUDE_DIR="$(includedir)"
-# CMAKE_ARGS	+=	-DCMAKE_LIBRARY_PATH="$(libdir)"
-# CMAKE_ARGS	+=	-DCMAKE_PREFIX_PATH="$(prefix)"
-CMAKE_ARGS	+=	-DOPENSSL_ROOT_DIR=$(prefix)
-# CMAKE_ARGS	+=	-DOPENSSL_SSL_LIBRARIES=$(libdir)/libssl.so
-# CMAKE_ARGS	+=	-DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/libcrypto.so
 CMAKE_ARGS	+=	-DCMAKE_INCLUDE_PATH="$(includedir)"
 CMAKE_ARGS	+=	-DCMAKE_LIBRARY_PATH="$(libdir)"
 CMAKE_ARGS	+=	"-DCMAKE_C_FLAGS=$(CFLAGS)"
 CMAKE_ARGS	+=	"-DCMAKE_CXX_FLAGS=$(CXXFLAGS)"
 CMAKE_ARGS	+=	-DCMAKE_VERBOSE_MAKEFILE=ON
-CMAKE_ARGS	+=	-DWITH_DEBUG=1
 CMAKE_ARGS	+=	-DPODOFO_BUILD_SHARED:BOOL=TRUE
 CMAKE_ARGS	+=	-DPODOFO_BUILD_STATIC:BOOL=FALSE
 
 TEST_SCRIPTS	=	custom
 
-PACKAGES							+=	CSWlibpodofo-utils
-CATALOGNAME_CSWlibpodofo-utils		=	libpodofo_utils
-SPKG_DESC_CSWlibpodofo-utils		+=	$(DESCRIPTION), utilities
-RUNTIME_DEP_PKGS_CSWlibpodofo-utils	+=	CSWlibpodofo0-9-1
+PACKAGES								+=	CSWlibpodofo-utils
+CATALOGNAME_CSWlibpodofo-utils			=	libpodofo_utils
+SPKG_DESC_CSWlibpodofo-utils			+=	$(DESCRIPTION), utilities
+RUNTIME_DEP_PKGS_CSWlibpodofo-utils		+=	CSWlibpodofo0-9-1
+CHECKPKG_OVERRIDES_CSWlibpodofo-utils	+=	surplus-dependency|CSWlibpodofo0-9-1
 
 PACKAGES						+=	CSWlibpodofo0-9-1
 CATALOGNAME_CSWlibpodofo0-9-1	=	libpodofo0_9_1
@@ -82,6 +61,7 @@
 PKGFILES_CSWlibpodofo-dev			+=	$(PKGFILES_DEVEL)
 ARCHALL_CSWlibpodofo-dev			=	1
 RUNTIME_DEP_PKGS_CSWlibpodofo-dev	+=	CSWlibpodofo0-9-1
+CHECKPKG_OVERRIDES_CSWlibpodofo-dev	+=	archall-devel-package
 
 include gar/category.mk
 

Added: csw/mgar/pkg/podofo/trunk/files/0002-Build-with-install-RPATH.patch
===================================================================
--- csw/mgar/pkg/podofo/trunk/files/0002-Build-with-install-RPATH.patch	                        (rev 0)
+++ csw/mgar/pkg/podofo/trunk/files/0002-Build-with-install-RPATH.patch	2013-04-30 12:56:40 UTC (rev 20911)
@@ -0,0 +1,26 @@
+From fda67cd864474853d20278c46c36fa1d8b7ef217 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 30 Apr 2013 14:41:55 +0200
+Subject: [PATCH] Build with install RPATH
+
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b55b28d..cdd58e9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -245,6 +245,9 @@ ELSE(UNIX)
+         "True if PoDoFo should be built with fontconfig support")
+ ENDIF(UNIX)
+ 
++# Don't strip runpath as it breaks the binaries that need libraries in
++# /opt/csw/lib.
++set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ 
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+     MESSAGE("Using gcc specific compiler options")
+-- 
+1.8.1.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.