6 files changed, 26 insertions, 21 deletions

diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index b7a47e5d08fe..7caa91c7861f 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -11,29 +11,36 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 window manager selector
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
 USES=		gmake
 USE_XORG=	x11 xext
 USE_GL=		gl
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 OPTIONS_DEFINE=	ADDONS DOCS EXAMPLES
 OPTIONS_DEFAULT=ADDONS
-ADDONS_DESC=	Install the helper scripts and manpages
 OPTIONS_SUB=	yes
 
-ADDONS_RUNDEPENDS=	wmanager-loop:x11-wm/wmanager-addons
+ADDONS_DESC=		Install the helper scripts and manpages
+ADDONS_RUN_DEPENDS=	wmanager-loop:x11-wm/wmanager-addons
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in FAQ HISTORY INSTALL NEWS README TODO
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/.wmanagerrc ${STAGEDIR}${EXAMPLESDIR}/wmanagerrc_sample
 	${INSTALL_DATA} ${WRKSRC}/.xinitrc ${STAGEDIR}${EXAMPLESDIR}/xinitrc_sample
diff --git a/x11-wm/wmanager/distinfo b/x11-wm/wmanager/distinfo
index 329afd388ebe..ee2321b613e7 100644
--- a/x11-wm/wmanager/distinfo
+++ b/x11-wm/wmanager/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1476707858
 SHA256 (wmanager_0.2.1.orig.tar.gz) = 7974aa6bb15e4c0e8dcac42055a865e6151b920cd6aa2658ffa70ce33edf446c
 SIZE (wmanager_0.2.1.orig.tar.gz) = 25734
diff --git a/x11-wm/wmanager/files/patch-Makefile b/x11-wm/wmanager/files/patch-Makefile
index 57d9551936ca..2c5c86c0395e 100644
--- a/x11-wm/wmanager/files/patch-Makefile
+++ b/x11-wm/wmanager/files/patch-Makefile
@@ -1,6 +1,5 @@
-diff -urN -urN -x .svn ../vendor/wmanager/Makefile ./Makefile
---- ../vendor/wmanager/Makefile	2007-12-11 12:42:04.000000000 +0200
-+++ ./Makefile	2008-05-21 18:21:47.000000000 +0300
+--- Makefile.orig	1999-11-14 15:29:24 UTC
++++ Makefile
 @@ -28,39 +28,39 @@
  # make settings
  SHELL     = /bin/sh
@@ -61,7 +60,7 @@ diff -urN -urN -x .svn ../vendor/wmanager/Makefile ./Makefile
  # documentational files for developer
  docdir    = ./doc
  templates = $(docdir)/templates
-@@ -82,8 +82,7 @@
+@@ -82,8 +82,7 @@ OBJ  = $(patsubst %.cc,%.o,$(SRC)) 
  # project version
  VERSION = 0.1.1
  
@@ -71,7 +70,7 @@ diff -urN -urN -x .svn ../vendor/wmanager/Makefile ./Makefile
  
  wmanager: $(OBJ)
  	$(LD) -o $@ $^ $(LDDIRS) $(LDFLAGS) 
-@@ -92,7 +91,7 @@
+@@ -92,7 +91,7 @@ static: $(OBJ)
  	$(LD) -o wmanager $^ $(LDDIRS) $(LDFLAGS) -static
  
  install: wmanager
diff --git a/x11-wm/wmanager/files/patch-inc__WManager.H b/x11-wm/wmanager/files/patch-inc__WManager.H
index 0588a68b898b..c491524eba3b 100644
--- a/x11-wm/wmanager/files/patch-inc__WManager.H
+++ b/x11-wm/wmanager/files/patch-inc__WManager.H
@@ -1,7 +1,6 @@
-diff -urN -urN -x .svn ../vendor/wmanager/inc/WManager.H ./inc/WManager.H
---- ../vendor/wmanager/inc/WManager.H	2007-12-11 12:42:04.000000000 +0200
-+++ ./inc/WManager.H	2007-12-17 16:00:13.000000000 +0200
-@@ -80,17 +80,17 @@
+--- inc/WManager.H.orig	1999-11-14 15:28:36 UTC
++++ inc/WManager.H
+@@ -80,17 +80,17 @@ public:
    
  private:
    Interface* _Interface;
diff --git a/x11-wm/wmanager/files/patch-src__Interface.cc b/x11-wm/wmanager/files/patch-src__Interface.cc
index ed16135d60c8..e95dd41e0f57 100644
--- a/x11-wm/wmanager/files/patch-src__Interface.cc
+++ b/x11-wm/wmanager/files/patch-src__Interface.cc
@@ -1,5 +1,5 @@
---- src/Interface.cc.orig	Wed Nov 17 03:25:42 1999
-+++ src/Interface.cc	Sun Nov  2 02:38:20 2003
+--- src/Interface.cc.orig	1999-11-16 18:25:42 UTC
++++ src/Interface.cc
 @@ -23,6 +23,7 @@
  
  // SYSTEM INCLUDES //////////////////////////////////
@@ -16,7 +16,7 @@
  
  // logo image
  static unsigned char *image_mt[] = {
-@@ -130,10 +132,12 @@
+@@ -130,10 +132,12 @@ Interface::Interface()
  Interface::~Interface()
  {
    delete _WMWindow;
diff --git a/x11-wm/wmanager/files/patch-src__WManager.cc b/x11-wm/wmanager/files/patch-src__WManager.cc
index 1866ad3a1155..9cc9cb8c9741 100644
--- a/x11-wm/wmanager/files/patch-src__WManager.cc
+++ b/x11-wm/wmanager/files/patch-src__WManager.cc
@@ -1,6 +1,5 @@
-diff -urN -urN -x .svn ../vendor/wmanager/src/WManager.cc ./src/WManager.cc
---- ../vendor/wmanager/src/WManager.cc	2007-12-11 12:42:04.000000000 +0200
-+++ ./src/WManager.cc	2007-12-17 16:09:16.000000000 +0200
+--- src/WManager.cc.orig	1999-11-14 15:28:36 UTC
++++ src/WManager.cc
 @@ -24,8 +24,12 @@
  // SYSTEM INCLUDES /////////////////////////////////
  #include <string>                                 // standard string class
@@ -22,7 +21,7 @@ diff -urN -urN -x .svn ../vendor/wmanager/src/WManager.cc ./src/WManager.cc
  
  // constructor
  WManager::WManager()
-@@ -302,7 +307,7 @@
+@@ -302,7 +307,7 @@ WManager::_TokenizeAndAddToBrowser(char*
      } else {
        fl_alert("Error near %s while parsing configuration file %s!"
  	       "Try to read on...",
@@ -31,7 +30,7 @@ diff -urN -urN -x .svn ../vendor/wmanager/src/WManager.cc ./src/WManager.cc
      } // end if
    } // end if
  }
-@@ -310,7 +315,7 @@
+@@ -310,7 +315,7 @@ WManager::_TokenizeAndAddToBrowser(char*
  
  // cut rest from the beginning of str
  char*