Date: Tue, 18 Mar 2014 11:21:37 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348533 - head/x11-wm/wmii-devel Message-ID: <201403181121.s2IBLbkj006902@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Mar 18 11:21:37 2014 New Revision: 348533 URL: http://svnweb.freebsd.org/changeset/ports/348533 QAT: https://qat.redports.org/buildarchive/r348533/ Log: In r336942, staging was achieved via `do-install' target, not just written in lengthy, ugly way, but also without need: upstream installation routine supports DESTDIR naturally. Meanwhile, clean Makefile up a bit by sorting knobs, utilize newly added USES+=tar:tbz, and synchronize port description text with `x11-wm/wmii' port. Modified: head/x11-wm/wmii-devel/Makefile head/x11-wm/wmii-devel/pkg-descr head/x11-wm/wmii-devel/pkg-plist Modified: head/x11-wm/wmii-devel/Makefile ============================================================================== --- head/x11-wm/wmii-devel/Makefile Tue Mar 18 11:01:21 2014 (r348532) +++ head/x11-wm/wmii-devel/Makefile Tue Mar 18 11:21:37 2014 (r348533) @@ -4,10 +4,9 @@ PORTNAME= wmii DISTVERSION= 3.9.2 CATEGORIES= x11-wm -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= http://dl.suckless.org/wmii/ GOOGLE_CODE +DISTNAME= ${PORTNAME}+ixp-${DISTVERSION} PKGNAMESUFFIX= -devel -DISTNAME= wmii+ixp-${DISTVERSION} -EXTRACT_SUFX= .tbz MAINTAINER= ports@FreeBSD.org COMMENT= Dynamic, minimalist window manager for X11 @@ -15,22 +14,19 @@ COMMENT= Dynamic, minimalist window mana LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libixp.so:${PORTSDIR}/devel/libixp - -OPTIONS_DEFINE= DOCS - CONFLICTS= wmii-3.6* -USE_BZIP2= yes -USES= pkgconfig +LIB_DEPENDS= libixp.so:${PORTSDIR}/devel/libixp + +USES= pkgconfig tar:tbz USE_XORG= x11 xext xrandr xrender xinerama xft -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}" + CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \ + MAN="${MANPREFIX}/man" DOC="${DOCSDIR}" +MAKE_ENV= noisycc=1 # unmute build commands, useful for logs -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS post-patch: # Link against `devel/libixp' from ports and drop extraneous build options @@ -38,67 +34,4 @@ post-patch: @${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib, ; /^CFLAGS +=/d' \ ${WRKSRC}/config.mk -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: head/x11-wm/wmii-devel/pkg-descr ============================================================================== --- head/x11-wm/wmii-devel/pkg-descr Tue Mar 18 11:01:21 2014 (r348532) +++ head/x11-wm/wmii-devel/pkg-descr Tue Mar 18 11:21:37 2014 (r348533) @@ -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: https://code.google.com/p/wmii/ Modified: head/x11-wm/wmii-devel/pkg-plist ============================================================================== --- head/x11-wm/wmii-devel/pkg-plist Tue Mar 18 11:01:21 2014 (r348532) +++ head/x11-wm/wmii-devel/pkg-plist Tue Mar 18 11:21:37 2014 (r348533) @@ -28,6 +28,12 @@ bin/wmiir %%ETCDIR%%/ruby/wmiirc %%ETCDIR%%/welcome %%ETCDIR%%/wmiirc +@dirrm %%ETCDIR%%/ruby +@dirrm %%ETCDIR%%/python/pyxp +@dirrm %%ETCDIR%%/python/pygmi +@dirrm %%ETCDIR%%/python +@dirrm %%ETCDIR%%/plan9port +@dirrm %%ETCDIR%% lib/libwmii_hack.so man/man1/wimenu.1.gz man/man1/wmii.1.gz @@ -47,9 +53,3 @@ man/man1/wmiir.1.gz %%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?201403181121.s2IBLbkj006902>