Date: Wed, 13 Nov 2013 12:50:18 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333680 - in head/sysutils: filedupe fileschanged fortunelock fortunelock/files fusefs-cryptofs fusefs-funionfs fusefs-fur fusefs-fusepak fusefs-gnome-vfs fusefs-httpfs fusefs-ntfs fuse... Message-ID: <201311131250.rADCoIFI027343@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Wed Nov 13 12:50:18 2013 New Revision: 333680 URL: http://svnweb.freebsd.org/changeset/ports/333680 Log: Support STAGEDIR. Added: head/sysutils/fileschanged/pkg-plist (contents, props changed) head/sysutils/fusefs-cryptofs/pkg-plist (contents, props changed) Modified: head/sysutils/filedupe/Makefile head/sysutils/fileschanged/Makefile head/sysutils/fortunelock/Makefile head/sysutils/fortunelock/files/patch-aa head/sysutils/fusefs-cryptofs/Makefile head/sysutils/fusefs-funionfs/Makefile head/sysutils/fusefs-fur/Makefile head/sysutils/fusefs-fusepak/Makefile head/sysutils/fusefs-gnome-vfs/Makefile head/sysutils/fusefs-httpfs/Makefile head/sysutils/fusefs-ntfs/Makefile head/sysutils/fusefs-ntfs/pkg-plist head/sysutils/fusefs-smbnetfs/Makefile head/sysutils/fusefs-sqlfs/Makefile Modified: head/sysutils/filedupe/Makefile ============================================================================== --- head/sysutils/filedupe/Makefile Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/filedupe/Makefile Wed Nov 13 12:50:18 2013 (r333680) @@ -14,12 +14,11 @@ LIB_DEPENDS= gdbm:${PORTSDIR}/databases/ PLIST_FILES= bin/filedupe -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's|filename\[80\]|filename[1024]|g; \ s|your_database|/var/db/filedupe.db|' ${WRKSRC}/filedupe.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/filedupe ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/filedupe ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/sysutils/fileschanged/Makefile ============================================================================== --- head/sysutils/fileschanged/Makefile Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fileschanged/Makefile Wed Nov 13 12:50:18 2013 (r333680) @@ -10,12 +10,11 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Utility that reports when files have been altered -BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \ - help2man:${PORTSDIR}/misc/help2man +LIB_DEPENDS= libargp.so:${PORTSDIR}/devel/argp-standalone +BUILD_DEPENDS= help2man:${PORTSDIR}/misc/help2man GNU_CONFIGURE= yes -NO_STAGE= yes -USE_GMAKE= yes +USES= gmake USE_FAM= yes CONFIGURE_ENV+= LIBS="-largp" CPPFLAGS+= -I${LOCALBASE}/include @@ -23,15 +22,17 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --datadir=${PREFIX}/share/doc --disable-nls INFO= fileschanged -MAN1= fileschanged.1 -PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README -PLIST_FILES= bin/fileschanged +DOCS= AUTHORS ChangeLog INSTALL NEWS README + +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> -.if !defined(NOPORTDOCS) post-install: - ${MKDIR} ${DOCSDIR} -.for DOCFILE in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${DOCFILE} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} +.for DOCFILE in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${DOCFILE} ${STAGEDIR}${DOCSDIR} .endfor .endif Added: head/sysutils/fileschanged/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fileschanged/pkg-plist Wed Nov 13 12:50:18 2013 (r333680) @@ -0,0 +1,8 @@ +bin/fileschanged +man/man1/fileschanged.1.gz +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%% Modified: head/sysutils/fortunelock/Makefile ============================================================================== --- head/sysutils/fortunelock/Makefile Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fortunelock/Makefile Wed Nov 13 12:50:18 2013 (r333680) @@ -12,9 +12,6 @@ COMMENT= Locks a terminal while showing USE_BZIP2= yes -MAN1= fortunelock.1 -MANCOMPRESSED= no -PLIST_FILES= bin/fortunelock +PLIST_FILES= bin/fortunelock man/man1/${PORTNAME}.1.gz -NO_STAGE= yes .include <bsd.port.mk> Modified: head/sysutils/fortunelock/files/patch-aa ============================================================================== --- head/sysutils/fortunelock/files/patch-aa Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fortunelock/files/patch-aa Wed Nov 13 12:50:18 2013 (r333680) @@ -1,5 +1,5 @@ ---- Makefile.orig Thu Apr 20 14:15:07 2000 -+++ Makefile Wed Apr 26 19:16:04 2000 +--- Makefile.orig 2000-04-21 05:15:07.000000000 +0800 ++++ Makefile 2013-11-09 19:38:12.000000000 +0800 @@ -1,10 +1,10 @@ -CC=gcc -CFLAGS=-O3 @@ -14,14 +14,14 @@ all: $(TARGET) -@@ -19,8 +19,8 @@ +@@ -19,8 +19,8 @@ fortunelock.o: fortunelock.c fortunelock install: strip fortunelock - install -m 755 fortunelock $(PREFIXDIR)/bin - install -m 644 fortunelock.1 $(PREFIXDIR)/man/man1 -+ install -c -m 755 fortunelock $(PREFIX)/bin -+ install -c -m 644 fortunelock.1 $(PREFIX)/man/man1 ++ install -c -m 755 fortunelock $(DESTDIR)$(PREFIX)/bin ++ install -c -m 644 fortunelock.1 $(DESTDIR)$(PREFIX)/man/man1 uninstall: - rm -rf $(PREFIXDIR)/bin/fortunelock Modified: head/sysutils/fusefs-cryptofs/Makefile ============================================================================== --- head/sysutils/fusefs-cryptofs/Makefile Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fusefs-cryptofs/Makefile Wed Nov 13 12:50:18 2013 (r333680) @@ -17,15 +17,16 @@ LIB_DEPENDS= gcrypt:${PORTSDIR}/security USE_BZIP2= yes GNU_CONFIGURE= yes USES= fuse pkgconfig -NO_STAGE= yes +DOCS= README cryptofs.conf -PLIST_FILES= bin/cryptofs +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> -.if !defined(NOPORTDOCS) -PORTDOCS= README cryptofs.conf post-install: - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Added: head/sysutils/fusefs-cryptofs/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fusefs-cryptofs/pkg-plist Wed Nov 13 12:50:18 2013 (r333680) @@ -0,0 +1,4 @@ +bin/cryptofs +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/cryptofs.conf +%%PORTDOCS%%@dirrm %%DOCSDIR%% Modified: head/sysutils/fusefs-funionfs/Makefile ============================================================================== --- head/sysutils/fusefs-funionfs/Makefile Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fusefs-funionfs/Makefile Wed Nov 13 12:50:18 2013 (r333680) @@ -15,8 +15,6 @@ CFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes USES= fuse -MAN1= funionfs.1 -PLIST_FILES= bin/funionfs +PLIST_FILES= bin/funionfs man/man1/${PORTNAME}.1.gz -NO_STAGE= yes .include <bsd.port.mk> Modified: head/sysutils/fusefs-fur/Makefile ============================================================================== --- head/sysutils/fusefs-fur/Makefile Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fusefs-fur/Makefile Wed Nov 13 12:50:18 2013 (r333680) @@ -11,22 +11,19 @@ DISTNAME= FUR-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= FUSE-based filesystem for Windows CE based devices -LIB_DEPENDS= rapi:${PORTSDIR}/palm/synce-librapi2 +LIB_DEPENDS= librapi.so:${PORTSDIR}/palm/synce-librapi2 OPTIONS_DEFINE= VCHMOD OPTIONS_DEFAULT= VCHMOD VCHMOD_DESC= Fake hook for chmod that just returns 0 - GNU_CONFIGURE= yes -USES= fuse pkgconfig iconv -USE_GMAKE= yes +USES= fuse pkgconfig iconv gmake LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include -DFUSE_USE_VERSION=26 PLIST_FILES= bin/${PORTNAME} -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MVCHMOD} @@ -34,6 +31,6 @@ CONFIGURE_ARGS+= --enable-void-chmod .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/Fur ${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/Fur ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk> Modified: head/sysutils/fusefs-fusepak/Makefile ============================================================================== --- head/sysutils/fusefs-fusepak/Makefile Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fusefs-fusepak/Makefile Wed Nov 13 12:50:18 2013 (r333680) @@ -16,12 +16,10 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USES= fuse pkgconfig -PLIST_FILES= bin/pakmount -MAN1= pakmount.1 +PLIST_FILES= bin/pakmount man/man1/pakmount.1.gz -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's,Linux,${OPSYS}, ; s,Fatnasy,Fantasy,' \ - ${WRKSRC}/src/${MAN1} + ${WRKSRC}/src/pakmount.1 .include <bsd.port.mk> Modified: head/sysutils/fusefs-gnome-vfs/Makefile ============================================================================== --- head/sysutils/fusefs-gnome-vfs/Makefile Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fusefs-gnome-vfs/Makefile Wed Nov 13 12:50:18 2013 (r333680) @@ -13,18 +13,16 @@ COMMENT= Interface between FUSE and the RPORTNAME= gnome-vfs-fuse WRKSRC= ${WRKDIR}/${RPORTNAME} -USES= fuse pkgconfig +USES= fuse pkgconfig gmake USE_GNOME= gnomevfs2 -USE_GMAKE= yes PLIST_FILES= bin/gnomevfs-mount PORTDOCS= README -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gnomevfs-mount ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/gnomevfs-mount ${STAGEDIR}${PREFIX}/bin .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/sysutils/fusefs-httpfs/Makefile ============================================================================== --- head/sysutils/fusefs-httpfs/Makefile Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fusefs-httpfs/Makefile Wed Nov 13 12:50:18 2013 (r333680) @@ -15,14 +15,12 @@ COMMENT= Fuse-based http filesystem WRKSRC= ${WRKDIR}/${PORTNAME}2-${VERSION} VERSION= 0.1.5 -USES= fuse pkgconfig -USE_GMAKE= yes +USES= fuse pkgconfig gmake CFLAGS+= -D__BSD_VISIBLE ALL_TARGET= httpfs2 PLIST_FILES= bin/httpfs2 -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/httpfs2 ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/httpfs2 ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/sysutils/fusefs-ntfs/Makefile ============================================================================== --- head/sysutils/fusefs-ntfs/Makefile Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fusefs-ntfs/Makefile Wed Nov 13 12:50:18 2013 (r333680) @@ -32,12 +32,6 @@ UBLIO_DESC= Enable user space cache for SUB_FILES= pkg-message DOCSDIR= ${PREFIX}/share/doc/ntfs-3g -MAN8= mkntfs.8 ntfs-3g.8 ntfs-3g.probe.8 \ - ntfs-3g.secaudit.8 ntfs-3g.usermap.8 ntfscat.8 ntfsclone.8 \ - ntfscluster.8 ntfscmp.8 ntfscp.8 ntfsfix.8 ntfsinfo.8 \ - ntfslabel.8 ntfsls.8 ntfsprogs.8 ntfsresize.8 ntfsundelete.8 - -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MLOCK} @@ -64,8 +58,7 @@ post-patch: post-install: .if !defined(NOPORTDOCS) - ${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR} + ${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR} .endif - @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} .include <bsd.port.post.mk> Modified: head/sysutils/fusefs-ntfs/pkg-plist ============================================================================== --- head/sysutils/fusefs-ntfs/pkg-plist Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fusefs-ntfs/pkg-plist Wed Nov 13 12:50:18 2013 (r333680) @@ -50,6 +50,23 @@ lib/libntfs-3g.la lib/libntfs-3g.so lib/libntfs-3g.so.83 libdata/pkgconfig/libntfs-3g.pc +man/man8/mkntfs.8.gz +man/man8/ntfs-3g.8.gz +man/man8/ntfs-3g.probe.8.gz +man/man8/ntfs-3g.secaudit.8.gz +man/man8/ntfs-3g.usermap.8.gz +man/man8/ntfscat.8.gz +man/man8/ntfsclone.8.gz +man/man8/ntfscluster.8.gz +man/man8/ntfscmp.8.gz +man/man8/ntfscp.8.gz +man/man8/ntfsfix.8.gz +man/man8/ntfsinfo.8.gz +man/man8/ntfslabel.8.gz +man/man8/ntfsls.8.gz +man/man8/ntfsprogs.8.gz +man/man8/ntfsresize.8.gz +man/man8/ntfsundelete.8.gz sbin/mkntfs sbin/ntfsclone sbin/ntfscp Modified: head/sysutils/fusefs-smbnetfs/Makefile ============================================================================== --- head/sysutils/fusefs-smbnetfs/Makefile Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fusefs-smbnetfs/Makefile Wed Nov 13 12:50:18 2013 (r333680) @@ -14,7 +14,7 @@ OPTIONS_DEFINE= GNOME_KEYRING OPTIONS_DEFAULT=GNOME_KEYRING GNOME_KEYRING_DESC= Build with gnome-keyring support -LIB_DEPENDS= smbclient.0:${PORTSDIR}/net/samba-libsmbclient +LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient DOCSDIR+= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} @@ -26,7 +26,6 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib SUB_FILES= pkg-message -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGNOME_KEYRING} @@ -39,7 +38,4 @@ CONFIGURE_ARGS+=--with-gnome-keyring=no post-patch: ${REINPLACE_CMD} -e 's|а|a|g' ${WRKSRC}/${CONFIGURE_SCRIPT} -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.mk> Modified: head/sysutils/fusefs-sqlfs/Makefile ============================================================================== --- head/sysutils/fusefs-sqlfs/Makefile Wed Nov 13 12:47:29 2013 (r333679) +++ head/sysutils/fusefs-sqlfs/Makefile Wed Nov 13 12:50:18 2013 (r333680) @@ -22,7 +22,6 @@ PORTDOCS= README PLIST_FILES= bin/sqlfs -NO_STAGE= yes .include <bsd.port.pre.mk> do-build: @@ -33,14 +32,11 @@ do-build: -o sqlfs) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sqlfs ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/sqlfs ${STAGEDIR}${PREFIX}/bin/ .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/ - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ + @${MKDIR} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .endif -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311131250.rADCoIFI027343>