Attachment 145975 Details for Bug 192800 – japanese_ddskk.diff

[patch] japanese_ddskk.diff

japanese_ddskk.diff (text/plain), 3.76 KB, created by tkato432 on 2014-08-18 18:38:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-08-18 18:38:36 UTC

Size: 3.76 KB

patch

obsolete

>diff -urN /usr/ports/japanese/ddskk/Makefile japanese/ddskk/Makefile
>--- /usr/ports/japanese/ddskk/Makefile	2014-07-24 03:57:04.000000000 +0900
>+++ japanese/ddskk/Makefile	2014-09-19 00:00:00.000000000 +0900
>@@ -13,40 +13,49 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Simple Kana to Kanji conversion program on Emacsen
> 
>-OPTIONS_DEFINE=	DOCS EXAMPLES
>+LICENSE=	GPLv2
>+
>+NO_ARCH=	yes
> 
> USE_EMACS=	yes
>-INFO=		skk
>+MAKE_ARGS=	PREFIX="${STAGEDIR}${PREFIX}" \
>+		SKK_LISPDIR="${STAGEDIR}${PREFIX}/${SKK_LISPDIR}" \
>+		SKK_INFODIR="${STAGEDIR}${PREFIX}/${INFO_PATH}"
>+ALL_TARGET=	elc info
> 
>-SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
>-PORTDOCS=	AUTHORS.ja CODENAME.ja Contributors FAQ.ja NEWS.ja README
>-PORTEXAMPLES=	Emacs.ad dot.emacs dot.skk
>+INFO=		skk
>+PORTDOCS=	*
>+PORTEXAMPLES=	*
> 
>-ALL_TARGET=	elc info
>-MAKE_ARGS+=	SKK_LISPDIR=${PREFIX}/${SKK_LISPDIR} SKK_INFODIR=${PREFIX}/${INFO_PATH}
>+OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-NO_STAGE=	yes
>-pre-install:
>-	# required for non-standard PREFIX
>-	${MKDIR} ${PREFIX}/${SKK_LISPDIR}
>+SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
> 
>-.include <bsd.port.options.mk>
>+post-patch:
>+	@${REINPLACE_CMD} -e \
>+		'/skk-tut-file/s|@TUT@|${PREFIX}/share/skk/SKK.tut|' \
>+		${WRKSRC}/skk-setup.el.in
>+
>+pre-build:
>+.for i in skk-lookup.el skk-jisx0213.el
>+	@${MV} ${WRKSRC}/${i} ${WRKDIR}
>+.endfor
> 
> post-install:
>-.for i in skk-jisx0213 skk-lookup
>-	${INSTALL_DATA} ${WRKSRC}/${i}.el ${PREFIX}/${SKK_LISPDIR}
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}
>+.for i in skk-lookup.el skk-jisx0213.el
>+	(cd ${WRKDIR} && ${INSTALL_DATA} ${i} \
>+		${STAGEDIR}${PREFIX}/${SKK_LISPDIR})
> .endfor
>-.if ${PORT_OPTIONS:MDOCS}
>-	${MKDIR} ${DOCSDIR}
>-.for i in ${PORTDOCS}
>-	${INSTALL_DATA} ${WRKSRC}/READMEs/${i} ${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+.for i in AUTHORS.ja CODENAME.ja Contributors FAQ.ja NEWS.ja README
>+	(cd ${WRKSRC}/READMEs && ${INSTALL_DATA} ${i} \
>+		${STAGEDIR}${DOCSDIR})
> .endfor
>-.endif
>-.if ${PORT_OPTIONS:MEXAMPLES}
>-	${MKDIR} ${EXAMPLESDIR}
>-.for i in ${PORTEXAMPLES}
>-	${INSTALL_DATA}	${WRKSRC}/etc/${i} ${EXAMPLESDIR}
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+.for i in Emacs.ad dot.emacs dot.skk
>+	(cd ${WRKSRC}/etc && ${INSTALL_DATA} ${i} \
>+		${STAGEDIR}${EXAMPLESDIR})
> .endfor
>-.endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/japanese/ddskk/pkg-plist japanese/ddskk/pkg-plist
>--- /usr/ports/japanese/ddskk/pkg-plist	2014-06-21 17:42:37.000000000 +0900
>+++ japanese/ddskk/pkg-plist	2014-09-19 00:00:00.000000000 +0900
>@@ -44,7 +44,7 @@
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.el
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.elc
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.el
>-@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.elc || true
>+@rmtry %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.elc
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.el
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.elc
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.el
>@@ -56,7 +56,7 @@
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.el
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.elc
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.el
>-@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.elc || true
>+@rmtry %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.elc
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.el
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.elc
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.el
>@@ -84,9 +84,11 @@
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-viper.elc
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.el
> %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.elc
>-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/skk
> share/skk/NICOLA-SKK.tut
> share/skk/SKK.tut
> share/skk/SKK.tut.E
> share/skk/skk.xpm
> @dirrmtry share/skk
>+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/skk
>+@dirrmtry %%EMACS_VERSION_SITE_LISPDIR%%
>+@dirrmtry %%EMACS_LIBDIR_WITH_VER%%

Actions: View | Diff

Attachments on bug 192800: 145975