11 files changed, 109 insertions, 72 deletions

diff --git a/chinese/bg5ps/Makefile b/chinese/bg5ps/Makefile
index d60eefae2a6e..c2ac33a85e31 100644
--- a/chinese/bg5ps/Makefile
+++ b/chinese/bg5ps/Makefile
@@ -1,23 +1,21 @@
 # New ports collection makefile for:	bg5ps
 # Date created:		17 June 1998
-# Whom:			J.T. Jang (keith@freebsd.sinica.edu.tw)
+# Whom:			Jing-Tang Keith Jang <keith@freebsd.sinica.edu.tw>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	bg5ps
-PORTVERSION=	1.1b2
+PORTVERSION=	1.3.0p3
 CATEGORIES=	chinese print
-MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/keith/ \
-		http://students.washington.edu/~cschin/bg5ps/bg5ps-1.1b2/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/keith/
+DISTNAME=	bg5ps-1.3.0
 
 MAINTAINER=	keith@freebsd.sinica.edu.tw
 
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python \
-		${X11BASE}/lib/X11/fonts/TrueType/moe_kai.ttf:${PORTSDIR}/chinese/moettf
-
-NO_WRKSUBDIR=	yes
+USE_GMAKE=	yes
+USE_FREETYPE=	yes
+USE_PYTHON=	yes
 
 do-install:
 	@${MKDIR} ${PREFIX}/share/doc/bg5ps
