svn commit: r401798 - in head/x11-wm/pawm: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Nov 17 01:00:22 2015
New Revision: 401798
URL: https://svnweb.freebsd.org/changeset/ports/401798

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Switch to options helpers
  - Regenerate patches with `make makepatch`

Modified:
  head/x11-wm/pawm/Makefile
  head/x11-wm/pawm/files/patch-CMakeLists.txt
  head/x11-wm/pawm/files/patch-src__pashut.c
  head/x11-wm/pawm/files/patch-src__pawm.c

Modified: head/x11-wm/pawm/Makefile
==============================================================================
--- head/x11-wm/pawm/Makefile	Tue Nov 17 01:00:18 2015	(r401797)
+++ head/x11-wm/pawm/Makefile	Tue Nov 17 01:00:22 2015	(r401798)
@@ -10,7 +10,8 @@ MASTER_SITES=	http://www.pleyades.net/pa
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	The Puto Amo Window Manager
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # only
+LICENSE_FILE=	${WRKSRC}/GPL
 
 USE_XORG=	x11 xft xrandr xrender xpm
 USES=		cmake pkgconfig ninja tar:bzip2
@@ -21,14 +22,14 @@ LDFLAGS+=	-L${LOCALBASE}/lib -lXext -lXr
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	${REINPLACE_CMD} -e \
+	@${REINPLACE_CMD} -e \
 		'/"\/etc"/s|^|#| ; \
 		 /"-O2"/s|^|#| ; \
 		 /LINK_DIRECTORIES/s|\.|| ; \
 		 /INSTALL/s| /etc| etc|' ${WRKSRC}/CMakeLists.txt
 
-post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for ii in AUTHORS Changelog.old INSTALL README TODO
 	${INSTALL_DATA} ${WRKSRC}/${ii} ${STAGEDIR}${DOCSDIR}
 .endfor

Modified: head/x11-wm/pawm/files/patch-CMakeLists.txt
==============================================================================
--- head/x11-wm/pawm/files/patch-CMakeLists.txt	Tue Nov 17 01:00:18 2015	(r401797)
+++ head/x11-wm/pawm/files/patch-CMakeLists.txt	Tue Nov 17 01:00:22 2015	(r401798)
@@ -1,6 +1,6 @@
---- 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 @@
+--- CMakeLists.txt.orig	2010-05-03 02:36:18 UTC
++++ CMakeLists.txt
+@@ -39,6 +39,7 @@ IF (NOT XRANDR_FOUND)
  ENDIF (NOT XRANDR_FOUND)
  
  FIND_PACKAGE(Freetype REQUIRED)
@@ -8,7 +8,7 @@
  
  # FIXME: Check if CMAKE_CONFIG_PREFIX is being set ok
  SET(CMAKE_CONFIG_PREFIX "/etc")
-@@ -56,7 +57,7 @@
+@@ -56,7 +57,7 @@ ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "D
  	SET (CMAKE_C_FLAGS "-O2")
  ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
  

Modified: head/x11-wm/pawm/files/patch-src__pashut.c
==============================================================================
--- head/x11-wm/pawm/files/patch-src__pashut.c	Tue Nov 17 01:00:18 2015	(r401797)
+++ head/x11-wm/pawm/files/patch-src__pashut.c	Tue Nov 17 01:00:22 2015	(r401798)
@@ -1,6 +1,6 @@
---- src/pashut.c.orig	Sat Feb 25 00:55:09 2006
-+++ src/pashut.c	Sun Feb 26 03:15:23 2006
-@@ -24,6 +24,7 @@
+--- src/pashut.c.orig	2010-05-03 02:36:18 UTC
++++ src/pashut.c
+@@ -23,6 +23,7 @@
  #include "pabar.h"
  #include "pafont.h"
  #include "pashut.h"

Modified: head/x11-wm/pawm/files/patch-src__pawm.c
==============================================================================
--- head/x11-wm/pawm/files/patch-src__pawm.c	Tue Nov 17 01:00:18 2015	(r401797)
+++ head/x11-wm/pawm/files/patch-src__pawm.c	Tue Nov 17 01:00:22 2015	(r401798)
@@ -1,6 +1,6 @@
---- src/pawm.c.orig	2010-05-03 11:36:18.000000000 +0900
-+++ src/pawm.c	2010-09-22 01:27:38.000000000 +0900
-@@ -114,7 +114,7 @@
+--- src/pawm.c.orig	2010-05-03 02:36:18 UTC
++++ src/pawm.c
+@@ -114,7 +114,7 @@ static void get_pawm_conf() 
  
  int main (int argc, char *argv[]) 
  {