Index: head/sysutils/rinse/Makefile =================================================================== --- head/sysutils/rinse/Makefile (revision 384908) +++ head/sysutils/rinse/Makefile (revision 384909) @@ -1,63 +1,61 @@ # $FreeBSD$ PORTNAME= rinse -PORTVERSION= 3.0.6 +PORTVERSION= 3.0.9 CATEGORIES= sysutils MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= jbeich@FreeBSD.org COMMENT= Install RPM-based system into a directory LICENSE= ARTPERL10 RUN_DEPENDS= p5-Term-Size>0:${PORTSDIR}/devel/p5-Term-Size \ p5-libwww>0:${PORTSDIR}/www/p5-libwww -PORTSCOUT= skipv:3.0.7 # only debian/control changed - NO_ARCH= yes NO_BUILD= yes -USES= perl5 shebangfix +USES= perl5 shebangfix tar:xz USE_PERL5= run SHEBANG_FILES= bin/* tests/* MAKE_ARGS= PREFIX="${STAGEDIR}${PREFIX}" VERSION=${DISTVERSION} DATADIR= ${PREFIX}/lib/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME} ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= requires linuxulator to register rpms .include .if ${OPSYS} == DragonFly IGNORE= requires linuxulator to register rpms .endif post-extract: ${MV} ${WRKSRC}/etc/rinse.conf ${WRKSRC}/etc/rinse.conf.sample post-patch: ${REINPLACE_CMD} -e 's,/usr,,g' \ -e 's,/share/man,/man,g' \ -e '/cache/s/PREFIX/DESTDIR/' \ -e '/^include VERSION/d' \ -e '/scripts\.common/s/*/&.sh/' \ -e 's/\.conf/&.sample/' \ ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ -e 's,/usr/lib,${PREFIX}/lib,g' \ ${WRKSRC}/bin/${PORTNAME} \ ${WRKSRC}/misc/${PORTNAME} # mount flags and /dev are different, drop duplicates and add missing ${REINPLACE_CMD} -e 's,-o bind $$i,-t lin$${i#/}fs none,' \ ${WRKSRC}/scripts.common/15-mount-proc.sh ${REINPLACE_CMD} -Ee 's/sed -i/& ""/' \ -e '/mknod.*dev/d' \ -e '/chroot.*MAKEDEV/d' \ -e '/-o bind.*(proc|sys)/d' \ -e '/umount.*proc/ { p; s/proc/dev/p; \ s/dev/sys/; N; /(.*)\n\1/!P; g; }' \ ${WRKSRC}/scripts/*/post-install.sh .include Index: head/sysutils/rinse/distinfo =================================================================== --- head/sysutils/rinse/distinfo (revision 384908) +++ head/sysutils/rinse/distinfo (revision 384909) @@ -1,2 +1,2 @@ -SHA256 (rinse_3.0.6.tar.gz) = a4821ec18720168bade8aa336bde110fd265b65dc04ad76069de8ad68bd626a1 -SIZE (rinse_3.0.6.tar.gz) = 30068 +SHA256 (rinse_3.0.9.tar.xz) = 05dd734bfe6dea321596acc9e898eeadd535a0ceb3ea7004aa70372843c326ad +SIZE (rinse_3.0.9.tar.xz) = 25940 Index: head/sysutils/rinse/files/patch-bin__rinse =================================================================== --- head/sysutils/rinse/files/patch-bin__rinse (revision 384908) +++ head/sysutils/rinse/files/patch-bin__rinse (revision 384909) @@ -1,29 +1,29 @@ --- bin/rinse~ +++ bin/rinse @@ -334,7 +334,7 @@ exit; sub testSetup { - my @required = qw/ rpm rpm2cpio wget /; + my @required = qw/ bsdtar fetch /; foreach my $file (@required) { if ( ( !-x "/bin/$file" ) && ( !-x "/usr/bin/$file" ) ) { @@ -840,7 +840,7 @@ sub downloadPackagesToDirectory { print $msg; # download - unless already present. - system("wget --quiet -O $dir/$key $links{ $key }") unless -e "$dir/$key"; + system("fetch -w10 -qo $dir/$key $links{ $key }") unless -e "$dir/$key"; next PACKAGE; } print "[Harmless] Failed to find download link for $package\n"; @@ -1147,7 +1147,7 @@ sub unpackPackages { # Run the unpacking command. # my $cmd = -- "rpm2cpio $file | (cd $CONFIG{'directory'} ; cpio --extract --make-directories --no-absolute-filenames --preserve-modification-time) 2>/dev/null >/dev/null"; +- "rpm2cpio $file | (cd $CONFIG{'directory'} ; cpio --extract --extract-over-symlinks --make-directories --no-absolute-filenames --preserve-modification-time) 2>/dev/null >/dev/null"; + "bsdtar xPf $file --chroot -C $CONFIG{'directory'}"; if ( $file =~ /(fedora|centos|redhat|mandriva)-release-/ ) { my $rpmname = basename($file); $postcmd =