Date: Tue, 11 Mar 2014 21:48:27 +0200 From: Alex Kozlov <ak@FreeBSD.org> To: Baptiste Daroussin <bapt@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: <20140311194827.GA35387@ravenloft.kiev.ua> In-Reply-To: <20140311134216.GL6900@ithaqua.etoilebsd.net> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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.org>
> > > 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 in the
> > > | commit logs WRT what's exactly is/was broken. Thank you,
> > > Well, what was broken is simple, libarchive can't process the zip file 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:
> >
> > Index: mail/thunderbird-dictionaries/Makefile
> > @@ -15,7 +15,7 @@
> >
> > RUN_DEPENDS= thunderbird>=6.0:${PORTSDIR}/mail/thunderbird
> >
> > -USES= zip:infozip
> > +USES= zip
> > NO_BUILD= yes
> > WRKSRC= ${WRKDIR}/dictionaries
> >
> > @@ -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
> >
> The thing is now everyone can dig for zip:infozip easily and fix them as needed
I randomly checked a few more ports [1].
Can I've permission to fix zip:infozip mess?
[1]:
Index: x11-toolkits/swt/Makefile
@@ -23,7 +23,7 @@
OUTPUT_JAR= swt.jar
USE_GL= yes
-USES= pkgconfig zip:infozip
+USES= pkgconfig zip
USE_GNOME= gtk20
USE_JAVA= yes
JAVA_VERSION= 1.6+
@@ -81,7 +81,7 @@
.endif
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
do-install:
Index: math/physcalc/Makefile
@@ -11,11 +11,10 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Flexible calculator that behaves much like units(1)
-EXTRACT_BEFORE_ARGS= -aq
-EXTRACT_AFTER_ARGS= -x physcalc -d ${WRKDIR}
+EXTRACT_AFTER_ARGS= --exclude physcalc -C ${WRKDIR}
NO_WRKSUBDIR= yes
-USES= zip:infozip
+USES= dos2unix zip
DEFS= -DSHAREDIR="\"${PREFIX}/share/physcalc/\""
SRCS= physconv.c physmain.c physmlib.c physnode.c physoper.c \
Index: security/quantis-kmod/Makefile
@@ -17,8 +17,7 @@
LICENSE_COMB= dual
LICENSE_FILE= ${WRKDIR}/Quantis-${DISTVERSION}/License.txt
-USES= kmod uidfix zip:infozip
-EXTRACT_BEFORE_ARGS= -aqo
+USES= kmod uidfix zip
WRKSRC= ${WRKDIR}/Quantis-${DISTVERSION}/Drivers/Unix/QuantisPci
--
Alex
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140311194827.GA35387>