Date: Tue, 11 Mar 2014 21:40:43 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Alex Kozlov <ak@FreeBSD.org> Cc: Mathieu Arnold <mat@FreeBSD.org>, svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r347857 - head/mail/thunderbird-dictionaries Message-ID: <20140311204042.GM6900@ithaqua.etoilebsd.net> In-Reply-To: <20140311194827.GA35387@ravenloft.kiev.ua> References: <201403110640.s2B6eMDI022100@svn.freebsd.org> <20140311090000.GB78846@FreeBSD.org> <7E2CA333BD6C7A70FD270041@atuin.in.mat.cc> <20140311133443.GA26313@ravenloft.kiev.ua> <20140311134216.GL6900@ithaqua.etoilebsd.net> <20140311194827.GA35387@ravenloft.kiev.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
--Tnj+unmjHTqEM5y0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Tue, Mar 11, 2014 at 09:48:27PM +0200, Alex Kozlov wrote:
> On Tue, Mar 11, 2014 at 02:42:16PM +0100, Baptiste Daroussin wrote:
> > On Tue, Mar 11, 2014 at 03:34:43PM +0200, Alex Kozlov wrote:
> > > On Tue, Mar 11, 2014 at 10:10:43AM +0100, Mathieu Arnold wrote:
> > > > +--On 11 mars 2014 09:00:00 +0000 Alexey Dokuchaev <danfe@FreeBSD.o=
rg>
> > > > wrote:
> > > > | The way it's done now generates lots of needless mail traffic and=
repo
> > > > | churn. It would also be nice if you could provide some details i=
n the
> > > > | commit logs WRT what's exactly is/was broken. Thank you,
> > > > Well, what was broken is simple, libarchive can't process the zip f=
ile from
> > > > the distfiles, and the port needs to use the unzip command.
> > > I think that in some (many?) cases problem is not in libarchive, but =
is in
> > > the difference between tar and unzip. E.g for this port:
> > >=20
> > > Index: mail/thunderbird-dictionaries/Makefile
> > > @@ -15,7 +15,7 @@
> > > =20
> > > RUN_DEPENDS=3D thunderbird>=3D6.0:${PORTSDIR}/mail/thunderbird
> > > =20
> > > -USES=3D zip:infozip
> > > +USES=3D zip
> > > NO_BUILD=3D yes
> > > WRKSRC=3D ${WRKDIR}/dictionaries
> > > =20
> > > @@ -58,7 +58,8 @@
> > > @${MKDIR} ${WRKSRC}
> > > .for f in ${ALLDICTS}
> > > .if ${PORT_OPTIONS:M${f}}
> > > - @${UNZIP_CMD} -q ${DISTDIR}/${DIST_SUBDIR}/${${f}_FILE} -d ${WRKSRC=
}/${${f}_FILE}
> > > + @${MKDIR} ${WRKSRC}/${${f}_FILE}
> > > + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/${=
${f}_FILE} -C ${WRKSRC}/${${f}_FILE}
> > > .endif
> > > .endfor
> > > =20
> > The thing is now everyone can dig for zip:infozip easily and fix them a=
s needed
> I randomly checked a few more ports [1].
> Can I've permission to fix zip:infozip mess?
>=20
> [1]:
> Index: x11-toolkits/swt/Makefile
> @@ -23,7 +23,7 @@
> OUTPUT_JAR=3D swt.jar
> =20
> USE_GL=3D yes
> -USES=3D pkgconfig zip:infozip
> +USES=3D pkgconfig zip
> USE_GNOME=3D gtk20
> USE_JAVA=3D yes
> JAVA_VERSION=3D 1.6+
> @@ -81,7 +81,7 @@
> .endif
> =20
> post-extract:
> - @(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
> + @(cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} src.zip)
> @${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
> =20
> do-install:
> Index: math/physcalc/Makefile
> @@ -11,11 +11,10 @@
> MAINTAINER=3D ports@FreeBSD.org
> COMMENT=3D Flexible calculator that behaves much like units(1)
> =20
> -EXTRACT_BEFORE_ARGS=3D -aq
> -EXTRACT_AFTER_ARGS=3D -x physcalc -d ${WRKDIR}
> +EXTRACT_AFTER_ARGS=3D --exclude physcalc -C ${WRKDIR}
> =20
> NO_WRKSUBDIR=3D yes
> -USES=3D zip:infozip
> +USES=3D dos2unix zip
> =20
> DEFS=3D -DSHAREDIR=3D"\"${PREFIX}/share/physcalc/\""
> SRCS=3D physconv.c physmain.c physmlib.c physnode.c physoper.c \
> Index: security/quantis-kmod/Makefile
> @@ -17,8 +17,7 @@
> LICENSE_COMB=3D dual
> LICENSE_FILE=3D ${WRKDIR}/Quantis-${DISTVERSION}/License.txt
> =20
> -USES=3D kmod uidfix zip:infozip
> -EXTRACT_BEFORE_ARGS=3D -aqo
> +USES=3D kmod uidfix zip
> =20
> WRKSRC=3D ${WRKDIR}/Quantis-${DISTVERSION}/Drivers/Unix/QuantisPci
> =20
>=20
> --=20
> Alex
>=20
Sure, just make sure extraction work on freebsd 8.3 ;)
regards,
Bapt
--Tnj+unmjHTqEM5y0
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEARECAAYFAlMfdMoACgkQ8kTtMUmk6EwQWQCfWX7ksSbFXANCkkPcij5FKru8
+gAAnjw7tJIkK53n6Ih+WNMnb0dtugK6
=8pcD
-----END PGP SIGNATURE-----
--Tnj+unmjHTqEM5y0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140311204042.GM6900>