Date: Sat, 8 Mar 2014 16:20:03 GMT From: Olivier Duchateau <olivierd@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/187376: [UPDATE] x11/slim to 1.3.6 Message-ID: <201403081620.s28GK3lt042507@cgiserv.freebsd.org> Resent-Message-ID: <201403081630.s28GU0pP098368@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187376 >Category: ports >Synopsis: [UPDATE] x11/slim to 1.3.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Mar 08 16:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Olivier Duchateau >Release: >Organization: >Environment: >Description: - Update to 1.3.6 - Add support of DragonFly in CMakeLists.txt and merge post-patch target in CMakeLists.txt patch - Don't build locker, due to lack of VT_UNLOCKSWITCH in sys/consio.h - Adjust dependencies >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (révision 347514) +++ Makefile (copie de travail) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= slim -PORTVERSION= 1.3.5 -PORTREVISION= 3 +PORTVERSION= 1.3.6 CATEGORIES= x11 MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \ SF/slim.berlios @@ -19,19 +18,24 @@ libpng15.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libck-connector.so:${PORTSDIR}/sysutils/consolekit \ - libexpat.so:${PORTSDIR}/textproc/expat2 \ - libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt USES= cmake pkgconfig -USE_XORG= ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt +USE_XORG= ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrandr \ + xrender xt USE_RC_SUBR= slim SUB_FILES= pkg-message -CMAKE_ARGS= -DUSE_CONSOLEKIT=yes +CMAKE_ARGS= -DUSE_CONSOLEKIT=yes \ + -DBUILD_SLIMLOCK=no \ + -DBUILD_SHARED_LIBDS=yes OPTIONS_DEFINE= PAM OPTIONS_DEFAULT= PAM +PLIST_SUB+= VERSION="${PORTVERSION}" + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MPAM} @@ -46,12 +50,6 @@ @${CP} ${WRKSRC}/slim.conf ${WRKSRC}/slim.conf.sample @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/slim.conf.sample - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ - -e 's|/etc|${PREFIX}/etc|' \ - -e 's|share/man|man|' \ - -e 's|slim.conf|slim.conf.sample|' \ - -e '/systemd/d' \ - ${WRKSRC}/CMakeLists.txt post-install: . if ${PORT_OPTIONS:MPAM} Index: distinfo =================================================================== --- distinfo (révision 347514) +++ distinfo (copie de travail) @@ -1,2 +1,2 @@ -SHA256 (slim-1.3.5.tar.gz) = 818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629 -SIZE (slim-1.3.5.tar.gz) = 226413 +SHA256 (slim-1.3.6.tar.gz) = 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df +SIZE (slim-1.3.6.tar.gz) = 232547 Index: files/patch-CMakeLists.txt =================================================================== --- files/patch-CMakeLists.txt (révision 0) +++ files/patch-CMakeLists.txt (copie de travail) @@ -0,0 +1,87 @@ +--- ./CMakeLists.txt.orig 2013-10-01 22:38:05.000000000 +0000 ++++ ./CMakeLists.txt 2014-03-08 16:26:46.000000000 +0000 +@@ -14,6 +14,7 @@ + INCLUDE(CheckCCompilerFlag) + INCLUDE(CheckCXXCompilerFlag) + INCLUDE(CheckTypeSize) ++INCLUDE(GNUInstallDirs) + + # Version + set(SLIM_VERSION_MAJOR "1") +@@ -23,14 +24,23 @@ + + set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory") + set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim") +-set(SYSCONFDIR "/etc") +-set(LIBDIR "/lib") +-set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man") ++if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ++ ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" ++ ) ++ set(SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}") ++ set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") ++ set(MANDIR "${CMAKE_INSTALL_PREFIX}/man") ++else() ++ set(SYSCONFDIR "/etc") ++ set(LIBDIR "/lib") ++ set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man") ++endif() + + set(SLIM_DEFINITIONS) + if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR + ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" OR +- ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" ++ ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" OR ++ ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" + ) + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DNEEDS_BASENAME") + else() +@@ -70,8 +80,10 @@ + ) + if(USE_PAM) + set(common_srcs ${common_srcs} PAM.cpp) +- # for now, only build slimlock if we are using PAM. +- set(BUILD_SLIMLOCK 1) ++ # for now, only build slimlock if we are using PAM. ++ if(BUILD_SLIMLOCK) ++ set(BUILD_SLIMLOCK 1) ++ endif(BUILD_SLIMLOCK) + endif(USE_PAM) + + # Build common library +@@ -120,7 +132,9 @@ + message("\tPAM Found") + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM") + target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY}) +- target_link_libraries(slimlock ${PAM_LIBRARY}) ++ if(BUILD_SLIMLOCK) ++ target_link_libraries(slimlock ${PAM_LIBRARY}) ++ endif(BUILD_SLIMLOCK) + include_directories(${PAM_INCLUDE_DIR}) + else(PAM_FOUND) + message("\tPAM Not Found") +@@ -221,7 +235,9 @@ + ####### install + # slim + install(TARGETS slim RUNTIME DESTINATION bin) +-install(TARGETS slimlock RUNTIME DESTINATION bin) ++if(BUILD_SLIMLOCK) ++ install(TARGETS slimlock RUNTIME DESTINATION bin) ++endif(BUILD_SLIMLOCK) + + if (BUILD_SHARED_LIBS) + set_target_properties(libslim PROPERTIES +@@ -236,9 +252,11 @@ + + # man file + install(FILES slim.1 DESTINATION ${MANDIR}/man1/) +-install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/) ++if(BUILD_SLIMLOCK) ++ install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/) ++endif(BUILD_SLIMLOCK) + # configure +-install(FILES slim.conf DESTINATION ${SYSCONFDIR}) ++install(FILES slim.conf.sample DESTINATION ${SYSCONFDIR}) + # systemd service file + if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + install(FILES slim.service DESTINATION ${LIBDIR}/systemd/system) Index: pkg-plist =================================================================== --- pkg-plist (révision 347514) +++ pkg-plist (copie de travail) @@ -1,4 +1,6 @@ bin/slim +lib/libslim.so +lib/libslim.so.%%VERSION%% %%DATADIR%%/themes/default/background.jpg %%DATADIR%%/themes/default/panel.png %%DATADIR%%/themes/default/slim.theme >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403081620.s28GK3lt042507>