@@ -25,10 +23,11 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bg5ps ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/ttf2psm ${PREFIX}/bin
 	${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/bg5ps
-	${RM} ${PREFIX}/share/doc/bg5ps/COPYING.txt
-	${INSTALL_DATA} ${WRKSRC}/bg5ps.conf ${PREFIX}/share/doc/bg5ps/bg5ps.conf
+	${INSTALL_DATA} ${WRKSRC}/bg5ps.conf ${PREFIX}/etc/bg5ps.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/gb2312-bg5ps.conf ${PREFIX}/etc/gb2312-bg5ps.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/examples/netscape.ps ${PREFIX}/share/examples/bg5ps
 	${INSTALL_DATA} ${WRKSRC}/examples/test.big5 ${PREFIX}/share/examples/bg5ps
+	${INSTALL_DATA} ${WRKSRC}/examples/test.gb2312 ${PREFIX}/share/examples/bg5ps
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/test.sh ${PREFIX}/share/examples/bg5ps
 
 post-install:
diff --git a/chinese/bg5ps/distinfo b/chinese/bg5ps/distinfo
index a4c6262d5b50..31c1cc0c8204 100644
--- a/chinese/bg5ps/distinfo
+++ b/chinese/bg5ps/distinfo
@@ -1 +1 @@
-MD5 (bg5ps-1.1b2.tgz) = 2fac1a44f57a7dfb67f974af4484a2aa
+MD5 (bg5ps-1.3.0.tar.gz) = b28d32a2c9072a9efc6ee59f9441e22b
diff --git a/chinese/bg5ps/files/patch-aa b/chinese/bg5ps/files/patch-aa
index 292c81914419..1f63ef755949 100644
--- a/chinese/bg5ps/files/patch-aa
+++ b/chinese/bg5ps/files/patch-aa
@@ -1,56 +1,34 @@
---- bg5ps.orig	Fri Oct  2 08:35:41 1998
-+++ bg5ps	Fri Dec 17 17:01:21 1999
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/local/bin/python
- ################################################################################
- # bg5ps.py which use the ttf2ps program to convert the Big5 Coding chinese     #
- # text into printable postscript file.  Since it uses true type font, the      #
-@@ -418,10 +418,10 @@
-                 exec l
-             cf.close()
-         else:
--            sys.stderr.write("\n~/.bg5ps.conf not found.\n Trying /etc/bg5ps.conf.")
--            if os.path.isfile("/etc/bg5ps.conf"):
--                sys.stderr.write("\n /etc/bg5ps.conf found. Use configuration file /etc/bg5ps.conf")
--                cf=open("/etc/bg5ps.conf","r")
-+            sys.stderr.write("\n~/.bg5ps.conf not found.\n Trying /usr/local/etc/chinese/bg5ps.conf.")
-+            if os.path.isfile("/usr/local/etc/chinese/bg5ps.conf"):
-+                sys.stderr.write("\n /usr/local/etc/chinese/bg5ps.conf found. Use configuration file /usr/local/etc/chinese/bg5ps.conf")
-+                cf=open("/usr/local/etc/chinese/bg5ps.conf","r")
-                 for l in cf.readlines():
-                     exec l
-                 cf.close()
---- bg5ps.conf.orig	Fri Dec 17 16:58:30 1999
-+++ bg5ps.conf	Fri Dec 17 17:07:48 1999
-@@ -1,9 +1,9 @@
- #chineseFontPath: 指定中文字型的路徑(預設值: 與 bg5ps 同) 
--chineseFontPath=""
-+chineseFontPath="/usr/X11R6/lib/X11/fonts/TrueType"
- #modify the above line
+--- Makefile.orig	Thu Nov  2 22:44:32 2000
++++ Makefile	Thu Nov  2 22:47:11 2000
+@@ -21,11 +21,13 @@
+ INSTALL = install
+ CFLAGS =
+ LIBS = -lttf -lm
+-INCLUDEDIR = 
++LIBSDIR = -L/usr/local/lib
++INCLUDEDIR = -I/usr/local/include
  
- #fontName: 指定中文字型的檔案名稱(預設值: ntu_kai) 
--fontName="ntu_kai"
-+fontName="moe_kai"
+-prefix = /usr
++
++prefix = /usr/local
+ BINDIR = $(prefix)/bin
+-ETCDIR = /etc/chinese/
++ETCDIR = /usr/local/etc/etc
  
- #oddPages: 0 不輸出奇數頁，1 輸出奇數頁(預設值: 1) 
- #true=1, false=0 
---- ttf2psm.c.orig	Wed Aug 26 21:50:26 1998
-+++ ttf2psm.c	Fri Dec 17 17:03:31 1999
-@@ -10,7 +10,6 @@
- #include <math.h>
- #include <stdlib.h>
- #include <string.h>
--#include <malloc.h>
- #include <memory.h>
- #include <time.h>
+ all: ttf2psm
  
-@@ -96,7 +95,7 @@
- void Beg();
- void End();
+@@ -33,12 +35,12 @@
+ 	$(CC) -c $(CFLAGS) $(INCLUDEDIR) $< -o $@
+ 
+ ttf2psm: $(OBJS)
+-	$(CC) $(CFLAGS) $(INCLUDEDIR) $(LIBS) -o ttf2psm $(OBJS)
++	$(CC) $(CFLAGS) $(INCLUDEDIR) $(LIBSDIR) $(LIBS) -o ttf2psm $(OBJS)
+ 
+ install: all bg5ps bg5ps.conf
+ 	mkdir -p $(ETCDIR)
+ 	mkdir -p $(BINDIR)
+-	$(INSTALL) -m644 bg5ps.conf $(ETCDIR)/bg5ps.conf
++	$(INSTALL) -m644 bg5ps.conf $(ETCDIR)/bg5ps.conf.sample
+ 	$(INSTALL) -m755 bg5ps $(BINDIR)
+ 	$(INSTALL) -m755 ttf2psm $(BINDIR)
  
--void main(int argc, char *argv[]){
-+int main(int argc, char *argv[]){
-   FILE *fn;
-   short cidx, i;
-   time_t t1, t2;
diff --git a/chinese/bg5ps/files/patch-ab b/chinese/bg5ps/files/patch-ab
new file mode 100644
index 000000000000..b7dde0daa4be
--- /dev/null
+++ b/chinese/bg5ps/files/patch-ab
@@ -0,0 +1,11 @@
+--- bg5ps.conf.orig	Thu Nov  2 23:47:35 2000
++++ bg5ps.conf	Thu Nov  2 23:50:27 2000
+@@ -4,7 +4,7 @@
+ Encoding="big5"
+ 
+ #chineseFontPath: 指定中文字型的路徑(預設值: 與 bg5ps 同) 
+-chineseFontPath="/usr/share/fonts/ttf/"
++chineseFontPath="/usr/X11R6/lib/X11/fonts/TrueType"
+ 
+ #modify the above line
+ 
diff --git a/chinese/bg5ps/files/patch-ac b/chinese/bg5ps/files/patch-ac
new file mode 100644
index 000000000000..c4ba1d18afbb
--- /dev/null
+++ b/chinese/bg5ps/files/patch-ac
@@ -0,0 +1,23 @@
+--- bg5ps.orig	Thu Nov  2 23:50:38 2000
++++ bg5ps	Thu Nov  2 23:55:25 2000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/local/bin/python
+ ################################################################################
+ # bg5ps.py which use the ttf2ps program to convert the Big5 Coding chinese     #
+ # text into printable postscript file.  Since it uses true type font, the      #
+@@ -443,10 +443,10 @@
+                 exec l
+             cf.close()
+         else:
+-            sys.stderr.write("\n~/.bg5ps.conf not found.\n Trying /etc/chinese/bg5ps.conf.")
+-            if os.path.isfile("/etc/chinese/bg5ps.conf"):
+-                sys.stderr.write("\n /etc/chinese/bg5ps.conf found. Use configuration file /etc/chinese/bg5ps.conf")
+-                cf=open("/etc/chinese/bg5ps.conf","r")
++            sys.stderr.write("\n~/.bg5ps.conf not found.\n Trying /usr/local/etc/bg5ps.conf.")
++            if os.path.isfile("/usr/local/etc/bg5ps.conf"):
++                sys.stderr.write("\n /usr/local/etc/bg5ps.conf found. Use configuration file /usr/local/etc/bg5ps.conf")
++                cf=open("/usr/local/etc/bg5ps.conf","r")
+                 for l in cf.readlines():
+                     exec l
+                 cf.close()
diff --git a/chinese/bg5ps/files/patch-ad b/chinese/bg5ps/files/patch-ad
new file mode 100644
index 000000000000..b3f7514eae1f
--- /dev/null
+++ b/chinese/bg5ps/files/patch-ad
@@ -0,0 +1,11 @@
+--- ttf2psm.c.orig	Thu Nov  2 22:47:32 2000
++++ ttf2psm.c	Thu Nov  2 22:47:35 2000
+@@ -19,7 +19,7 @@
+  */
+ 
+ #include<stdio.h>
+-#include<freetype/freetype.h>
++#include<freetype.h>
+ #include<string.h>
+ #include<ctype.h>
+ 
diff --git a/chinese/bg5ps/files/patch-ae b/chinese/bg5ps/files/patch-ae
new file mode 100644
index 000000000000..2405e24edceb
--- /dev/null
+++ b/chinese/bg5ps/files/patch-ae
@@ -0,0 +1,9 @@
+--- gb2312-bg5ps.conf.orig	Fri Nov  3 01:31:43 2000
++++ gb2312-bg5ps.conf	Fri Nov  3 01:31:49 2000
+@@ -1,5 +1,5 @@
+ #chineseFontPath: 指定中文字型的路徑(預設值: 與 bg5ps 同) 
+-chineseFontPath="/usr/share/fonts/ttf/"
++chineseFontPath="/usr/X11R6/lib/X11/fonts/TrueType"
+ 
+ #modify the above line
+ 
diff --git a/chinese/bg5ps/pkg-comment b/chinese/bg5ps/pkg-comment
index 59decc8f6743..c8eda93e3c42 100644
--- a/chinese/bg5ps/pkg-comment
+++ b/chinese/bg5ps/pkg-comment
@@ -1 +1 @@
-Convert Chinese-Big5 encoded file to Postscript, using TTF fonts
+Convert Chinese-Big5/GB encoded files to Postscript, using TTF fonts
diff --git a/chinese/bg5ps/pkg-descr b/chinese/bg5ps/pkg-descr
index 010e0113ef02..b8fe6059f397 100644
--- a/chinese/bg5ps/pkg-descr
+++ b/chinese/bg5ps/pkg-descr
@@ -1,2 +1,2 @@
-bg5ps is a Python script that generates Postscript from a Chinese Big5
-encoded file. You have to specify the TTF font path (default: ~/.bg5ps.conf).
+bg5ps is a Python script that generates Postscript from a Chinese Big5/GB
+encoded file.
diff --git a/chinese/bg5ps/pkg-message b/chinese/bg5ps/pkg-message
index ef1f2f76b1e6..7cbb1de355ba 100644
--- a/chinese/bg5ps/pkg-message
+++ b/chinese/bg5ps/pkg-message
@@ -1,6 +1,9 @@
+--------------------------------------------------------------------
+Please check the following files:
 
-------------------------------------------------------------
-Copy /usr/local/share/doc/bg5ps/bg5ps.conf to ~/.bg5ps.conf.
-Then modify it to suit your needs.
-------------------------------------------------------------
+/usr/local/share/doc/bg5ps/bg5ps.conf.sample
+/usr/local/share/doc/bg5ps/gb2312-bg5ps.conf.sample
 
+Copy one of them to ~/.bg5ps.conf(depend on which encoding you use),
+then modify it to suit your needs.  Type `bg5ps -h` for help.
+--------------------------------------------------------------------
diff --git a/chinese/bg5ps/pkg-plist b/chinese/bg5ps/pkg-plist
index 86dba3bcfda0..07c0a03bdbc4 100644
--- a/chinese/bg5ps/pkg-plist
+++ b/chinese/bg5ps/pkg-plist
@@ -1,6 +1,8 @@
 bin/bg5ps
 bin/ttf2psm
-share/doc/bg5ps/bg5ps.conf
+etc/bg5ps.conf.sample
+etc/gb2312-bg5ps.conf.sample
+share/doc/bg5ps/COPYING.txt
 share/doc/bg5ps/bg5ps.sgml
 share/doc/bg5ps/bg5ps.txt
 share/doc/bg5ps/html/bg5ps.html
@@ -15,6 +17,7 @@ share/doc/bg5ps/makeps
 share/doc/bg5ps/ttf2ps.doc
 share/examples/bg5ps/netscape.ps
 share/examples/bg5ps/test.big5
+share/examples/bg5ps/test.gb2312
 share/examples/bg5ps/test.sh
 @dirrm share/doc/bg5ps/html
 @dirrm share/doc/bg5ps