Attachment 146477 Details for Bug 193061 – new patch

[patch] new patch

eijiro-fpw2.diff (text/plain), 3.19 KB, created by TsurutaniNaoki on 2014-08-29 03:49:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TsurutaniNaoki

Created: 2014-08-29 03:49:34 UTC

Size: 3.19 KB

patch

obsolete

>diff -urN eijiro-fpw.orig/Makefile eijiro-fpw/Makefile
>--- eijiro-fpw.orig/Makefile	2014-05-26 21:33:13.000000000 +0900
>+++ eijiro-fpw/Makefile	2014-08-29 12:45:02.000000000 +0900
>@@ -20,41 +20,36 @@
> USES=		perl5 gmake
> MAKE_JOBS_UNSAFE=yes
> WRKSRC=		${WRKDIR}/eijiro-fpw${PORTVERSION}
>-DICT_PATH?=	/cdrom
>+DICT_PATH?=	${WRKSRC}
> SRCFILE?=	eijiro52.txt
> 
>+OPTIONS_DEFINE=	DOCS
>+
>+.include <bsd.port.options.mk>
>+
> # For eijiro included in a book sold by ALC Inc.
> # (http://www.alc.co.jp/alcshop/eng/eijiro/)
>-
>-NO_STAGE=	yes
> .include <bsd.port.pre.mk>
> 
>-DICT_ARCHIVE!=	${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE}
>-.if exists(${DICT_ARCHIVE})
>-EXTRACT_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
>-
>-CDROM_PATH:=	${DICT_PATH}
>-DICT_PATH:=	${WRKDIR}
>-.else
>-CDROM_PATH=	${NONEXISTENT}
>-.endif
>-
>-MAKE_ARGS:=	SRCFILE=${DICT_PATH}/${SRCFILE}
>+MAKE_ARGS+=	SRCFILE=${DICT_PATH}/${SRCFILE}
> 
> post-extract:
>-	@if [ -f ${CDROM_PATH}/eijiro-original/*.exe ]; then \
>-	  lha xiw=${WRKDIR} ${CDROM_PATH}/eijiro-original/*.exe '*/${SRCFILE}'; \
>-	elif [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \
>-	  ${ECHO} "###################################################"; \
>-	  ${ECHO} "I cannot find a file ${DICT_PATH}/${SRCFILE}"; \
>-	  ${ECHO} "Specify the Eijiro Dictionary file with the full path"; \
>-	  ${ECHO} "and excecute the following command again:"; \
>-	  ${ECHO} "  make DICT_PATH=${DICT_PATH} SRCFILE=${SRCFILE}"; \
>-	  ${ECHO} ""; \
>-	  ${ECHO} "Notice: DICT_PATH must be a full path to the file."; \
>-	  ${ECHO} "###################################################"; \
>-	  ${FALSE}; \
>-	fi
>+.if ! exists(${DICT_PATH}/${SRCFILE})
>+	@${ECHO} "###################################################"
>+	@${ECHO} "I cannot find a file ${DICT_PATH}/${SRCFILE}"
>+	@${ECHO} "Specify the Eijiro Dictionary file with the full path"
>+	@${ECHO} "and excecute the following command again:"
>+	@${ECHO} "  make DICT_PATH=${DICT_PATH} SRCFILE=${SRCFILE}"
>+	@${ECHO} "If you have the Eijiro CD-ROM, extract it first;"
>+	@${ECHO} "for example (after installing lha from ports or packages),"
>+	@${ECHO} "  lha x /cdrom/eijiro-original/*.exe"
>+	@${ECHO} "Then set DICT_PATH to the extracted sub-directory,"
>+	@${ECHO} "     set SRCFILE to the dictionary file make in it."
>+	@${ECHO} ""
>+	@${ECHO} "Notice: DICT_PATH must be a full path to the file."
>+	@${ECHO} "###################################################"
>+	@${FALSE}
>+.endif
> 	${CP} ${LOCALBASE}/share/freepwing/fpwutils.mk ${WRKSRC}
> 
> post-build:
>@@ -62,14 +57,12 @@
> 	${SETENV} CATDUMPFLAGS="-e sjis" fpwmake catalogs
> 
> do-install:
>-	${MKDIR} ${PREFIX}/share/dict/eijiro-fpw/eijiro/data
>-	${INSTALL_DATA} ${WRKSRC}/honmon ${PREFIX}/share/dict/eijiro-fpw/eijiro/data
>-	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/eijiro-fpw
>-.if !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/dict/eijiro-fpw/eijiro/data
>+	${INSTALL_DATA} ${WRKSRC}/honmon ${STAGEDIR}${PREFIX}/share/dict/eijiro-fpw/eijiro/data
>+	${INSTALL_DATA} ${WRKSRC}/catalogs ${STAGEDIR}${PREFIX}/share/dict/eijiro-fpw
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for i in readme.sjis
>-	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
> .endfor
>-.endif
> 
> .include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 193061: 146362 | 146477 | 146514 | 146518 | 146528