svn commit: r336978 - in branches/2014Q1/x11-wm/wmii-devel: . files

Baptiste Daroussin bapt at FreeBSD.org
Fri Dec 20 07:59:10 UTC 2013 

Author: bapt
Date: Fri Dec 20 07:59:09 2013
New Revision: 336978
URL: http://svnweb.freebsd.org/changeset/ports/336978

Log:
  MFH: r336942
  
  - Update MASTER_SITES and WWW: line
  - Fix build on -current
  - Add LICENSE
  - Support staging
  
  PR:		ports/184824
  Submitted by:	KATO Tsuguru <tkato432 at yahoo.com>

Added:
  branches/2014Q1/x11-wm/wmii-devel/files/
     - copied from r336942, head/x11-wm/wmii-devel/files/
Modified:
  branches/2014Q1/x11-wm/wmii-devel/Makefile   (contents, props changed)
  branches/2014Q1/x11-wm/wmii-devel/pkg-descr   (contents, props changed)
  branches/2014Q1/x11-wm/wmii-devel/pkg-plist   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/x11-wm/wmii-devel/Makefile
==============================================================================
--- branches/2014Q1/x11-wm/wmii-devel/Makefile	Fri Dec 20 07:58:21 2013	(r336977)
+++ branches/2014Q1/x11-wm/wmii-devel/Makefile	Fri Dec 20 07:59:09 2013	(r336978)
@@ -4,42 +4,101 @@
 PORTNAME=	wmii
 DISTVERSION=	3.9.2
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://dl.suckless.org/wmii/
+MASTER_SITES=	GOOGLE_CODE
+PKGNAMESUFFIX=	-devel
 DISTNAME=	wmii+ixp-${DISTVERSION}
 EXTRACT_SUFX=	.tbz
-PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Dynamic, minimalist window manager for X11
 
-LIB_DEPENDS=	ixp:${PORTSDIR}/devel/libixp
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libixp.so:${PORTSDIR}/devel/libixp
+
+OPTIONS_DEFINE=	DOCS
 
-USES=		pkgconfig
 CONFLICTS=	wmii-3.6*
 
 USE_BZIP2=	yes
+USES=		pkgconfig
 USE_XORG=	x11 xext xrandr xrender xinerama xft
-
-MAKE_ARGS=	PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \
-		CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \
-		MAN="${MANPREFIX}/man" DOC="${DOCSDIR}"
+USE_LDCONFIG=	yes
 MAKE_ENV=	noisycc=1	# unmute build commands, useful for logs
+MAKE_ARGS=	PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \
+		CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" \
+		STATIC="" MAN="${MANPREFIX}/man" DOC="${DOCSDIR}"
 
-MAN1=		wimenu.1 wmii9menu.1 wmii.1 wmiir.1
-
-OPTIONS_DEFINE=	DOCS
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-post-patch: .SILENT
+post-patch:
 # Link against `devel/libixp' from ports and drop extraneous build options
-	${REINPLACE_CMD} -e '/libixp/d' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib, ; /^CFLAGS +=/d' \
+	@${REINPLACE_CMD} -e '/libixp/d' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib, ; /^CFLAGS +=/d' \
 		${WRKSRC}/config.mk
