this compiles and works

This commit is contained in:
espie 2010-06-20 21:01:36 +00:00
parent 967fc9e071
commit 2c7ac1e1e8
5 changed files with 4350 additions and 11296 deletions

View File

@ -1,20 +1,22 @@
# $OpenBSD: Makefile,v 1.5 2010/04/15 14:34:12 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.6 2010/06/20 21:01:36 espie Exp $
COMMENT = K Desktop Environment, artwork COMMENT = K Desktop Environment, artwork
DISTNAME = kdeartwork-${VERSION} DISTNAME = kdeartwork-${VERSION}
PKGNAME = ${DISTNAME}p0 PKGNAME = ${DISTNAME}
LIB_DEPENDS += kdecore.>=8,kdeui,kde3support,kio,kparts,kfile,kpty,solid::x11/kde4/libs \ LIB_DEPENDS += kdecore.>=8,kdeui,kio,kparts::x11/kde4/libs \
kscreensaver::x11/kde4/base-workspace kscreensaver::x11/kde4/base-workspace
BUILD_DEPENDS= ::x11/xscreensaver BUILD_DEPENDS+= ::x11/xscreensaver \
::x11/kde4/automoc
WANTLIB += GL GLU ICE SM X11 Xau Xcursor Xdmcp Xext Xft Xi Xinerama WANTLIB += GL GLU ICE SM X11 Xau Xdmcp Xext Xft
WANTLIB += Xpm Xrandr Xrender Xtst c fontconfig freetype m png WANTLIB += Xpm c m
WANTLIB += pthread stdc++ util z WANTLIB += pthread stdc++
WANTLIB += Qt3Support QtDBus QtGui QtSvg QtXml QtOpenGL QtNetwork WANTLIB += QtDBus QtGui QtSvg QtXml QtOpenGL QtNetwork
WANTLIB += bz2 Xt WANTLIB += Xt
WANTLIB += Xfixes fam glib-2.0 gthread-2.0 iconv intl streamanalyzer
WANTLIB += streams
CONFIGURE_ARGS += -DXSCREENSAVER_FOUND:BOOL=TRUE
CONFIGURE_ARGS += -DXSCREENSAVER_DIR:STRING=${LOCALBASE}/libexec/xscreensaver
CONFIGURE_ARGS += -DXSCREENSAVER_CONFIG_DIR:STRING=${LOCALBASE}/share/xscreensaver/config
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (kde/kdeartwork-4.0.1.tar.bz2) = DlRwlPEujXdI8SrQvlSw8g== MD5 (kde/kdeartwork-4.4.4.tar.bz2) = rUBHaFt21JcFiCwj0esasA==
RMD160 (kde/kdeartwork-4.0.1.tar.bz2) = UntgdNkrwZUlxKuC8Hllj802/Vs= RMD160 (kde/kdeartwork-4.4.4.tar.bz2) = 8C2VgmdHXJR1CORrzhs8aiD0zeE=
SHA1 (kde/kdeartwork-4.0.1.tar.bz2) = Opl14T4jnbp+lFBvvdF3W4Uecwo= SHA1 (kde/kdeartwork-4.4.4.tar.bz2) = eg3ZEKl6G8nlqY9NgxBPKH9FNNU=
SHA256 (kde/kdeartwork-4.0.1.tar.bz2) = 3LWWZYhS2ZGp88x80Wp/zuKYaA/NQP/Y4EYJQ2EtSBU= SHA256 (kde/kdeartwork-4.4.4.tar.bz2) = 259aphmJUjV4EaWgSvnh7PeeHndLOcEt/Z2f49QExd4=
SIZE (kde/kdeartwork-4.0.1.tar.bz2) = 42283420 SIZE (kde/kdeartwork-4.4.4.tar.bz2) = 72535835

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-cmake_modules_FindXscreensaver_cmake,v 1.2 2008/01/29 00:26:25 espie Exp $
--- cmake/modules/FindXscreensaver.cmake.orig Sat Jan 5 01:00:42 2008
+++ cmake/modules/FindXscreensaver.cmake Sun Jan 20 12:39:11 2008
@@ -114,9 +114,17 @@ endif(XSCREENSAVER_DIR)
endif(NOT XSCREENSAVER_DIR)
+if(NOT XSCREENSAVER_DIR)
+FIND_PATH(XSCREENSAVER_DIR xscreensaver
+ /usr/local/libexec
+)
+if( XSCREENSAVER_DIR)
+ set(XSCREENSAVER_DIR ${XSCREENSAVER_DIR}/xscreensaver/)
+endif(XSCREENSAVER_DIR)
+endif(NOT XSCREENSAVER_DIR)
set(XSCREENSAVER_CONFIG_DIR)
-FIND_PATH(XSCREENSAVER_CONFIG_DIR config/deco.xml
+FIND_PATH(XSCREENSAVER_CONFIG_DIR config/xdeco.xml
${KDE4_INCLUDE_DIR}
/usr/
/usr/local/
@@ -128,6 +136,7 @@ FIND_PATH(XSCREENSAVER_CONFIG_DIR config/deco.xml
/usr/share/xscreensaver/
/usr/local/kde/
/usr/local/xscreensaver/
+ /usr/local/share/xscreensaver/
/usr/openwin/lib/xscreensaver/
/etc/
)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-kscreensaver_kxsconfig_CMakeLists_txt,v 1.1 2008/02/09 13:18:16 espie Exp $ $OpenBSD: patch-kscreensaver_kxsconfig_CMakeLists_txt,v 1.2 2010/06/20 21:01:36 espie Exp $
--- kscreensaver/kxsconfig/CMakeLists.txt.orig Mon Jan 28 12:16:09 2008 --- kscreensaver/kxsconfig/CMakeLists.txt.orig Fri Dec 11 00:15:09 2009
+++ kscreensaver/kxsconfig/CMakeLists.txt Mon Jan 28 12:16:39 2008 +++ kscreensaver/kxsconfig/CMakeLists.txt Sun Jun 20 22:33:58 2010
@@ -41,12 +41,12 @@ foreach(_currentdesktopfile ${_desktopfiles}) @@ -40,10 +40,10 @@ foreach(_currentdesktopfile ${_desktopfiles})
GET_FILENAME_COMPONENT(_screensaverName ${_newitem} NAME_WE) GET_FILENAME_COMPONENT(_screensaverName ${_newitem} NAME_WE)
#MESSAGE(STATUS "name without extension <${_screensaverName}>") #MESSAGE(STATUS "name without extension <${_screensaverName}>")
find_file(XSCREENSAVER_FILE_FOUND ${_screensaverName}.xml PATHS ${XSCREENSAVER_CONFIG_DIR} ) find_file(XSCREENSAVER_FILE_FOUND ${_screensaverName}.xml PATHS ${XSCREENSAVER_CONFIG_DIR} )
@ -17,5 +17,3 @@ $OpenBSD: patch-kscreensaver_kxsconfig_CMakeLists_txt,v 1.1 2008/02/09 13:18:16
+# MESSAGE(STATUS "xscreensaver name ${_screensaverName} not found") +# MESSAGE(STATUS "xscreensaver name ${_screensaverName} not found")
+# endif(XSCREENSAVER_FILE_FOUND) +# endif(XSCREENSAVER_FILE_FOUND)
endforeach(_currentdesktopfile ${_desktopfiles}) endforeach(_currentdesktopfile ${_desktopfiles})

File diff suppressed because it is too large Load Diff