Date: Mon, 3 Mar 2014 12:29:45 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346887 - in head/sysutils/fusefs-mhddfs: . files Message-ID: <201403031229.s23CTjkw000596@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Mon Mar 3 12:29:44 2014 New Revision: 346887 URL: http://svnweb.freebsd.org/changeset/ports/346887 QAT: https://qat.redports.org/buildarchive/r346887/ Log: - Support staging - Respect CC - Fix build with clang - USES -> gmake - Use WWW: with a single space - Fix build on 9.x and later - Define DOCS option Added: head/sysutils/fusefs-mhddfs/files/ head/sysutils/fusefs-mhddfs/files/patch-Makefile (contents, props changed) Modified: head/sysutils/fusefs-mhddfs/Makefile head/sysutils/fusefs-mhddfs/pkg-descr Modified: head/sysutils/fusefs-mhddfs/Makefile ============================================================================== --- head/sysutils/fusefs-mhddfs/Makefile Mon Mar 3 12:26:17 2014 (r346886) +++ head/sysutils/fusefs-mhddfs/Makefile Mon Mar 3 12:29:44 2014 (r346887) @@ -11,23 +11,24 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= proler@gmail.com COMMENT= Multi HDD [FUSE] File System -USES= fuse pkgconfig -USE_GMAKE= yes +USES= fuse pkgconfig gmake MAKE_ARGS= WITHOUT_XATTR=1 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAN1= ${PORTNAME}.1 -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} man/man1/mhddfs.1.gz PORTDOCS= README ChangeLog -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + +post-patch: + @${REINPLACE_CMD} -e 's|<sys/vfs.h>|<sys/statvfs.h>|' \ + ${WRKSRC}/src/main.c + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Added: head/sysutils/fusefs-mhddfs/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fusefs-mhddfs/files/patch-Makefile Mon Mar 3 12:29:44 2014 (r346887) @@ -0,0 +1,50 @@ +--- ./Makefile.orig 2014-03-03 13:17:15.751580055 +0100 ++++ ./Makefile 2014-03-03 13:17:55.792585399 +0100 +@@ -83,14 +83,14 @@ + $(shell rpm --eval '%_rpmdir')/*/mhddfs-*$(VERSION)-$(RELEASE)* . + + $(TARGET): obj/obj-stamp $(OBJ) +- gcc $(CFLAGS) $(OBJ) -o $@ $(LDFLAGS) ++ $(CC) $(CFLAGS) $(OBJ) -o $@ $(LDFLAGS) + + obj/obj-stamp: + mkdir -p obj + touch $@ + + obj/%.o: src/%.c +- gcc $(CFLAGS) -c $< -o $@ ++ $(CC) $(CFLAGS) -c $< -o $@ + + clean: + rm -fr obj $(TARGET) pwrite_test statvfs rename +@@ -98,7 +98,7 @@ + rm -fr rename-test/mnt + + rename: tests/rename.c +- gcc -o $@ $< ++ $(CC) -o $@ $< + + release_svn_thread: + @echo current version $(VERSION) +@@ -113,10 +113,10 @@ + screen -t vim vim Makefile src/*.[ch] README* ChangeLog mhddfs.1 + + pwrite_test: src/test/pwrite.c +- gcc -o $@ $< ++ $(CC) -o $@ $< + + statvfs: src/test/statvfs.c +- gcc -o $@ $< ++ $(CC) -o $@ $< + + images-mount: test1.img test2.img + mount|grep -q `pwd`/test1 || sudo mount -o loop test1.img test1 +@@ -160,7 +160,7 @@ + while make test; do echo ok; echo; done + + ptest: +- gcc -o $@ tests/plocks.c -l pthread ++ $(CC) -o $@ tests/plocks.c -l pthread + -./$@ + rm -f $@ + Modified: head/sysutils/fusefs-mhddfs/pkg-descr ============================================================================== --- head/sysutils/fusefs-mhddfs/pkg-descr Mon Mar 3 12:26:17 2014 (r346886) +++ head/sysutils/fusefs-mhddfs/pkg-descr Mon Mar 3 12:29:44 2014 (r346887) @@ -7,4 +7,4 @@ drives or remote file systems. It is lik drive with the most free space to create new files on, and can move data transparently between drives. -WWW: http://mhddfs.uvw.ru/ +WWW: http://mhddfs.uvw.ru/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403031229.s23CTjkw000596>