4 files changed, 114 insertions, 101 deletions

diff --git a/x11-themes/cursor-dmz-theme/Makefile b/x11-themes/cursor-dmz-theme/Makefile
index d976a0b06302..3018dcdbea6a 100644
--- a/x11-themes/cursor-dmz-theme/Makefile
+++ b/x11-themes/cursor-dmz-theme/Makefile
@@ -1,23 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	cursor-dmz-theme
-PORTVERSION=	0.3
-PORTREVISION=	2
+PORTVERSION=	0.4.4
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://jimmac.musichall.cz/zip/
-DISTNAME=	vanilla-dmz-${PORTVERSION}
+MASTER_SITES=	DEBIAN/pool/main/d/dmz-cursor-theme
+DISTNAME=	dmz-cursor-theme_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The DMZ style neutral scalable cursor theme
+COMMENT=	DMZ style neutral scalable cursor theme
 
-USES=	tar:bzip2
-NO_BUILD=	yes
+LICENSE=	CCbySA3
+LICENSE_NAME=	Creative Commons Attribution-ShareAlike 3.0 Unported
+LICENSE_TEXT=	See http://creativecommons.org/licenses/by-sa/3.0/
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-WRKSRC=		${WRKDIR}
+BUILD_DEPENDS=	xcursorgen:${PORTSDIR}/x11/xcursorgen
+
+NO_ARCH=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}/DMZ-White
+DATADIR=	${PREFIX}/lib/X11/icons/Vanilla-DMZ
+
+do-build:
+	(cd ${WRKSRC}/pngs && ${SH} make.sh)
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/icons/Vanilla-DMZ/cursors
-	cd ${WRKSRC}/Vanilla-DMZ/cursors; \
-		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/X11/icons/Vanilla-DMZ/cursors
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} index.theme \
+		${STAGEDIR}${DATADIR})
+	@${MKDIR} ${STAGEDIR}${DATADIR}/cursors
+	(cd ${WRKSRC}/xcursors && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${DATADIR}/cursors)
 
 .include <bsd.port.mk>
diff --git a/x11-themes/cursor-dmz-theme/distinfo b/x11-themes/cursor-dmz-theme/distinfo
index e205246f3304..75e07e581239 100644
--- a/x11-themes/cursor-dmz-theme/distinfo
+++ b/x11-themes/cursor-dmz-theme/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vanilla-dmz-0.3.tar.bz2) = e0314f5402a335674db46e1dbb473f8e85838a56afc48644086f99d4a5749af7
-SIZE (vanilla-dmz-0.3.tar.bz2) = 134168
+SHA256 (dmz-cursor-theme_0.4.4.tar.gz) = 46af4cf1356df799f9ee94451f05d0bdbb8d82e54bdeae3f32fa107602359981
+SIZE (dmz-cursor-theme_0.4.4.tar.gz) = 1077832
diff --git a/x11-themes/cursor-dmz-theme/pkg-descr b/x11-themes/cursor-dmz-theme/pkg-descr
index 59b43c751163..e19826149c8b 100644
--- a/x11-themes/cursor-dmz-theme/pkg-descr
+++ b/x11-themes/cursor-dmz-theme/pkg-descr
@@ -1,4 +1,4 @@
 This is a theme based on the cursor work of the re-known desktop
 artist Jakub "Jimmac" Steiner.
 
