diff options
| author | hrs <hrs@FreeBSD.org> | 2012-06-05 14:35:31 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2012-06-05 14:35:31 +0800 |
| commit | 59f07eac60ab372bc2b63d77312cce34fdeb9ebb (patch) | |
| tree | 63cffb9c514e67db3e95ba3f283e8a1f09d85abf | |
| parent | b8636259736cdcd5ea225b3ef572e841d89092f2 (diff) | |
| download | freebsd-ports-gnome-59f07eac60ab372bc2b63d77312cce34fdeb9ebb.tar.gz freebsd-ports-gnome-59f07eac60ab372bc2b63d77312cce34fdeb9ebb.tar.zst freebsd-ports-gnome-59f07eac60ab372bc2b63d77312cce34fdeb9ebb.zip | |
Fix BROKEN and some styles.
| -rw-r--r-- | japanese/kon2-16dot/Makefile | 42 | ||||
| -rw-r--r-- | japanese/kon2-16dot/files/dotconfig | 6 |
2 files changed, 27 insertions, 21 deletions
diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile index 451fb82475ab..bfb6414a3bef 100644 --- a/japanese/kon2-16dot/Makefile +++ b/japanese/kon2-16dot/Makefile @@ -12,7 +12,6 @@ PORTREVISION= 5 CATEGORIES+= japanese MASTER_SITES= ${MASTER_SITE_PORTS_JP} PKGNAMESUFFIX= -${KONFONT} -DISTNAME= kon2-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ k14.bdf 7x14rk.bdf \ jiskan16.bdf 8x16rk.bdf @@ -22,15 +21,14 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= ports@FreeBSD.org COMMENT= Kanji On Console -- Display kanji characters on your own console -BROKEN= installs an unwanted file - ONLY_FOR_ARCHS= i386 amd64 MAN1= kon.1 MANLANG= ja PORTDOCS= README README.FreeBSD -DOCDIR= ${PREFIX}/share/doc/kon2 +SUB_LIST= KON16FONT=${KON16FONT} \ + KON14FONT=${KON14FONT} .include <bsd.port.pre.mk> @@ -46,23 +44,33 @@ KON14FONT=Startup .endif post-extract: - @${CP} ${WRKSRC}/doc/kon.1 ${WRKSRC}/src/ + cd ${WRKSRC} && \ + ${INSTALL_MAN} doc/kon.1 src/kon.1.in && \ + ${INSTALL_DATA} kon.cfg.FreeBSD kon.cfg.FreeBSD.in + +${WRKSRC}/.config:: + (${ECHO_CMD} "DISTDIR = ${DISTDIR}"; \ + ${ECHO_CMD} "TOPDIR = ${PREFIX}"; \ + ${CAT} ${FILESDIR}/dotconfig; \ + ) > ${WRKSRC}/.config + +pre-configure: ${WRKSRC}/.config + +do-configure: + cd ${WRKSRC} && ${MAKE} -f Makefile.FreeBSD config -pre-build: - ${SED} -e 's,%%PREFIX%%,${PREFIX},' \ - -e 's,%%DISTDIR%%,${DISTDIR},' \ - ${FILESDIR}/dotconfig > ${WRKSRC}/.config - @(cd ${WRKSRC}; ${MAKE} -f Makefile.FreeBSD config) - @for i in kon.cfg.FreeBSD doc/kon.1; do\ - ${MV} -f ${WRKSRC}/$${i} ${WRKSRC}/$${i}.in ;\ - ${SED} -e "s;@@PREFIX@@;${PREFIX};g" -e "s;@@KON16FONT@@;${KON16FONT};g" -e "s;@@KON14FONT@@;${KON14FONT};g" ${WRKSRC}/$${i}.in > ${WRKSRC}/$${i} ;\ - done +post-configure: + cd ${WRKSRC} && \ + for F in kon.cfg.FreeBSD src/kon.1; do \ + ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + < $${F}.in > $${F}; \ + done post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/kon.1 ${PREFIX}/man/ja/man1 + ${INSTALL_MAN} ${WRKSRC}/src/kon.1 ${MANPREFIX}/man/ja/man1 .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCDIR} - cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCDIR} + ${MKDIR} ${DOCSDIR} + cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif .include <bsd.port.post.mk> diff --git a/japanese/kon2-16dot/files/dotconfig b/japanese/kon2-16dot/files/dotconfig index 49d27d8d6867..66d12df50408 100644 --- a/japanese/kon2-16dot/files/dotconfig +++ b/japanese/kon2-16dot/files/dotconfig @@ -1,9 +1,7 @@ - -DISTDIR = %%DISTDIR%% -TOPDIR = %%PREFIX%% +# $FreeBSD$ BINDIR = $(TOPDIR)/bin LIBDIR = $(TOPDIR)/etc -MANDIR = $(TOPDIR)/man/ja/man1 +MANDIR = $(TOPDIR)/man/ja/man FONTDIR = $(TOPDIR)/share/fonts/bdf CONFIG_NAME = kon.cfg CFLAGS += -DCONFIG_NAME=\"$(LIBDIR)/$(CONFIG_NAME)\" |