Date: Tue, 24 Dec 2013 21:06:11 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337384 - in head/x11-wm/pawm: . files Message-ID: <201312242106.rBOL6BPm072623@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Tue Dec 24 21:06:11 2013 New Revision: 337384 URL: http://svnweb.freebsd.org/changeset/ports/337384 Log: - Properly look for X11 using CMake and include the appropriate directories instead of relying on FREETYPE_INCLUDE_DIRS (which will change with the upcoming Freetype 2.5.2 update) to pass -I${LOCALBASE}/include to the compiler. - Support staging. - Set LICENSE (therefore stop installing the license file into DOCSDIR and bump PORTREVISION). - Remove the mysterious WITH_SN check, which was never a proper option and relied on some apparently unstable API (at least it was unstable at the time, almost 8 years ago). Added: head/x11-wm/pawm/files/patch-CMakeLists.txt (contents, props changed) Modified: head/x11-wm/pawm/Makefile head/x11-wm/pawm/pkg-plist Modified: head/x11-wm/pawm/Makefile ============================================================================== --- head/x11-wm/pawm/Makefile Tue Dec 24 20:50:05 2013 (r337383) +++ head/x11-wm/pawm/Makefile Tue Dec 24 21:06:11 2013 (r337384) @@ -3,12 +3,15 @@ PORTNAME= pawm PORTVERSION= 2.3.0 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://www.pleyades.net/pawm/files/ MAINTAINER= ports@FreeBSD.org COMMENT= The Puto Amo Window Manager +LICENSE= GPLv2 + USE_BZIP2= yes USE_XORG= x11 xft xrandr xrender xpm USES= cmake pkgconfig @@ -16,26 +19,19 @@ CMAKE_ARGS= -DCMAKE_CONFIG_PREFIX:STRING -DX11_LIBRARY_DIRS:STRING="${LOCALBASE}/lib" LDFLAGS+= -L${LOCALBASE}/lib -lXext -lXrender -.if defined(WITH_SN) -LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification -CFLAGS+= -DENABLE_STARTUP -DSN_API_NOT_YET_FROZEN \ - `pkg-config --cflags --libs libstartup-notification-1.0` -.endif +OPTIONS_DEFINE= DOCS -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e \ + ${REINPLACE_CMD} -e \ '/"\/etc"/s|^|#| ; \ /"-O2"/s|^|#| ; \ /LINK_DIRECTORIES/s|\.|| ; \ /INSTALL/s| /etc| etc|' ${WRKSRC}/CMakeLists.txt post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for ii in AUTHORS Changelog.old GPL INSTALL README TODO - ${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} +.for ii in AUTHORS Changelog.old INSTALL README TODO + ${INSTALL_DATA} ${WRKSRC}/${ii} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Added: head/x11-wm/pawm/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/pawm/files/patch-CMakeLists.txt Tue Dec 24 21:06:11 2013 (r337384) @@ -0,0 +1,19 @@ +--- CMakeLists.txt.orig 2013-12-24 22:52:47.000000000 +0200 ++++ CMakeLists.txt 2013-12-24 22:53:02.000000000 +0200 +@@ -39,6 +39,7 @@ + ENDIF (NOT XRANDR_FOUND) + + FIND_PACKAGE(Freetype REQUIRED) ++FIND_PACKAGE(X11 REQUIRED) + + # FIXME: Check if CMAKE_CONFIG_PREFIX is being set ok + SET(CMAKE_CONFIG_PREFIX "/etc") +@@ -56,7 +57,7 @@ + SET (CMAKE_C_FLAGS "-O2") + ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug") + +-INCLUDE_DIRECTORIES(. ${FREETYPE_INCLUDE_DIRS} ${X11_INCLUDE_DIRS}) ++INCLUDE_DIRECTORIES(. ${FREETYPE_INCLUDE_DIRS} ${X11_INCLUDE_DIR}) + LINK_DIRECTORIES (. ${X11_LIBRARY_DIRS}) + LINK_LIBRARIES (-lm ${X11_LIBRARIES} ${XFT_LIBRARIES} ${XPM_LIBRARIES} ${XRANDR_LIBRARIES}) + ADD_CUSTOM_TARGET(signals.c DEPENDS src/signals.h src/signals.c) Modified: head/x11-wm/pawm/pkg-plist ============================================================================== --- head/x11-wm/pawm/pkg-plist Tue Dec 24 20:50:05 2013 (r337383) +++ head/x11-wm/pawm/pkg-plist Tue Dec 24 21:06:11 2013 (r337384) @@ -2,7 +2,6 @@ bin/pawm etc/pawm.conf %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/Changelog.old -%%PORTDOCS%%%%DOCSDIR%%/GPL %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312242106.rBOL6BPm072623>