- Update to 2.3.0.

PR:		ports/151560
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

9 files changed, 30 insertions, 155 deletions

diff --git a/x11-wm/pawm/Makefile b/x11-wm/pawm/Makefile
index 98d67c26f571..e022086d939b 100644
--- a/x11-wm/pawm/Makefile
+++ b/x11-wm/pawm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pawm
-PORTVERSION=	2.2.9
-PORTREVISION=	2
+PORTVERSION=	2.3.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.pleyades.net/pawm/files/
 
@@ -15,49 +14,30 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Puto Amo Window Manager
 
 USE_BZIP2=	yes
-USE_XORG=	x11 xrandr xrender xpm
-USE_GMAKE=	yes
-MAKEFILE=	Makefile.in
-MAKE_ARGS=	GCC="${CC}" MAKE.binary="${CC} ${LDFLAGS} -o"
-
-CFLAGS+=	-I. -I${LOCALBASE}/include -DNDEBUG
-LDFLAGS=	-lm -L${LOCALBASE}/lib -lXpm
-
-.include <bsd.port.pre.mk>
-
-LDFLAGS+=	-lXrandr
-.if defined(WITHOUT_XFT)
-CFLAGS+=	-DDISABLE_XFT
-.else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-CFLAGS+=	`pkg-config --cflags xft`
-LDFLAGS+=	`pkg-config --libs xft`
-.endif
+USE_XORG=	x11 xft xrandr xrender xpm
+USE_CMAKE=	yes
+CMAKE_ARGS=	-DCMAKE_CONFIG_PREFIX:STRING="${PREFIX}/etc" \
+		-DX11_LIBRARY_DIRS:STRING="${LOCALBASE}/lib"
 
 .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 libstartup-notification-1.0`
-LDFLAGS+=	`pkg-config --libs libstartup-notification-1.0`
+		`pkg-config --cflags --libs libstartup-notification-1.0`
 .endif
 
-do-configure:
-	@${ECHO_CMD} -n > ${WRKSRC}/config.h
-	@${ECHO_CMD} '#define PROJECT "${PORTNAME}"' >> ${WRKSRC}/config.h
-	@${ECHO_CMD} '#define VERSION "${PORTVERSION}"' >> ${WRKSRC}/config.h
-	@${ECHO_CMD} '#define CONFDIR "${PREFIX}/etc"' >> ${WRKSRC}/config.h
-	@${ECHO_CMD} '#define DATADIR "${DATADIR}"' >> ${WRKSRC}/config.h
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/"\/etc"/s|^|#| ; \
+		 /"-O2"/s|^|#| ; \
+		 /LINK_DIRECTORIES/s|\.|| ; \
+		 /INSTALL/s| /etc| etc|' ${WRKSRC}/CMakeLists.txt
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/pawm ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/conf/pawm.conf ${PREFIX}/etc
-	@${MKDIR} ${DATADIR}/icons
-	${INSTALL_DATA} ${WRKSRC}/data/icons/*.xpm ${DATADIR}/icons
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for ii in AUTHORS Changelog GPL INSTALL README
+.for ii in AUTHORS Changelog.old GPL INSTALL README TODO
 	${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/pawm/distinfo b/x11-wm/pawm/distinfo
index 19856db52f8d..758af0f110da 100644
--- a/x11-wm/pawm/distinfo
+++ b/x11-wm/pawm/distinfo
@@ -1,3 +1,2 @@
-MD5 (pawm-2.2.9.tar.bz2) = 0d1a649ec5bc0bf70a50dddeadb813a2
-SHA256 (pawm-2.2.9.tar.bz2) = af6cfb77a008cc5face1a9fd8c17b2942a8d530d811d36be3d5289062693d93d
-SIZE (pawm-2.2.9.tar.bz2) = 133437
+SHA256 (pawm-2.3.0.tar.bz2) = 5de0706ecd2f6251a3672305c8d32a6fd0e0a3176191d806f47926dae28945f2
+SIZE (pawm-2.3.0.tar.bz2) = 115648
diff --git a/x11-wm/pawm/files/patch-src__button.c b/x11-wm/pawm/files/patch-src__button.c
deleted file mode 100644
index c86cabcd1bd9..000000000000
--- a/x11-wm/pawm/files/patch-src__button.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/button.c.orig	Tue Jul  4 03:19:55 2006
-+++ src/button.c	Mon Jul 17 03:28:20 2006
-@@ -247,6 +247,9 @@
- 	XSetWindowAttributes attributes;
- 	Button button=NULL;
- 
-+	XSetWindowAttributes wattr;
-+	unsigned long wmask;
-+
- 	ASSERT(parent!=None);
- 	ASSERT(nface!=None); 
- 	ASSERT(hface!=None);
-@@ -269,9 +272,6 @@
- 
- 
- 	/** Window creation and basic setup **/
--
--	XSetWindowAttributes wattr;
--	unsigned long wmask;
- 
- 	wattr.border_pixel=0;
- 	wattr.colormap = XCreateColormap (display, ROOT, DEFAULTVISUAL, AllocNone);
diff --git a/x11-wm/pawm/files/patch-src__pafont.c b/x11-wm/pawm/files/patch-src__pafont.c
deleted file mode 100644
index 72732af57115..000000000000
--- a/x11-wm/pawm/files/patch-src__pafont.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/pafont.c.orig	Tue Jul 25 05:49:39 2006
-+++ src/pafont.c	Fri Jul 28 16:28:48 2006
-@@ -86,7 +86,7 @@
- {
- 	ASSERT(xlfdfont);
- 
--	XSetForeground(xlfdfont->display, xgc, xfldfont->color);
-+	XSetForeground(xlfdfont->display, xgc, xlfdfont->color);
- 	/* X and Y coordinates mark the top left corner of the text box,
- 	 * so we need to sum the ascent value to y to make the shitty old
- 	 * X font system draw the text at the right place */
-@@ -149,7 +149,7 @@
- 	XColor ecolor, scolor;
- 
- 	XAllocNamedColor(xlfdfont->display, COLORMAP, name, &scolor, &ecolor);
--	xfldfont->color=scolor.pixel;
-+	xlfdfont->color=scolor.pixel;
- }
- 
- #else
diff --git a/x11-wm/pawm/files/patch-src__paicon.c b/x11-wm/pawm/files/patch-src__paicon.c
deleted file mode 100644
index fe3bd82b0ab8..000000000000
--- a/x11-wm/pawm/files/patch-src__paicon.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/paicon.c.orig	Tue Jul  4 03:19:55 2006
-+++ src/paicon.c	Mon Jul 17 03:27:59 2006
-@@ -263,6 +263,9 @@
- {
- 	PAIcon icon=NULL;
- 
-+	XSetWindowAttributes wattr;
-+	unsigned long wmask;
-+
- 	ASSERT(image);
- 
- 	icon=malloc(PAIconBytes);
-@@ -273,9 +276,6 @@
- #endif
- 
- 	icon->image=image;
--
--	XSetWindowAttributes wattr;
--	unsigned long wmask;
- 
- 	wattr.border_pixel=0;
- 	wattr.colormap = XCreateColormap (display, ROOT, DEFAULTVISUAL, AllocNone);
diff --git a/x11-wm/pawm/files/patch-src__pawindow.cc b/x11-wm/pawm/files/patch-src__pawindow.cc
deleted file mode 100644
index cb43bb09cc06..000000000000
--- a/x11-wm/pawm/files/patch-src__pawindow.cc
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/pawindow.c.orig	Sun Mar  5 10:14:06 2006
-+++ src/pawindow.c	Wed Mar  8 13:29:48 2006
-@@ -787,10 +787,12 @@
- 
- static void canvas_KeyPress(XKeyPressedEvent *event, PAWindow pawindow)
- {
-+	XEvent *e;
-+
- 	ASSERT(event);
- 	ASSERT(pawindow);
- 
--	XEvent *e = (XEvent *) event;
-+	e = (XEvent *) event;
- 
- 	/* Replay the event if it isn't a pawm keybinding */
- 	if (!keyboard_binding_key(event)) {
-@@ -1633,6 +1635,7 @@
- 	int num_rows=1;
- 	int firsticonx, lasticonx, iconx, icony;
- 	bool forward= (strcmp((char *)data, "forward")==0 ? 1 : 0);
-+  	KeySym testkeysym; KeyCode testkeycode;
- 
- 
- 	/* TODO: Support both rotate method: w/wout popup window*/
-@@ -1665,7 +1668,6 @@
-                  None, CurrentTime);
- 	current_pw=tab_window_draw_all(num_windows, num_rows);
- 
--  	KeySym testkeysym; KeyCode testkeycode;
-     testkeysym=XStringToKeysym("Tab");
-     testkeycode=XKeysymToKeycode(display, testkeysym);
-     XGrabKey(display, testkeycode, Mod1Mask, ROOT, False, GrabModeAsync, GrabModeAsync);
diff --git a/x11-wm/pawm/files/patch-src__pawm.c b/x11-wm/pawm/files/patch-src__pawm.c
new file mode 100644
index 000000000000..d4bf51d8fdae
--- /dev/null
+++ b/x11-wm/pawm/files/patch-src__pawm.c
@@ -0,0 +1,11 @@
+--- 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 @@
+ 
+ int main (int argc, char *argv[]) 
+ {
+-	struct sigaction sa_term, sa_chld;
++	struct sigaction sa_term, sa_chld, sa_alrm;
+     
+     /* Command line parameters */
+ 	if (argc > 1) {    
diff --git a/x11-wm/pawm/files/patch-src__wm.c b/x11-wm/pawm/files/patch-src__wm.c
deleted file mode 100644
index a46b43ffe321..000000000000
--- a/x11-wm/pawm/files/patch-src__wm.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/wm.c.orig	Fri Feb 24 05:12:18 2006
-+++ src/wm.c	Sun Feb 26 03:10:37 2006
-@@ -355,6 +355,9 @@
- 	CARD32 tmpdata[20];
- 	unsigned long length;
- 	int (*olderrorhandler) (Display *, XErrorEvent *);
-+#ifndef DISABLE_XRANDR
-+	int major, minor,errbase;
-+#endif
- 
- 	SAY ("Initializing window manager...");
- 
-@@ -373,7 +376,6 @@
- 
- #ifndef DISABLE_XRANDR
- 	/* Check for XRandr extension */
--	int major, minor,errbase;
- 	XRRQueryVersion(display, &major, &minor);
- 	XRRQueryExtension(display, &(class.randr_base), &errbase);
- 	SAY("Using XRandr %d.%d extension. Event base: %d Error base %d", major, minor, class.randr_base, errbase);
diff --git a/x11-wm/pawm/pkg-plist b/x11-wm/pawm/pkg-plist
index 471a67bf4b9d..c137553c0e8b 100644
--- a/x11-wm/pawm/pkg-plist
+++ b/x11-wm/pawm/pkg-plist
@@ -1,10 +1,11 @@
 bin/pawm
 etc/pawm.conf
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/Changelog
+%%PORTDOCS%%%%DOCSDIR%%/Changelog.old
 %%PORTDOCS%%%%DOCSDIR%%/GPL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%DATADIR%%/icons/close_d.xpm
 %%DATADIR%%/icons/close_d_256.xpm
 %%DATADIR%%/icons/close_h.xpm