Update to 0.13

6 files changed, 46 insertions, 44 deletions

diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile
index 9b46916ed395..68ca74dfca84 100644
--- a/x11-wm/devilspie/Makefile
+++ b/x11-wm/devilspie/Makefile
@@ -6,39 +6,31 @@
 #
 
 PORTNAME=	devilspie
-PORTVERSION=	0.10
+PORTVERSION=	0.13
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.burtonini.com/computing/
 
 MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	A window manipulation tool
 
-LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	libwnck libxml2
+USE_GNOME=	libwnck
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		devilspie.1
+PORTDOCS=	AUTHORS NEWS README TODO
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||' \
+		${WRKSRC}/src/Makefile.in
 
 post-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/devilspie.dtd ${DATADIR}
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample-config.xml ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} \
-		${WRKSRC}/AUTHORS \
-		${WRKSRC}/NEWS \
-		${WRKSRC}/README \
-		${WRKSRC}/TODO \
-		${WRKSRC}/devilspie-reference.html \
-		${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/devilspie/distinfo b/x11-wm/devilspie/distinfo
index 70ae3760d4c0..40abccdff69a 100644
--- a/x11-wm/devilspie/distinfo
+++ b/x11-wm/devilspie/distinfo
@@ -1,2 +1,2 @@
-MD5 (devilspie-0.10.tar.gz) = 9ba07be2529e3622758f0889b87c7883
-SIZE (devilspie-0.10.tar.gz) = 177131
+MD5 (devilspie-0.13.tar.gz) = 94a6e2e45f3c1fc66757d2daa0d69b9d
+SIZE (devilspie-0.13.tar.gz) = 146988
diff --git a/x11-wm/devilspie/files/patch-src_actions.c b/x11-wm/devilspie/files/patch-src_actions.c
new file mode 100644
index 000000000000..e0f3b4235a5b
--- /dev/null
+++ b/x11-wm/devilspie/files/patch-src_actions.c
@@ -0,0 +1,24 @@
+--- src/actions.c.orig	Wed Oct  5 03:25:29 2005
++++ src/actions.c	Wed Oct  5 03:26:02 2005
+@@ -120,8 +120,8 @@
+  * Pin the current window to all workspaces.
+  */
+ ESExpResult *func_pin(ESExp *f, int argc, ESExpResult **argv, Context *c) {
+-  wnck_window_stick (c->window);
+-  if (debug) g_printerr(_("Setting sticky\n"));
++  wnck_window_pin (c->window);
++  if (debug) g_printerr(_("Setting pinned\n"));
+   return e_sexp_result_new_bool (f, TRUE);
+ }
+ 
+@@ -129,8 +129,8 @@
+  * Unpin the current window from all workspaces.
+  */
+ ESExpResult *func_unpin(ESExp *f, int argc, ESExpResult **argv, Context *c) {
+-  wnck_window_unstick (c->window);
+-  if (debug) g_printerr(_("Unsetting sticky\n"));
++  wnck_window_unpin (c->window);
++  if (debug) g_printerr(_("Unsetting pinned\n"));
+   return e_sexp_result_new_bool (f, TRUE);
+ }
+ 
diff --git a/x11-wm/devilspie/files/patch-src_doc-generator.c b/x11-wm/devilspie/files/patch-src_doc-generator.c
deleted file mode 100644
index 1d6e7a85f29f..000000000000
--- a/x11-wm/devilspie/files/patch-src_doc-generator.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/doc-generator.c.orig	Tue May 10 02:29:52 2005
-+++ src/doc-generator.c	Tue May 10 02:30:23 2005
-@@ -8,9 +8,10 @@
- 
-          
- static void output_range(xmlTextWriterPtr writer, GParamSpec *param) {
-+  GType type;
-   g_return_if_fail (writer != NULL);
-   g_return_if_fail (param != NULL);
--  GType type = G_PARAM_SPEC_TYPE (param);
-+  type = G_PARAM_SPEC_TYPE (param);
- #define OUTPUT_RANGE(t, T, format) \
-        if (type == G_TYPE_PARAM_##T) { \
-          GParamSpec##t *p = G_PARAM_SPEC_##T (param); \
diff --git a/x11-wm/devilspie/files/patch-src_logical.c b/x11-wm/devilspie/files/patch-src_logical.c
new file mode 100644
index 000000000000..d9f9e472a1e9
--- /dev/null
+++ b/x11-wm/devilspie/files/patch-src_logical.c
@@ -0,0 +1,10 @@
+--- src/logical.c.orig	Wed Oct  5 01:54:14 2005
++++ src/logical.c	Wed Oct  5 01:54:22 2005
+@@ -17,6 +17,7 @@
+  */
+ 
+ #include <string.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <glib.h>
+ #include <glib/gi18n.h>
diff --git a/x11-wm/devilspie/pkg-plist b/x11-wm/devilspie/pkg-plist
index ec6c7a9a164f..691d86749958 100644
--- a/x11-wm/devilspie/pkg-plist
+++ b/x11-wm/devilspie/pkg-plist
@@ -1,12 +1,2 @@
 bin/devilspie
 share/locale/de/LC_MESSAGES/devilspie.mo
-%%DATADIR%%/devilspie.dtd
-%%EXAMPLESDIR%%/sample-config.xml
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/devilspie-reference.html
-@dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%