-WWW: http://jimmac.musichall.cz/themes.php?skin=7
+WWW: http://jimmac.musichall.cz/
diff --git a/x11-themes/cursor-dmz-theme/pkg-plist b/x11-themes/cursor-dmz-theme/pkg-plist
index 3c27c79cf2a3..19eb7ec32674 100644
--- a/x11-themes/cursor-dmz-theme/pkg-plist
+++ b/x11-themes/cursor-dmz-theme/pkg-plist
@@ -1,87 +1,89 @@
-lib/X11/icons/Vanilla-DMZ/cursors/00008160000006810000408080010102
-lib/X11/icons/Vanilla-DMZ/cursors/028006030e0e7ebffc7f7070c0600140
-lib/X11/icons/Vanilla-DMZ/cursors/03b6e0fcb3499374a867c041f52298f0
-lib/X11/icons/Vanilla-DMZ/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
-lib/X11/icons/Vanilla-DMZ/cursors/1081e37283d90000800003c07f3ef6bf
-lib/X11/icons/Vanilla-DMZ/cursors/14fef782d02440884392942c11205230
-lib/X11/icons/Vanilla-DMZ/cursors/2870a09082c103050810ffdffffe0204
-lib/X11/icons/Vanilla-DMZ/cursors/3085a0e285430894940527032f8b26df
-lib/X11/icons/Vanilla-DMZ/cursors/3ecb610c1bf2410f44200f48c40d3599
-lib/X11/icons/Vanilla-DMZ/cursors/4498f0e0c1937ffe01fd06f973665830
-lib/X11/icons/Vanilla-DMZ/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408
-lib/X11/icons/Vanilla-DMZ/cursors/6407b0e94181790501fd1e167b474872
-lib/X11/icons/Vanilla-DMZ/cursors/640fb0e74195791501fd1ed57b41487f
-lib/X11/icons/Vanilla-DMZ/cursors/9081237383d90e509aa00f00170e968f
-lib/X11/icons/Vanilla-DMZ/cursors/9d800788f1b08800ae810202380a0822
-lib/X11/icons/Vanilla-DMZ/cursors/X_cursor
-lib/X11/icons/Vanilla-DMZ/cursors/arrow
-lib/X11/icons/Vanilla-DMZ/cursors/watch
-lib/X11/icons/Vanilla-DMZ/cursors/v_double_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/ur_angle
-lib/X11/icons/Vanilla-DMZ/cursors/ul_angle
-lib/X11/icons/Vanilla-DMZ/cursors/top_tee
-lib/X11/icons/Vanilla-DMZ/cursors/top_side
-lib/X11/icons/Vanilla-DMZ/cursors/top_right_corner
-lib/X11/icons/Vanilla-DMZ/cursors/top_left_corner
-lib/X11/icons/Vanilla-DMZ/cursors/top_left_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/tcross
-lib/X11/icons/Vanilla-DMZ/cursors/target
-lib/X11/icons/Vanilla-DMZ/cursors/sb_v_double_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/sb_up_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/sb_right_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/sb_left_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/sb_h_double_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/sb_down_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/right_tee
-lib/X11/icons/Vanilla-DMZ/cursors/right_side
-lib/X11/icons/Vanilla-DMZ/cursors/right_ptr
-lib/X11/icons/Vanilla-DMZ/cursors/question_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/plus
-lib/X11/icons/Vanilla-DMZ/cursors/pirate
-lib/X11/icons/Vanilla-DMZ/cursors/pencil
-lib/X11/icons/Vanilla-DMZ/cursors/move
-lib/X11/icons/Vanilla-DMZ/cursors/lr_angle
-lib/X11/icons/Vanilla-DMZ/cursors/ll_angle
-lib/X11/icons/Vanilla-DMZ/cursors/link
-lib/X11/icons/Vanilla-DMZ/cursors/left_tee
-lib/X11/icons/Vanilla-DMZ/cursors/left_side
-lib/X11/icons/Vanilla-DMZ/cursors/left_ptr_watch
-lib/X11/icons/Vanilla-DMZ/cursors/left_ptr_help
-lib/X11/icons/Vanilla-DMZ/cursors/left_ptr
-lib/X11/icons/Vanilla-DMZ/cursors/icon
-lib/X11/icons/Vanilla-DMZ/cursors/help
-lib/X11/icons/Vanilla-DMZ/cursors/hand2
-lib/X11/icons/Vanilla-DMZ/cursors/hand1
-lib/X11/icons/Vanilla-DMZ/cursors/hand
-lib/X11/icons/Vanilla-DMZ/cursors/h_double_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/grabbing
-lib/X11/icons/Vanilla-DMZ/cursors/fleur
-lib/X11/icons/Vanilla-DMZ/cursors/fd_double_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/fcf1c3c7cd4491d801f1e1c78f100000
-lib/X11/icons/Vanilla-DMZ/cursors/e29285e634086352946a0e7090d73106
-lib/X11/icons/Vanilla-DMZ/cursors/draped_box
-lib/X11/icons/Vanilla-DMZ/cursors/draft_small
-lib/X11/icons/Vanilla-DMZ/cursors/draft_large
-lib/X11/icons/Vanilla-DMZ/cursors/double_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/dotbox
-lib/X11/icons/Vanilla-DMZ/cursors/dot_box_mask
-lib/X11/icons/Vanilla-DMZ/cursors/dnd-none
-lib/X11/icons/Vanilla-DMZ/cursors/dnd-move
-lib/X11/icons/Vanilla-DMZ/cursors/dnd-link
-lib/X11/icons/Vanilla-DMZ/cursors/dnd-copy
-lib/X11/icons/Vanilla-DMZ/cursors/dnd-ask
-lib/X11/icons/Vanilla-DMZ/cursors/diamond_cross
-lib/X11/icons/Vanilla-DMZ/cursors/d9ce0ab605698f320427677b458ad60b
-lib/X11/icons/Vanilla-DMZ/cursors/crosshair
-lib/X11/icons/Vanilla-DMZ/cursors/crossed_circle
-lib/X11/icons/Vanilla-DMZ/cursors/cross_reverse
-lib/X11/icons/Vanilla-DMZ/cursors/cross
-lib/X11/icons/Vanilla-DMZ/cursors/copy
-lib/X11/icons/Vanilla-DMZ/cursors/circle
-lib/X11/icons/Vanilla-DMZ/cursors/c7088f0f3e6c8088236ef8e1e3e70000
-lib/X11/icons/Vanilla-DMZ/cursors/bottom_tee
-lib/X11/icons/Vanilla-DMZ/cursors/bottom_side
-lib/X11/icons/Vanilla-DMZ/cursors/bottom_right_corner
-lib/X11/icons/Vanilla-DMZ/cursors/bottom_left_corner
-lib/X11/icons/Vanilla-DMZ/cursors/bd_double_arrow
-lib/X11/icons/Vanilla-DMZ/cursors/xterm
+%%DATADIR%%/cursors/00008160000006810000408080010102
+%%DATADIR%%/cursors/028006030e0e7ebffc7f7070c0600140
+%%DATADIR%%/cursors/03b6e0fcb3499374a867c041f52298f0
+%%DATADIR%%/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+%%DATADIR%%/cursors/1081e37283d90000800003c07f3ef6bf
+%%DATADIR%%/cursors/14fef782d02440884392942c11205230
+%%DATADIR%%/cursors/2870a09082c103050810ffdffffe0204
+%%DATADIR%%/cursors/3085a0e285430894940527032f8b26df
+%%DATADIR%%/cursors/3ecb610c1bf2410f44200f48c40d3599
+%%DATADIR%%/cursors/4498f0e0c1937ffe01fd06f973665830
+%%DATADIR%%/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408
+%%DATADIR%%/cursors/6407b0e94181790501fd1e167b474872
+%%DATADIR%%/cursors/640fb0e74195791501fd1ed57b41487f
+%%DATADIR%%/cursors/9081237383d90e509aa00f00170e968f
+%%DATADIR%%/cursors/9d800788f1b08800ae810202380a0822
+%%DATADIR%%/cursors/X_cursor
+%%DATADIR%%/cursors/arrow
+%%DATADIR%%/cursors/bd_double_arrow
+%%DATADIR%%/cursors/bottom_left_corner
+%%DATADIR%%/cursors/bottom_right_corner
+%%DATADIR%%/cursors/bottom_side
+%%DATADIR%%/cursors/bottom_tee
+%%DATADIR%%/cursors/c7088f0f3e6c8088236ef8e1e3e70000
+%%DATADIR%%/cursors/circle
+%%DATADIR%%/cursors/color-picker
+%%DATADIR%%/cursors/copy
+%%DATADIR%%/cursors/cross
+%%DATADIR%%/cursors/cross_reverse
+%%DATADIR%%/cursors/crossed_circle
+%%DATADIR%%/cursors/crosshair
+%%DATADIR%%/cursors/d9ce0ab605698f320427677b458ad60b
+%%DATADIR%%/cursors/diamond_cross
+%%DATADIR%%/cursors/dnd-ask
+%%DATADIR%%/cursors/dnd-copy
+%%DATADIR%%/cursors/dnd-link
+%%DATADIR%%/cursors/dnd-move
+%%DATADIR%%/cursors/dnd-none
+%%DATADIR%%/cursors/dot_box_mask
+%%DATADIR%%/cursors/dotbox
+%%DATADIR%%/cursors/double_arrow
+%%DATADIR%%/cursors/draft_large
+%%DATADIR%%/cursors/draft_small
+%%DATADIR%%/cursors/draped_box
+%%DATADIR%%/cursors/e29285e634086352946a0e7090d73106
+%%DATADIR%%/cursors/fcf1c3c7cd4491d801f1e1c78f100000
+%%DATADIR%%/cursors/fd_double_arrow
+%%DATADIR%%/cursors/fleur
+%%DATADIR%%/cursors/grabbing
+%%DATADIR%%/cursors/h_double_arrow
+%%DATADIR%%/cursors/hand
+%%DATADIR%%/cursors/hand1
+%%DATADIR%%/cursors/hand2
+%%DATADIR%%/cursors/help
+%%DATADIR%%/cursors/icon
+%%DATADIR%%/cursors/left_ptr
+%%DATADIR%%/cursors/left_ptr_help
+%%DATADIR%%/cursors/left_ptr_watch
+%%DATADIR%%/cursors/left_side
+%%DATADIR%%/cursors/left_tee
+%%DATADIR%%/cursors/link
+%%DATADIR%%/cursors/ll_angle
+%%DATADIR%%/cursors/lr_angle
+%%DATADIR%%/cursors/move
+%%DATADIR%%/cursors/pencil
+%%DATADIR%%/cursors/pirate
+%%DATADIR%%/cursors/plus
+%%DATADIR%%/cursors/question_arrow
+%%DATADIR%%/cursors/right_ptr
+%%DATADIR%%/cursors/right_side
+%%DATADIR%%/cursors/right_tee
+%%DATADIR%%/cursors/sb_down_arrow
+%%DATADIR%%/cursors/sb_h_double_arrow
+%%DATADIR%%/cursors/sb_left_arrow
+%%DATADIR%%/cursors/sb_right_arrow
+%%DATADIR%%/cursors/sb_up_arrow
+%%DATADIR%%/cursors/sb_v_double_arrow
+%%DATADIR%%/cursors/target
+%%DATADIR%%/cursors/tcross
+%%DATADIR%%/cursors/top_left_arrow
+%%DATADIR%%/cursors/top_left_corner
+%%DATADIR%%/cursors/top_right_corner
+%%DATADIR%%/cursors/top_side
+%%DATADIR%%/cursors/top_tee
+%%DATADIR%%/cursors/ul_angle
+%%DATADIR%%/cursors/ur_angle
+%%DATADIR%%/cursors/v_double_arrow
+%%DATADIR%%/cursors/watch
+%%DATADIR%%/cursors/xterm
+%%DATADIR%%/index.theme