diff options
author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2015-09-08 17:53:40 +0000 |
---|---|---|
committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2015-09-08 17:53:40 +0000 |
commit | fb09053ffd2a591d7c6659285af97a1a9dd9a384 (patch) | |
tree | 6e21a893eba9c09e156aa10560b9306ea5f45e7d /shells | |
parent | - Fix plist [1] (diff) |
- 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
Notes
Notes:
svn path=/head/; revision=396419
Diffstat (limited to 'shells')
-rw-r--r-- | shells/fd/Makefile | 27 | ||||
-rw-r--r-- | shells/fd/files/patch-Makefile.in | 13 | ||||
-rw-r--r-- | shells/fd/files/patch-machine.h | 37 | ||||
-rw-r--r-- | shells/fd/pkg-descr | 2 |
4 files changed, 50 insertions, 29 deletions
diff --git a/shells/fd/Makefile b/shells/fd/Makefile index 8af5b982d69f..6a29cda473e4 100644 --- a/shells/fd/Makefile +++ b/shells/fd/Makefile @@ -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> diff --git a/shells/fd/files/patch-Makefile.in b/shells/fd/files/patch-Makefile.in deleted file mode 100644 index 849a2feec9f8..000000000000 --- a/shells/fd/files/patch-Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.in.orig Wed Sep 14 00:00:00 2005 -+++ Makefile.in Tue Nov 8 11:27:52 2005 -@@ -5,8 +5,8 @@ - TITLE = FD- - VERMAJ = __VERMAJ__ - VERSION = __VERSION__ --PREFIX = __PREFIX__ --CONFDIR = __CONFDIR__ -+PREFIX ?= __PREFIX__ -+CONFDIR ?= __CONFDIR__ - BUILD = - MANSEC = 1 - TOPDIR = $(BUILD)$(PREFIX) diff --git a/shells/fd/files/patch-machine.h b/shells/fd/files/patch-machine.h new file mode 100644 index 000000000000..c0bb5d5559e9 --- /dev/null +++ b/shells/fd/files/patch-machine.h @@ -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 diff --git a/shells/fd/pkg-descr b/shells/fd/pkg-descr index 2b83768265b0..41981eea551b 100644 --- a/shells/fd/pkg-descr +++ b/shells/fd/pkg-descr @@ -3,5 +3,5 @@ allows you to browse and manipulate directories and files with an easy 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). |