Date: Thu, 19 Dec 2013 18:04:36 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336942 - in head/x11-wm/wmii-devel: . files Message-ID: <201312191804.rBJI4aL4039335@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Thu Dec 19 18:04:36 2013 New Revision: 336942 URL: http://svnweb.freebsd.org/changeset/ports/336942 Log: - Update MASTER_SITES and WWW: line - Fix build on -current - Add LICENSE - Support staging PR: ports/184824 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Added: head/x11-wm/wmii-devel/files/ head/x11-wm/wmii-devel/files/patch-cmd__Makefile (contents, props changed) head/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile (contents, props changed) head/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile (contents, props changed) Modified: head/x11-wm/wmii-devel/Makefile (contents, props changed) head/x11-wm/wmii-devel/pkg-descr (contents, props changed) head/x11-wm/wmii-devel/pkg-plist (contents, props changed) Modified: head/x11-wm/wmii-devel/Makefile ============================================================================== --- head/x11-wm/wmii-devel/Makefile Thu Dec 19 17:49:36 2013 (r336941) +++ head/x11-wm/wmii-devel/Makefile Thu Dec 19 18:04:36 2013 (r336942) @@ -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@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> Added: head/x11-wm/wmii-devel/files/patch-cmd__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/wmii-devel/files/patch-cmd__Makefile Thu Dec 19 18:04:36 2013 (r336942) @@ -0,0 +1,21 @@ +--- cmd/Makefile..orig ++++ cmd/Makefile +@@ -20,14 +20,14 @@ + include $(ROOT)/mk/many.mk + include $(ROOT)/mk/dir.mk + +-OWMIIR=wmiir.o $(OFILES) $(LIBIXP) ++OWMIIR=wmiir.o $(OFILES) + wmiir.out: $(OWMIIR) +- $(LINK) $@ $(OWMIIR) ++ $(LINK) $@ $(OWMIIR) $(LIBIXP) + + wmii/x11.o wmii/xext.o wmii/geom.o wmii/map.o: dall + true + +-O9MENU=wmii9menu.o clientutil.o wmii/x11.o wmii/xext.o wmii/geom.o wmii/map.o $(OFILES) $(LIBIXP) ++O9MENU=wmii9menu.o clientutil.o wmii/x11.o wmii/xext.o wmii/geom.o wmii/map.o $(OFILES) + wmii9menu.out: $(O9MENU) +- $(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xinerama) -lXext ++ $(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xrender xinerama) -lXext $(LIBIXP) + Added: head/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile Thu Dec 19 18:04:36 2013 (r336942) @@ -0,0 +1,13 @@ +--- cmd/menu/Makefile.orig ++++ cmd/menu/Makefile +@@ -14,8 +14,8 @@ + + PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama + +-LIB = $(LIBIXP) +-LIBS += -lm $(LIBS9) ++LIBS += $(LIBIXP) ++LIBS += -lm $(LIBS9) $(LIBIXP) + CFLAGS += -DIXP_NEEDAPI=86 + OBJ = main \ + caret \ Added: head/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile Thu Dec 19 18:04:36 2013 (r336942) @@ -0,0 +1,11 @@ +--- cmd/wmii/Makefile.orig ++++ cmd/wmii/Makefile +@@ -9,7 +9,7 @@ + + PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama + +-LIB = $(LIBIXP) ++LIBS += $(LIBIXP) + LIBS += -lm $(LIBS9) + + CFLAGS += $(INCICONV) -DIXP_NEEDAPI=97 Modified: head/x11-wm/wmii-devel/pkg-descr ============================================================================== --- head/x11-wm/wmii-devel/pkg-descr Thu Dec 19 17:49:36 2013 (r336941) +++ head/x11-wm/wmii-devel/pkg-descr Thu Dec 19 18:04:36 2013 (r336942) @@ -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: head/x11-wm/wmii-devel/pkg-plist ============================================================================== --- head/x11-wm/wmii-devel/pkg-plist Thu Dec 19 17:49:36 2013 (r336941) +++ head/x11-wm/wmii-devel/pkg-plist Thu Dec 19 18:04:36 2013 (r336942) @@ -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 -@dirrm etc/wmii/ruby -@dirrm etc/wmii/python/pyxp -@dirrm etc/wmii/python/pygmi -@dirrm etc/wmii/python -@dirrm etc/wmii/plan9port -@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%% +@dirrm %%ETCDIR%%/ruby +@dirrm %%ETCDIR%%/python/pyxp +@dirrm %%ETCDIR%%/python/pygmi +@dirrm %%ETCDIR%%/python +@dirrm %%ETCDIR%%/plan9port +@dirrm %%ETCDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312191804.rBJI4aL4039335>