-.if ! ${PORT_OPTIONS:MDOCS}
-	${REINPLACE_CMD} -e '/doc/d' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e '/DOCDIR/s,$$(INSTALL),:,' ${WRKSRC}/mk/common.mk
-.endif
+
+do-install:
+.for i in wmii9menu wmiir
+	(cd ${WRKSRC}/cmd && ${INSTALL_PROGRAM} ${i}.out \
+		${STAGEDIR}${PREFIX}/bin/${i})
+.endfor
+.for i in wmii.rc wmii.sh
+	(cd ${WRKSRC}/cmd && ${INSTALL_DATA} ${i}.out \
+		${STAGEDIR}${PREFIX}/bin/${i})
+.endfor
+	(cd ${WRKSRC}/cmd && ${INSTALL_SCRIPT} wihack.out \
+		${STAGEDIR}${PREFIX}/bin/wihack)
+	(cd ${WRKSRC}/cmd/menu && ${INSTALL_PROGRAM} wimenu.out \
+		${STAGEDIR}${PREFIX}/bin/wimenu)
+	(cd ${WRKSRC}/cmd/wmii && ${INSTALL_PROGRAM} wmii.out \
+		${STAGEDIR}${PREFIX}/bin/wmii)
+	(cd ${WRKSRC}/lib && ${INSTALL_LIB} libwmii_hack.so \
+		${STAGEDIR}${PREFIX}/lib)
+	(cd ${WRKSRC}/man && ${INSTALL_MAN} *.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1)
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+.for i in welcome wmiirc
+	(cd ${WRKSRC}/rc && ${INSTALL_DATA} ${i}.out \
+		${STAGEDIR}${ETCDIR}/${i})
+.endfor
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/plan9port
+	(cd ${WRKSRC}/alternative_wmiircs/plan9port && ${INSTALL_DATA} wmiirc \
+		${STAGEDIR}${ETCDIR}/plan9port)
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/python
+.for i in wmiirc wmiirc.py
+	(cd ${WRKSRC}/alternative_wmiircs/python && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${ETCDIR}/python)
+.endfor
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/python/pygmi
+	(cd ${WRKSRC}/alternative_wmiircs/python/pygmi && ${INSTALL_DATA} *.py \
+		${STAGEDIR}${ETCDIR}/python/pygmi)
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/python/pyxp
+	(cd ${WRKSRC}/alternative_wmiircs/python/pyxp && ${INSTALL_DATA} *.py \
+		${STAGEDIR}${ETCDIR}/python/pyxp)
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/ruby
+.for i in config.rb config.yaml wmiirc
+	(cd ${WRKSRC}/alternative_wmiircs/ruby && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${ETCDIR}/ruby)
+.endfor
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in LICENSE README
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+.endfor
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} wmii.pdf ${STAGEDIR}${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/alternative_wmiircs
+	(cd ${WRKSRC}/alternative_wmiircs && ${INSTALL_DATA} README \
+		${STAGEDIR}${DOCSDIR}/alternative_wmiircs)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/alternative_wmiircs/plan9port
+	(cd ${WRKSRC}/alternative_wmiircs/plan9port && ${INSTALL_DATA} README \
+		${STAGEDIR}${DOCSDIR}/alternative_wmiircs/plan9port)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/alternative_wmiircs/python
+	(cd ${WRKSRC}/alternative_wmiircs/python && ${INSTALL_DATA} README \
+		${STAGEDIR}${DOCSDIR}/alternative_wmiircs/python)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/alternative_wmiircs/ruby
+.for i in HISTORY LICENSE README
+	(cd ${WRKSRC}/alternative_wmiircs/ruby && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DOCSDIR}/alternative_wmiircs/ruby)
+.endfor
 
 .include <bsd.port.mk>

Modified: branches/2014Q1/x11-wm/wmii-devel/pkg-descr
==============================================================================
--- branches/2014Q1/x11-wm/wmii-devel/pkg-descr	Fri Dec 20 07:58:21 2013	(r336977)
+++ branches/2014Q1/x11-wm/wmii-devel/pkg-descr	Fri Dec 20 07:59:09 2013	(r336978)
@@ -1,11 +1,11 @@
-WMII is a small, dynamic window manager for X11.  It supports both classic
-and tiling (acme-like) window management with extended keyboard, mouse, and
-9p filesystem based remote control.  It replaces the workspace paradigm with
-a new tagging approach and is highly scriptable (with plain shell or Python
-and even Chicken).
+WMII is a small, dynamic window manager for X11. It supports both
+classic and tiling (acme-like) window management with extended keyboard,
+mouse, and 9p filesystem based remote control. It replaces the workspace
+paradigm with a new tagging approach and is highly scriptable (with
+plain shell or Python and even Chicken).
 
 Its minimalist philosophy attempts to not exceed 10.000 lines of code
-(including all shipped utilities and libraries), to enforce simplicity and
-clarity (read: it is hackable and beautiful).
+(including all shipped utilities and libraries), to enforce simplicity
+and clarity (read: it is hackable and beautiful).
 
