Date: Tue, 8 Sep 2015 17:53:40 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396419 - in head/shells/fd: . files Message-ID: <201509081753.t88Hreir015112@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Sep 8 17:53:40 2015 New Revision: 396419 URL: https://svnweb.freebsd.org/changeset/ports/396419 Log: - Remove `files/patch-Makefile.in' as it is being unused since there is pre-generated Makefile already provided - Unbreak the build on PowerPC by not treating it differently from other FreeBSD systems - Respect CFLAGS in a more sane way than patching ${WRKSRC}/machine.h in `_post-configure' target with some cryptic sed(1) regexp - Factor out docfiles installation into `post-install-DOCS-on' target, sanitize it a bit, unmute installation commands, move OPTIONS_DEFINE knob lower while I am here - Avoid use of contraction in the port description text Added: head/shells/fd/files/patch-machine.h (contents, props changed) Deleted: head/shells/fd/files/patch-Makefile.in Modified: head/shells/fd/Makefile head/shells/fd/pkg-descr Modified: head/shells/fd/Makefile ============================================================================== --- head/shells/fd/Makefile Tue Sep 8 17:50:47 2015 (r396418) +++ head/shells/fd/Makefile Tue Sep 8 17:53:40 2015 (r396419) @@ -11,10 +11,10 @@ DISTNAME= FD-${PORTVERSION} MAINTAINER= knu@FreeBSD.org COMMENT= CUI-based file and directory management tool -OPTIONS_DEFINE= DOCS - MAKE_ENV= LANG=ja -MAKE_ARGS= CC="${CC}" PREFIX="\$$(DESTDIR)${PREFIX}" CONFDIR="\$$(DESTDIR)${PREFIX}/etc" +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \ + PREFIX="\$$(DESTDIR)${PREFIX}" \ + CONFDIR="\$$(DESTDIR)${PREFIX}/etc" \ DOCS_EN= FAQ.eng \ LICENSES.eng \ @@ -28,21 +28,18 @@ DOCS_JA= FAQ \ TECHKNOW \ ToAdmin -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 +OPTIONS_DEFINE= DOCS post-install: - @${INSTALL_DATA} ${WRKSRC}/_fdrc.orig ${STAGEDIR}${PREFIX}/etc/fd2rc.dist - @${INSTALL_DATA} ${WRKSRC}/_fdrc ${STAGEDIR}${PREFIX}/etc/fd2rc.sample + ${INSTALL_DATA} ${WRKSRC}/_fdrc.orig \ + ${STAGEDIR}${PREFIX}/etc/fd2rc.dist + ${INSTALL_DATA} ${WRKSRC}/_fdrc ${STAGEDIR}${PREFIX}/etc/fd2rc.sample + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME} - @for i in ${DOCS_EN}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${DOCSDIR}; \ - done - @for i in ${DOCS_JA}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}; \ - done + ${INSTALL_DATA} ${DOCS_EN:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCS_JA:S,^,${WRKSRC}/,} \ + ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME} .include <bsd.port.mk> Added: head/shells/fd/files/patch-machine.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/fd/files/patch-machine.h Tue Sep 8 17:53:40 2015 (r396419) @@ -0,0 +1,37 @@ +--- machine.h.orig 2014-05-05 15:00:00 UTC ++++ machine.h +@@ -584,25 +584,6 @@ typedef long off_t; + #define USEINETATON + #endif + +-#if defined (__FreeBSD__) && defined (__powerpc__) +-#define BSD44 +-#define OSTYPE "JCCBSD" +-#define CODEEUC +-#define TARUSESPACE +-#define REGEXPLIB "-lcompat" +-#define DECLSIGLIST +-#define DECLERRLIST +-#define USELEAPCNT +-#define USEMOUNTH +-#define USEMNTINFO +-#define USERE_COMP +-#define USESETENV +-#define ULONGIOCTL +-#define USEMKTIME +-#define SIGFNCINT +-#define USEINETATON +-#endif +- + #if defined (__FreeBSD__) && !defined (OSTYPE) && !defined (__BOW__) + #define BSD44 + #define OSTYPE "FREEBSD" +@@ -1315,7 +1296,7 @@ typedef unsigned long u_long; + #define CCCOMMAND "cc" + #endif + #ifndef EXTENDCCOPT +-#define EXTENDCCOPT "-O" ++#define EXTENDCCOPT "" + #endif + #ifndef TERMCAPLIB + # ifdef USETERMINFO Modified: head/shells/fd/pkg-descr ============================================================================== --- head/shells/fd/pkg-descr Tue Sep 8 17:50:47 2015 (r396418) +++ head/shells/fd/pkg-descr Tue Sep 8 17:53:40 2015 (r396419) @@ -3,5 +3,5 @@ allows you to browse and manipulate dire and intuitive user interface. It also has a built-in Bourne-shell compatible shell which can be run stand-alone by the name of `fdsh'. -This version is a clone of FD for DOS (AT and PC9801) designed & +This version is a clone of FD for DOS (AT and PC9801) designed and written by A. Idei (SDI00544@niftyserve.or.jp).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509081753.t88Hreir015112>