4 files changed, 22 insertions, 7 deletions

diff --git a/japanese/srd-fpw/Makefile b/japanese/srd-fpw/Makefile
index 300460967ba2..69bd9c633f3a 100644
--- a/japanese/srd-fpw/Makefile
+++ b/japanese/srd-fpw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	srd-fpw
-PORTVERSION=	1.0.8
+PORTVERSION=	1.1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/srd-fpw/
 DISTNAME=	srd-fpw${PORTVERSION}-src
@@ -20,21 +20,30 @@ BUILD_DEPENDS=	fpwmake:${PORTSDIR}/japanese/freepwing \
 IS_INTERACTIVE= YES
 RESTRICTED=	"The original dictionary is not free"
 WRKSRC=		${WRKDIR}/srd-fpw${PORTVERSION}
-MOUNT_PT?=	/cdrom
+DICT_PATH?=	/cdrom
 
 post-extract:
-	@if [ ! -f ${MOUNT_PT}/srd.ini ]; then \
+	@if [ ! -f ${DICT_PATH}/SRD.INI ]; then \
 	  ${ECHO} "###################################################"; \
 	  ${ECHO} "Specify a mount point for Random House's CD-ROM"; \
 	  ${ECHO} "and excecute the following command again:"; \
-	  ${ECHO} "  make MOUNT_PT=${MOUNT_PT}"; \
+	  ${ECHO} "  make DICT_PATH=${DICT_PATH}"; \
 	  ${ECHO} "###################################################"; \
 	  ${FALSE}; \
 	fi
+	${MKDIR} ${WRKSRC}/source/DATA
+	${CP} ${DICT_PATH}/Readme.txt ${WRKSRC}/source
+	${CP} ${DICT_PATH}/DATA/main.txt ${WRKSRC}/source/DATA/
+	${CP} ${DICT_PATH}/DATA/en.dat ${WRKSRC}/source/DATA/
+	${CP} ${DICT_PATH}/DATA/tr.dat ${WRKSRC}/source/DATA/
+	${CP} ${DICT_PATH}/DATA/img.dat ${WRKSRC}/source/DATA/
 
 do-build:
-#	cd ${WRKSRC}; fpwmake SRCDIR=${MOUNT_PT} > /dev/null; \
-	cd ${WRKSRC}; fpwmake SRCDIR=${MOUNT_PT}; \
+#	cd ${WRKSRC}; fpwmake SRCDIR=${DICT_PATH} > /dev/null; \
+#	cd ${WRKSRC}; fpwmake SRCDIR=${DICT_PATH}; \
+	cd ${WRKSRC}; \
+	fpwmake png; \
+	fpwmake ; \
 	fpwmake catalogs
 
 do-install:
@@ -47,6 +56,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/gai16h \
 		${PREFIX}/share/dict/srd-fpw/srd-fpw/gaiji
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/srd-fpw
+	${INSTALL_DATA} ${WRKSRC}/img.dat ${PREFIX}/share/dict/srd-fpw
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/srd-fpw
 .for file in README.TXT README.PKG AUTHORS COPYING ChangeLog GAIJI.TXT TOBEDONE NEWS
diff --git a/japanese/srd-fpw/distinfo b/japanese/srd-fpw/distinfo
index 6d90425bfc25..06059590b770 100644
--- a/japanese/srd-fpw/distinfo
+++ b/japanese/srd-fpw/distinfo
@@ -1 +1 @@
-MD5 (srd-fpw1.0.8-src.tar.gz) = 41676c6728a390a60b3fe29437326dab
+MD5 (srd-fpw1.1-src.tar.gz) = 435fa32e159133b2fb47278e8fc56699
diff --git a/japanese/srd-fpw/pkg-descr b/japanese/srd-fpw/pkg-descr
index 3a72efde06f6..1faad468f33c 100644
--- a/japanese/srd-fpw/pkg-descr
+++ b/japanese/srd-fpw/pkg-descr
@@ -9,3 +9,7 @@ o URL for Shougakukan Inc.:
 
 o URL for this converted dictionary:
 WWW: http://openlab.ring.gr.jp/edict/srd-fpw/
+
+Notice: ${PREFIX}/share/dict/srd-fpw/img.dat converted from the
+        original img.data is a PNG format. If you use XEmacs and
+	the converted data then	image data can be inlined.
diff --git a/japanese/srd-fpw/pkg-plist b/japanese/srd-fpw/pkg-plist
index ed3611fc0041..451cc5be73dc 100644
--- a/japanese/srd-fpw/pkg-plist
+++ b/japanese/srd-fpw/pkg-plist
@@ -2,6 +2,7 @@ share/dict/srd-fpw/srd-fpw/data/honmon
 share/dict/srd-fpw/srd-fpw/gaiji/gai16f
 share/dict/srd-fpw/srd-fpw/gaiji/gai16h
 share/dict/srd-fpw/catalogs
+share/dict/srd-fpw/img.dat
 share/doc/srd-fpw/AUTHORS
 share/doc/srd-fpw/COPYING
 share/doc/srd-fpw/ChangeLog