-WWW: http://wmii.suckless.org/
+WWW: https://code.google.com/p/wmii/

Modified: branches/2014Q1/x11-wm/wmii-devel/pkg-plist
==============================================================================
--- branches/2014Q1/x11-wm/wmii-devel/pkg-plist	Fri Dec 20 07:58:21 2013	(r336977)
+++ branches/2014Q1/x11-wm/wmii-devel/pkg-plist	Fri Dec 20 07:59:09 2013	(r336978)
@@ -5,36 +5,34 @@ bin/wmii.rc
 bin/wmii.sh
 bin/wmii9menu
 bin/wmiir
-etc/wmii/plan9port/wmiirc
-etc/wmii/python/pygmi/__init__.py
-etc/wmii/python/pygmi/event.py
-etc/wmii/python/pygmi/fs.py
-etc/wmii/python/pygmi/menu.py
-etc/wmii/python/pygmi/monitor.py
-etc/wmii/python/pygmi/util.py
-etc/wmii/python/pyxp/__init__.py
-etc/wmii/python/pyxp/asyncclient.py
-etc/wmii/python/pyxp/client.py
-etc/wmii/python/pyxp/dial.py
-etc/wmii/python/pyxp/fcall.py
-etc/wmii/python/pyxp/fields.py
-etc/wmii/python/pyxp/messages.py
-etc/wmii/python/pyxp/mux.py
-etc/wmii/python/pyxp/types.py
-etc/wmii/python/wmiirc
-etc/wmii/python/wmiirc.py
-etc/wmii/ruby/config.rb
-etc/wmii/ruby/config.yaml
-etc/wmii/ruby/wmiirc
-etc/wmii/welcome
-etc/wmii/wmiirc
- at dirrm etc/wmii/ruby
- at dirrm etc/wmii/python/pyxp
- at dirrm etc/wmii/python/pygmi
- at dirrm etc/wmii/python
- at dirrm etc/wmii/plan9port
- at dirrm etc/wmii
+%%ETCDIR%%/plan9port/wmiirc
+%%ETCDIR%%/python/pygmi/__init__.py
+%%ETCDIR%%/python/pygmi/event.py
+%%ETCDIR%%/python/pygmi/fs.py
+%%ETCDIR%%/python/pygmi/menu.py
+%%ETCDIR%%/python/pygmi/monitor.py
+%%ETCDIR%%/python/pygmi/util.py
+%%ETCDIR%%/python/pyxp/__init__.py
+%%ETCDIR%%/python/pyxp/asyncclient.py
+%%ETCDIR%%/python/pyxp/client.py
+%%ETCDIR%%/python/pyxp/dial.py
+%%ETCDIR%%/python/pyxp/fcall.py
+%%ETCDIR%%/python/pyxp/fields.py
+%%ETCDIR%%/python/pyxp/messages.py
+%%ETCDIR%%/python/pyxp/mux.py
+%%ETCDIR%%/python/pyxp/types.py
+%%ETCDIR%%/python/wmiirc
+%%ETCDIR%%/python/wmiirc.py
+%%ETCDIR%%/ruby/config.rb
+%%ETCDIR%%/ruby/config.yaml
+%%ETCDIR%%/ruby/wmiirc
+%%ETCDIR%%/welcome
+%%ETCDIR%%/wmiirc
 lib/libwmii_hack.so
+man/man1/wimenu.1.gz
+man/man1/wmii.1.gz
+man/man1/wmii9menu.1.gz
+man/man1/wmiir.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/alternative_wmiircs/README
@@ -49,3 +47,9 @@ lib/libwmii_hack.so
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/alternative_wmiircs/plan9port
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/alternative_wmiircs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm %%ETCDIR%%/ruby
+ at dirrm %%ETCDIR%%/python/pyxp
+ at dirrm %%ETCDIR%%/python/pygmi
+ at dirrm %%ETCDIR%%/python
+ at dirrm %%ETCDIR%%/plan9port
+ at dirrm %%ETCDIR%%

More information about the svn-ports-branches mailing list