Date: Sat, 7 Feb 2015 13:04:39 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378590 - in head: . sysutils sysutils/avfs sysutils/avfs/files Message-ID: <201502071304.t17D4dJ9083937@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Sat Feb 7 13:04:38 2015 New Revision: 378590 URL: https://svnweb.freebsd.org/changeset/ports/378590 QAT: https://qat.redports.org/buildarchive/r378590/ Log: sysutils/avfs: Revive and update version 0.9.9=>1.0.2 - Unbreak - Pass maintainership to submitter - Add LICENSE(LGPL20 GPLv2) - Remove OPTIONS LIBRARY to make default as most of the dependent ports require the library - Make proper use of OPTIONSNG to declutter ${PORT_OPTIONS:M*} PR: 196942 Differential Revision: https://reviews.freebsd.org/D1795 Submitted by: mp39590@gmail.com Approved by: marino(mentor) Added: head/sysutils/avfs/ - copied from r323741, head/sysutils/avfs/ head/sysutils/avfs/files/patch-scripts_mountavs (contents, props changed) head/sysutils/avfs/files/patch-scripts_umountavs (contents, props changed) head/sysutils/avfs/files/patch-src_Makefile.in (contents, props changed) Deleted: head/sysutils/avfs/files/patch-configure Modified: head/MOVED head/sysutils/Makefile head/sysutils/avfs/Makefile head/sysutils/avfs/distinfo head/sysutils/avfs/pkg-descr head/sysutils/avfs/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Sat Feb 7 12:44:13 2015 (r378589) +++ head/MOVED Sat Feb 7 13:04:38 2015 (r378590) @@ -4821,7 +4821,6 @@ comms/hso-kmod||2013-08-26|Has expired: lang/ldc-devel||2013-08-27|Has expired: Broken for more than 6 month www/mod_smooth_streaming||2013-08-27|Has expired: Broken for more than 6 month www/p5-Apache2-Scoreboard||2013-08-27|Has expired: Broken for more than 6 month -sysutils/avfs||2013-08-27|Has expired: Broken for more than 6 month multimedia/mp4split||2013-08-27|Has expired: Broken for more than 6 month net-mgmt/noc||2013-08-27|Has expired: Broken for more than 6 month sysutils/empower||2013-08-27|Has expired: Broken for more than 6 month Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Sat Feb 7 12:44:13 2015 (r378589) +++ head/sysutils/Makefile Sat Feb 7 13:04:38 2015 (r378590) @@ -48,6 +48,7 @@ SUBDIR += automount SUBDIR += automounter SUBDIR += autopsy + SUBDIR += avfs SUBDIR += azure-agent SUBDIR += b43-fwcutter SUBDIR += backuppc Modified: head/sysutils/avfs/Makefile ============================================================================== --- head/sysutils/avfs/Makefile Fri Jul 26 17:52:24 2013 (r323741) +++ head/sysutils/avfs/Makefile Sat Feb 7 13:04:38 2015 (r378590) @@ -2,54 +2,34 @@ # $FreeBSD$ PORTNAME= avfs -PORTVERSION= 0.9.9 +PORTVERSION= 1.0.2 CATEGORIES= sysutils MASTER_SITES= SF/avf/${PORTNAME}/${PORTVERSION} -MAINTAINER= jirnov@gmail.com -COMMENT= A Virtual File System +MAINTAINER= mp39590@gmail.com +COMMENT= Virtual File System library -BUILD_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash +# FUSE daemon is licensed as GPLv2, shared library is LGPLv2 +LICENSE= LGPL20 GPLv2 +LICENSE_COMB= multi -BROKEN= does not package - -NO_INSTALL_MANPAGES= yes - -CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv - -GNU_CONFIGURE= yes -USES= fuse -USE_GMAKE= yes -USE_BZIP2= yes +USES= libtool pkgconfig tar:bz2 USE_LDCONFIG= yes +GNU_CONFIGURE= yes -OPTIONS_DEFINE= DEBUG LIBRARY FUSE -OPTIONS_DEFAULT= FUSE -LIBRARY_DESC= Enable library -FUSE_DESC= Enable fuse - -.include <bsd.port.options.mk> +INSTALL_TARGET= install-strip -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-debug -.else -CONFIGURE_ARGS+= --disable-debug -.endif +OPTIONS_DEFINE= DEBUG FUSE +OPTIONS_SUB= yes +DEBUG_CONFIGURE_ENABLE= debug +FUSE_CONFIGURE_ENABLE= fuse +FUSE_USES= fuse shebangfix +FUSE_RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash -.if ${PORT_OPTIONS:MLIBRARY} -CONFIGURE_ARGS+= --enable-library -PLIST_SUB+= LIBRARY="" -.else -CONFIGURE_ARGS+= --disable-library -PLIST_SUB+= LIBRARY="@comment " -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MFUSE} -CONFIGURE_ARGS+= --enable-fuse -PLIST_SUB+= FUSE="" -.else -CONFIGURE_ARGS+= --disable-fuse -PLIST_SUB+= FUSE="@comment " +SHEBANG_FILES= scripts/umountavfs scripts/mountavfs .endif .include <bsd.port.mk> Modified: head/sysutils/avfs/distinfo ============================================================================== --- head/sysutils/avfs/distinfo Fri Jul 26 17:52:24 2013 (r323741) +++ head/sysutils/avfs/distinfo Sat Feb 7 13:04:38 2015 (r378590) @@ -1,2 +1,2 @@ -SHA256 (avfs-0.9.9.tar.bz2) = 5e3100e99f6e136158a0d33045649959f830ddd31d57ec02f9e70cca421196cb -SIZE (avfs-0.9.9.tar.bz2) = 678451 +SHA256 (avfs-1.0.2.tar.bz2) = 52693953e8290281d441a898040c5ac2989f11bc1fcb83ca5063c37a125a1c9a +SIZE (avfs-1.0.2.tar.bz2) = 723051 Added: head/sysutils/avfs/files/patch-scripts_mountavs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/avfs/files/patch-scripts_mountavs Sat Feb 7 13:04:38 2015 (r378590) @@ -0,0 +1,11 @@ +--- scripts/mountavfs.orig 2015-02-07 16:14:05.773404035 +0600 ++++ scripts/mountavfs 2015-02-07 16:14:56.488399333 +0600 +@@ -14,7 +14,7 @@ + MntDir=${HOME}/.avfs + fi + +-grep -qE "avfsd ${MntDir}" /proc/mounts || { ++mount -p | grep -qE "${MntDir}.*fusefs" || { + if [ ! -e "$MntDir" ]; then + mkdir -p "$MntDir" + fi Added: head/sysutils/avfs/files/patch-scripts_umountavs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/avfs/files/patch-scripts_umountavs Sat Feb 7 13:04:38 2015 (r378590) @@ -0,0 +1,16 @@ +--- scripts/umountavfs.orig 2015-02-07 16:14:17.372402564 +0600 ++++ scripts/umountavfs 2015-02-07 16:15:29.270400346 +0600 +@@ -14,11 +14,11 @@ + MntDir="${HOME}/.avfs" + fi + +-grep -qE "${MntDir}.*avfsd" /proc/mounts && { ++mount -p | grep -qE "${MntDir}.*fusefs" && { + echo unMounting AVFS on $MntDir... + if type -p fusermount > /dev/null 2>&1 ; then + fusermount -u -z "$MntDir" + else +- umount -l "$MntDir" ++ umount "$MntDir" + fi + } Added: head/sysutils/avfs/files/patch-src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/avfs/files/patch-src_Makefile.in Sat Feb 7 13:04:38 2015 (r378590) @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2015-02-06 18:18:35.275843385 +0600 ++++ src/Makefile.in 2015-02-06 18:19:48.038837253 +0600 +@@ -680,7 +680,7 @@ + tags tags-am uninstall uninstall-am + + +-$(srcdir)/utils.c: info.h ++utils.c: info.h + + info.h: + rm -f info.h Modified: head/sysutils/avfs/pkg-descr ============================================================================== --- head/sysutils/avfs/pkg-descr Fri Jul 26 17:52:24 2013 (r323741) +++ head/sysutils/avfs/pkg-descr Sat Feb 7 13:04:38 2015 (r378590) @@ -2,4 +2,9 @@ AVFS is a system, which enables all prog zip, etc. files or view remote (ftp, http, dav, etc.) files, without recompiling the programs. +Shared library and FUSE daemon are provided. + +AVFS is (C) under the GNU GPL. The shared library supporting AVFS with +LD_PRELOAD is (C) under the GNU LGPL. + WWW: http://avf.sourceforge.net/ Modified: head/sysutils/avfs/pkg-plist ============================================================================== --- head/sysutils/avfs/pkg-plist Fri Jul 26 17:52:24 2013 (r323741) +++ head/sysutils/avfs/pkg-plist Sat Feb 7 13:04:38 2015 (r378590) @@ -1,11 +1,11 @@ -%%LIBRARY%%bin/avfs-config +bin/avfs-config %%FUSE%%bin/avfsd bin/davpass bin/ftppass %%FUSE%%bin/mountavfs %%FUSE%%bin/umountavfs include/avfs.h -%%LIBRARY%%include/virtual.h +include/virtual.h lib/avfs/extfs/README lib/avfs/extfs/a lib/avfs/extfs/apt @@ -26,27 +26,25 @@ lib/avfs/extfs/rpm lib/avfs/extfs/rpms lib/avfs/extfs/trpm lib/avfs/extfs/u7z +lib/avfs/extfs/uace +lib/avfs/extfs/uadf lib/avfs/extfs/uar +lib/avfs/extfs/uarc lib/avfs/extfs/uarj +lib/avfs/extfs/uc1541 +lib/avfs/extfs/ucab lib/avfs/extfs/ucpio +lib/avfs/extfs/udar lib/avfs/extfs/uha +lib/avfs/extfs/uimg lib/avfs/extfs/ulha -lib/avfs/extfs/urar -lib/avfs/extfs/uzip -lib/avfs/extfs/uzoo -lib/avfs/extfs/uace -lib/avfs/extfs/uc1541 lib/avfs/extfs/upp +lib/avfs/extfs/urar lib/avfs/extfs/uxdms lib/avfs/extfs/uxpk -lib/avfs/extfs/uadf -lib/avfs/extfs/uarc -lib/avfs/extfs/ucab -lib/avfs/extfs/udar -lib/avfs/extfs/uimg -%%LIBRARY%%lib/libavfs.a -%%LIBRARY%%lib/libavfs.la -%%LIBRARY%%lib/libavfs.so -%%LIBRARY%%lib/libavfs.so.0 -@dirrm lib/avfs/extfs -@dirrm lib/avfs +lib/avfs/extfs/uzip +lib/avfs/extfs/uzoo +lib/libavfs.a +lib/libavfs.so +lib/libavfs.so.0 +lib/libavfs.so.0.0.2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502071304.t17D4dJ9083937>