x11-wm/jwm: update to 2.1.0

- Update to 2.1.0
- Allow staging

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

4 files changed, 86 insertions, 30 deletions

diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index 7dc19e478a28..b0faae836aa5 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -2,45 +2,98 @@
 # $FreeBSD$
 
 PORTNAME=	jwm
-PORTVERSION=	2.0.1
-PORTREVISION=	4
+PORTVERSION=	2.1.0
 CATEGORIES=	x11-wm
-MASTER_SITES=	SF http://joewing.net/programs/jwm/releases/
+MASTER_SITES=	SF \
+		http://joewing.net/programs/jwm/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Joe's Window Manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
+OPTIONS_DEFINE=	FRIBIDI XEXT XFT XINERAMA XMU XPM XRENDER JPEG PNG DEBUG
+OPTIONS_DEFAULT=FRIBIDI XEXT XFT XINERAMA XMU XPM XRENDER JPEG PNG
+FRIBIDI_DESC=	Unicode Bidirectional Algorithm support
+XEXT_DESC=	X11 Shape Extension support
+XMU_DESC=	X11 Miscellaneous Utilities support
+XRENDER_DESC=	X11 Render Extension support
 
+USE_BZIP2=	yes
 USES=		pkgconfig
-USE_XORG=	xpm
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-CFLAGS+=	-I${LOCALBASE}/include
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		jwm.1
-
-OPTIONS_DEFINE=	FRIBIDI XFT XINERAMA JPEG DEBUG
-OPTIONS_DEFAULT=	FRIBIDI XFT XINERAMA JPEG
-DEBUG_DESC=	Enable debugging
+.include <bsd.port.options.mk>
 
-FRIBIDI_BUILD_DEPENDS=	fribidi:${PORTSDIR}/converters/fribidi
-JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-DEBUG_CONFIGURE_ON=	--enable-debug
+.if ${PORT_OPTIONS:MFRIBIDI}
+LIB_DEPENDS+=	libfribidi.so:${PORTSDIR}/converters/fribidi
+.else
+CONFIGURE_ARGS+=	--disable-fribidi
+.endif
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MXEXT}
+USE_XORG+=	xext
+.else
+CONFIGURE_ARGS+=	--disable-shape
+.endif
 
 .if ${PORT_OPTIONS:MXFT}
+.if empty(PORT_OPTIONS:MXRENDER)
+IGNORE=	XFT support requires XRENDER
+.endif
 USE_XORG+=	xft
+.else
+CONFIGURE_ARGS+=	--disable-xft
 .endif
 
 .if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama
+.else
+CONFIGURE_ARGS+=	--disable-xinerama
+.endif
+
+.if ${PORT_OPTIONS:MXMU}
+.if empty(PORT_OPTIONS:MXEXT)
+IGNORE=	XMU support requires XEXT
+.endif
+USE_XORG+=	xmu
+.else
+CONFIGURE_ARGS+=	--disable-xmu
+.endif
+
+.if ${PORT_OPTIONS:MXPM}
+.if empty(PORT_OPTIONS:MXEXT)
+IGNORE=	XPM support requires XEXT
+.endif
+USE_XORG+=	xpm
+.else
+CONFIGURE_ARGS+=	--disable-xpm
+.endif
+
+.if ${PORT_OPTIONS:MXRENDER}
+USE_XORG+=	xrender
+.else
+CONFIGURE_ARGS+=	--disable-xrender
+.endif
+
+.if ${PORT_OPTIONS:MJPEG}
+LIB_DEPENDS+=   libjpeg.so:${PORTSDIR}/graphics/jpeg
+.else
+CONFIGURE_ARGS+=        --disable-jpeg
+.endif
+
+.if ${PORT_OPTIONS:MPNG}
+LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
+.else
+CONFIGURE_ARGS+=        --disable-png
+.endif
+
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=        --enable-debug
 .endif
 
 post-patch:
@@ -49,11 +102,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|fribidi_char_sets_utf8.h|fribidi-char-sets.h|' ${WRKSRC}/src/jwm.h
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/jwm ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc.sample
-	if ! [ -f ${PREFIX}/etc/system.jwmrc ]; then \
-		${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc; \
-	fi
-	${INSTALL_MAN} ${WRKSRC}/jwm.1 ${MANPREFIX}/man/man1
+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} jwm \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} jwm.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1)
+	(cd ${WRKSRC} && ${INSTALL_DATA} example.jwmrc \
+		${STAGEDIR}${PREFIX}/etc/system.jwmrc.sample)
 
 .include <bsd.port.mk>
diff --git a/x11-wm/jwm/distinfo b/x11-wm/jwm/distinfo
index 6d915aa73520..20d522435cd0 100644
--- a/x11-wm/jwm/distinfo
+++ b/x11-wm/jwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jwm-2.0.1.tar.bz2) = dcd6a6bd519578dfc2f3cfde269cea1f9090c87ebf2940bff26cbcca00f0a5c7
-SIZE (jwm-2.0.1.tar.bz2) = 248607
+SHA256 (jwm-2.1.0.tar.bz2) = 5c99f9023dc8c2597effdaacc240ff4c2e07e77c8244f3bf1de5cc483bcf08ab
+SIZE (jwm-2.1.0.tar.bz2) = 163590
diff --git a/x11-wm/jwm/files/patch-example.jwmrc b/x11-wm/jwm/files/patch-example.jwmrc
index 07af807d096c..bca47fa29caa 100644
--- a/x11-wm/jwm/files/patch-example.jwmrc
+++ b/x11-wm/jwm/files/patch-example.jwmrc
@@ -6,17 +6,19 @@ $FreeBSD$
 @@ -5,7 +5,8 @@
     <!-- The root menu, if this is undefined you will not get a menu. -->
     <!-- Additional RootMenu attributes: onroot, labeled, label -->
-    <RootMenu height="32" onroot="123">
--      <Program icon="rxvt.png" label="Terminal">rxvt</Program>
+    <RootMenu height="32" onroot="12">
+-      <Program icon="terminal.png" label="Terminal">xterm</Program>
 +      <Program icon="rxvt.png" label="rxvt">rxvt</Program>
 +      <Program icon="xterm.png" label="xterm">xterm</Program>
  
        <Menu icon="folder.png" label="Applications">
-          <Program icon="audacious.png" label="Audacious">audacious</Program>
-@@ -136,6 +137,9 @@
+          <Program icon="editor.png" label="Dia">dia</Program>
+@@ -150,7 +151,10 @@
+    </PopupStyle>
  
     <IconPath>
-       $HOME/.icons
+-      /usr/share/icons/wm-icons/32x32-gant
++      $HOME/.icons
 +      %%PREFIX%%/share/icons
 +      %%PREFIX%%/share/pixmaps
 +      %%PREFIX%%/lib/X11/icons
diff --git a/x11-wm/jwm/pkg-plist b/x11-wm/jwm/pkg-plist
index fbfef68d88f0..b76d79b53896 100644
--- a/x11-wm/jwm/pkg-plist
+++ b/x11-wm/jwm/pkg-plist
@@ -1,4 +1,5 @@
 bin/jwm
+man/man1/jwm.1.gz
 @unexec if cmp -s %D/etc/system.jwmrc %D/etc/system.jwmrc.sample; then rm -f %D/etc/system.jwmrc; fi
 etc/system.jwmrc.sample
 @exec if [ ! -f %D/etc/system.jwmrc ]; then cp -p %D/etc/system.jwmrc.sample %D/etc/system.jwmrc; fi