Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Mar 2014 17:38:48 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r347285 - head/shells/fd
Message-ID:  <201403061738.s26Hcmfr013838@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Mar  6 17:38:47 2014
New Revision: 347285
URL: http://svnweb.freebsd.org/changeset/ports/347285
QAT: https://qat.redports.org/buildarchive/r347285/

Log:
  Support stage

Modified:
  head/shells/fd/Makefile
  head/shells/fd/pkg-plist

Modified: head/shells/fd/Makefile
==============================================================================
--- head/shells/fd/Makefile	Thu Mar  6 17:31:55 2014	(r347284)
+++ head/shells/fd/Makefile	Thu Mar  6 17:38:47 2014	(r347285)
@@ -9,12 +9,12 @@ MASTER_SITES=	http://hp.vector.co.jp/aut
 DISTNAME=	FD-${PORTVERSION}
 
 MAINTAINER=	knu@FreeBSD.org
-COMMENT=	A CUI-based file and directory management tool
+COMMENT=	CUI-based file and directory management tool
+
+OPTIONS_DEFINE=	DOCS
 
-MANLANG=	"" ja
-MAN1=		fd.1 fdsh.1
 MAKE_ENV=	LANG=ja
-MAKE_ARGS=	CC="${CC}" CONFDIR="${PREFIX}/etc"
+MAKE_ARGS=	CC="${CC}" PREFIX="\$$(DESTDIR)${PREFIX}" CONFDIR="\$$(DESTDIR)${PREFIX}/etc"
 
 DOCS_EN=	FAQ.eng \
 		LICENSES.eng \
@@ -28,37 +28,21 @@ DOCS_JA=	FAQ \
 		TECHKNOW \
 		ToAdmin
 
-NO_STAGE=	yes
+BROKEN_powerpc=		Does not compile on powerpc: tzfile.h: No such file or directory
+
 post-configure:
 	${REINPLACE_CMD} -E -e 's|^(#[[:space:]]*define[[:space:]]+EXTENDCCOPT[[:space:]]+"([^"]+ )?)-O(["[:space:]])|\1${CFLAGS}\3|' ${WRKSRC}/machine.h
 
 post-install:
-	@${ECHO} "Updating /etc/shells"
-	@-${CP} /etc/shells /etc/shells.bak; \
-		(${GREP} -v ${PREFIX}/bin/fdsh /etc/shells.bak; \
-		${ECHO_CMD} ${PREFIX}/bin/fdsh) > /etc/shells; \
-		${RM} -f /etc/shells.bak
-	@${INSTALL_DATA} ${WRKSRC}/_fdrc.orig ${PREFIX}/etc/fd2rc.dist
-	@${INSTALL_DATA} ${WRKSRC}/_fdrc ${PREFIX}/etc/fd2rc.sample
-	if [ ! -f ${PREFIX}/etc/fd2rc ]; then \
-		${CP} -p ${PREFIX}/etc/fd2rc.sample ${PREFIX}/etc/fd2rc; \
-	fi
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${PREFIX}/share/doc/ja/${PORTNAME}
+	@${INSTALL_DATA} ${WRKSRC}/_fdrc.orig ${STAGEDIR}${PREFIX}/etc/fd2rc.dist
+	@${INSTALL_DATA} ${WRKSRC}/_fdrc ${STAGEDIR}${PREFIX}/etc/fd2rc.sample
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}
 	@for i in ${DOCS_EN}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${DOCSDIR}; \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${DOCSDIR}; \
 	done
 	@for i in ${DOCS_JA}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/ja/${PORTNAME}; \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}; \
 	done
-	@${CAT} ${PKGMESSAGE}
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc: tzfile.h: No such file or directory
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/shells/fd/pkg-plist
==============================================================================
--- head/shells/fd/pkg-plist	Thu Mar  6 17:31:55 2014	(r347284)
+++ head/shells/fd/pkg-plist	Thu Mar  6 17:38:47 2014	(r347285)
@@ -10,6 +10,10 @@ etc/fd2rc.dist
 @unexec if cmp -s %D/etc/fd2rc %D/etc/fd2rc.sample; then rm -f %D/etc/fd2rc; fi
 etc/fd2rc.sample
 @exec [ ! -f %B/fd2rc ] && cp %B/%f %B/fd2rc
+man/ja/man1/fd.1.gz
+man/ja/man1/fdsh.1.gz
+man/man1/fd.1.gz
+man/man1/fdsh.1.gz
 %%PORTDOCS%%share/doc/ja/fd/FAQ
 %%PORTDOCS%%share/doc/ja/fd/HISTORY
 %%PORTDOCS%%share/doc/ja/fd/LICENSES



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403061738.s26Hcmfr013838>