Date: Mon, 02 Dec 2013 07:26:48 -0200 From: Renato Botelho <garga@FreeBSD.org> To: Hiroki Sato <hrs@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r335453 - in head/x11-wm: libwraster windowmaker windowmaker/files Message-ID: <529C5258.4010004@FreeBSD.org> In-Reply-To: <201312020716.rB27GVIe095673@svn.freebsd.org> References: <201312020716.rB27GVIe095673@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --7MU8fTOqNXXphLDWpA7i8tCdpRHU9uhbB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 02-12-2013 05:16, Hiroki Sato wrote: > Author: hrs > Date: Mon Dec 2 07:16:31 2013 > New Revision: 335453 > URL: http://svnweb.freebsd.org/changeset/ports/335453 >=20 > Log: > - Update to 0.95.5. > - Use new syntax in LIB_DEPENDS. > - Add STAGEDIR support. > - USE ${opt}_FOO for OPTIONS. > =20 > PR: ports/184359 >=20 > Deleted: > head/x11-wm/windowmaker/files/patch-WINGs__proplist.c > head/x11-wm/windowmaker/files/patch-configure > Modified: > head/x11-wm/libwraster/Makefile > head/x11-wm/libwraster/distinfo > head/x11-wm/libwraster/pkg-plist (contents, props changed) > head/x11-wm/windowmaker/Makefile > head/x11-wm/windowmaker/distinfo > head/x11-wm/windowmaker/pkg-plist >=20 > Modified: head/x11-wm/libwraster/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/x11-wm/libwraster/Makefile Mon Dec 2 05:42:56 2013 (r335452) > +++ head/x11-wm/libwraster/Makefile Mon Dec 2 07:16:31 2013 (r335453) > @@ -1,8 +1,7 @@ > # $FreeBSD$ > =20 > PORTNAME=3D libwraster > -PORTVERSION=3D 0.95.4 > -PORTREVISION=3D 1 > +PORTVERSION=3D 0.95.5 > CATEGORIES=3D x11-wm windowmaker > MASTER_SITES=3D http://windowmaker.org/pub/%SUBDIR%/ > MASTER_SITE_SUBDIR=3D source/release > @@ -13,10 +12,10 @@ COMMENT=3D Window Maker raster graphics li > =20 > LICENSE=3D LGPL21 > =20 > -LIB_DEPENDS=3D gif:${PORTSDIR}/graphics/giflib \ > - png15:${PORTSDIR}/graphics/png \ > - jbig:${PORTSDIR}/graphics/jbigkit \ > - tiff:${PORTSDIR}/graphics/tiff > +LIB_DEPENDS=3D libgif.so:${PORTSDIR}/graphics/giflib \ > + libpng15.so:${PORTSDIR}/graphics/png \ > + libjbig.so:${PORTSDIR}/graphics/jbigkit \ > + libtiff.so:${PORTSDIR}/graphics/tiff > =20 > USES=3D pathfix pkgconfig > USE_AUTOTOOLS=3D libtool > @@ -37,12 +36,11 @@ LDFLAGS+=3D -L${LOCALBASE}/lib > =20 > MAN1=3D get-wraster-flags.1 > =20 > -NO_STAGE=3D yes > pre-build: > cd ${WRKSRC} && ${MAKE} config-paths.h > =20 > post-install: > - cd ${WRKSRC}/doc \ > - && ${INSTALL_MAN} get-wraster-flags.1 ${MANPREFIX}/man/man1 > + cd ${WRKSRC}/doc && ${INSTALL_MAN} \ > + get-wraster-flags.1 ${STAGEDIR}${MANPREFIX}/man/man1 > =20 > .include <bsd.port.mk> >=20 > Modified: head/x11-wm/libwraster/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/x11-wm/libwraster/distinfo Mon Dec 2 05:42:56 2013 (r335452) > +++ head/x11-wm/libwraster/distinfo Mon Dec 2 07:16:31 2013 (r335453) > @@ -1,2 +1,2 @@ > -SHA256 (WindowMaker-0.95.4.tar.gz) =3D 2bea97f00570f05ff115d147457c16a= befe496a4fc882a027152ce592d768e45 > -SIZE (WindowMaker-0.95.4.tar.gz) =3D 2789390 > +SHA256 (WindowMaker-0.95.5.tar.gz) =3D 4b25f474fde032a060c93fbc50f1ce0= 4729ab17ea963ca3eb8dbb82f49af70d0 > +SIZE (WindowMaker-0.95.5.tar.gz) =3D 2927995 >=20 > Modified: head/x11-wm/libwraster/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/x11-wm/libwraster/pkg-plist Mon Dec 2 05:42:56 2013 (r335452)= > +++ head/x11-wm/libwraster/pkg-plist Mon Dec 2 07:16:31 2013 (r335453)= > @@ -6,3 +6,4 @@ lib/libwraster.la > lib/libwraster.so > lib/libwraster.so.4 > libdata/pkgconfig/wrlib.pc > +man/man1/get-wraster-flags.1.gz >=20 > Modified: head/x11-wm/windowmaker/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/x11-wm/windowmaker/Makefile Mon Dec 2 05:42:56 2013 (r335452)= > +++ head/x11-wm/windowmaker/Makefile Mon Dec 2 07:16:31 2013 (r335453)= > @@ -2,8 +2,7 @@ > # $FreeBSD$ > =20 > PORTNAME=3D windowmaker > -PORTVERSION=3D 0.95.4 > -PORTREVISION=3D 1 > +PORTVERSION=3D 0.95.5 > CATEGORIES=3D x11-wm windowmaker > MASTER_SITES=3D http://windowmaker.org/pub/%SUBDIR%/ > MASTER_SITE_SUBDIR=3D source/release > @@ -14,17 +13,19 @@ COMMENT=3D GNUstep-compliant NeXTstep wind > =20 > LICENSE=3D GPLv2 > =20 > -LIB_DEPENDS=3D gif:${PORTSDIR}/graphics/giflib \ > - png15:${PORTSDIR}/graphics/png \ > - jbig:${PORTSDIR}/graphics/jbigkit \ > - tiff:${PORTSDIR}/graphics/tiff \ > - wraster:${PORTSDIR}/x11-wm/libwraster > -RUN_DEPENDS=3D ${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/sty= le:${PORTSDIR}/graphics/wmicons > +LIB_DEPENDS=3D libgif.so:${PORTSDIR}/graphics/giflib \ > + libpng15.so:${PORTSDIR}/graphics/png \ > + libjbig.so:${PORTSDIR}/graphics/jbigkit \ > + libtiff.so:${PORTSDIR}/graphics/tiff \ > + libwraster.so:${PORTSDIR}/x11-wm/libwraster > +RUN_DEPENDS=3D libwraster>=3D${PORTVERSION}:${PORTSDIR}/x11-wm/libwras= ter \ > + ${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR= }/graphics/wmicons > =20 > USES=3D pathfix perl5 pkgconfig > USE_AUTOTOOLS=3D libtool > USE_LDCONFIG=3D yes > USE_XORG=3D xft xinerama xmu xpm > +CONFIGURE_ENV=3D ac_cv_header_sys_inotify_h=3Dno > CONFIGURE_ARGS=3D --with-pixmapdir=3D${PREFIX}/include/X11/pixmaps \ > --with-nlsdir=3D${PREFIX}/share/locale \ > --with-libs-from=3D"-L${LOCALBASE}/lib" \ > @@ -37,56 +38,33 @@ CPPFLAGS+=3D -DPREFIX=3D\\\"${PREFIX}\\\" -I > LDFLAGS+=3D -L${LOCALBASE}/lib > PORTDOCS=3D AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \ > INSTALL-WMAKER NEWS README README.definable-cursor TODO > +LINGUAS=3D be bg bs ca cs da de el es et fi fr gl hr hu hy it \ > + ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW > =20 > OPTIONS_DEFINE=3D DOCS NLS XRANDR > +OPTIONS_SUB=3D NLS This option is boolean, when OPTIONS_SUB is set, all OPTIONS will be defined in PLIST_SUB, you are not supposed to choose which you want. I made the same misunderstanding some time ago. > +NLS_USES=3D gettext > +NLS_CONFIGURE_ENV=3D LINGUAS=3D"${LINGUAS}" > +NLS_CONFIGURE_ENABLE=3D locale > +XRANDR_USE=3D XORG=3Dxrandr > +XRANDR_CONFIGURE_ENABLE=3D xrandr > =20 > -NO_STAGE=3D yes > -.include <bsd.port.options.mk> > +.include <bsd.port.pre.mk> > =20 > .if ${ARCH} =3D=3D amd64 && ${OSVERSION} < 800000 > CONFIGURE_ENV+=3D ac_cv_c_inline_asm=3Dno > .endif > - > .if ${OSVERSION} < 800000 > CPPFLAGS+=3D -DHAVE_SYS_SELECT_H > .endif > =20 > -.if ${PORT_OPTIONS:MNLS} > -USES+=3D gettext > -LINGUAS=3D be bg bs ca cs da de el es et fi fr gl hr hu hy it \ > - ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW > -CONFIGURE_ENV+=3D LINGUAS=3D"${LINGUAS}" > -PLIST_SUB=3D NLS=3D"" > -.else > -CONFIGURE_ARGS+=3D--disable-locale > -PLIST_SUB=3D NLS=3D"@comment " > -.endif > - > -.if ${PORT_OPTIONS:MXRANDR} > -USE_XORG+=3D xrandr > -CONFIGURE_ARGS+=3D--enable-xrandr > -.endif > - > -MANLANG=3D "" cs sk ru > -MAN1_EN=3D geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1= x \ > - wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x get-wings-flags.1 \ > - get-wutil-flags.1 wdread.1 WindowMaker.1x wmagnify.1x \ > - wmgenmenu.1 wmmenugen.1 WPrefs.1x > -MAN8_EN=3D upgrade-windowmaker-defaults.8 > -MAN1_CS=3D geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x= \ > - wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x > -MAN1_SK=3D geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x= \ > - wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x > -MAN1_RU=3D geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x= \ > - wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x > - > post-install: > @${MKDIR} \ > - ${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \ > - ${PREFIX}/share/WindowMaker/Sounds > + ${STAGEDIR}${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \ > + ${STAGEDIR}${PREFIX}/share/WindowMaker/Sounds > .if ${PORT_OPTIONS:MDOCS} You can just drop this conditional, since it's now staged, all files can be installed and in the time package is built they will be dropped Regards --=20 Renato Botelho <garga @ FreeBSD.org> <garga.bsd @ gmail.com> GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc --7MU8fTOqNXXphLDWpA7i8tCdpRHU9uhbB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCgAGBQJSnFJYAAoJEPHw56GfYleQMCgP/A4kRi0XLWt834atfUw7DUN6 IOpNK72XcNVwuFDL8nEFKxtE+AenHTijv3+kvRyuJ6RxzHbtYbOx6i3bsYJ5cJdh lRAPieGJaRJRzaY40T1afTUuoRfoP/ZhqFcsIRhCcxjayNqbSFqvjJUd/JEdjgA9 PJeG6h1oibO7pqzMJzI6wWATAf7MTTO9JGdhDMr9xEHQsZ4GbE70riTLnZ5o6YKk 4/uE8aPDEtnwZ2SKZ1YvZn/kZUvO+Vs55ZLJMMp3Wy3/man7IC+LxFYyJGFEoCHB x7ZUlcXkRXKcCHcB1z2sdZJtel30XDZkAIv1BWhlXRDSiczwXHV4cwwsqpehuC2u FUoXsq6nkBSGaL4sebHCEsSIHzJyf1wv19at48UqWypnyFwTBh39WQWFFFfXbDxd cWosXzcR5iNJh411paVCmKL1iDe8E+wmV6axozPaox7A4xr5eY2bbAFR/6KlR0OJ SXwVVTzMGVpPmPbZqI3kXx6FCYrA6/UduWFvnS0sjN6DB3mzrUdElxSGTBlAB37Q 2IZezwbDq3la1gtI+yUNqy/shkddThgJugtnHoWtoXlceg3ywI6VZuNEPEJkuK7c TmAhEbbRs7VGwfhvn0QaFHR0bqq3Jy7EoB7WgOi1TDVfmdW/Ytc8xXuAy8/rhMgJ KM4PsZ0xhTqMMqdQP4ag =1id0 -----END PGP SIGNATURE----- --7MU8fTOqNXXphLDWpA7i8tCdpRHU9uhbB--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?529C5258.4010004>