Skip site navigation (1)Skip section navigation (2)
Date:      Sat,  2 Dec 2006 17:22:00 +0800
From:      chinsan <chinsan@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/106202: [PATCH] chinese/cnprint: [SUMMARIZE CHANGES], take maintainership
Message-ID:  <20061202092202.4813E2E9DF@smtp2.bc.hgc.com.tw>
Resent-Message-ID: <200612020930.kB29U7D2003525@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         106202
>Category:       ports
>Synopsis:       [PATCH] chinese/cnprint: [SUMMARIZE CHANGES], take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 02 09:30:07 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     chinsan
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD chinsan2.twbbs.org 6.1-STABLE FreeBSD 6.1-STABLE #1: Fri Jun  2 16:44:35 CST
>Description:
- Remove bad site
- Make portlint more happy
- Take maintainership

Removed file(s):
- files/patch-cnprint330b.c

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- cnprint-3.30b.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/chinese/cnprint/Makefile /usr/home/chinsan/project/cnprint/Makefile
--- /usr/ports/chinese/cnprint/Makefile	Tue Jul 25 06:06:17 2006
+++ /usr/home/chinsan/project/cnprint/Makefile	Sat Dec  2 17:17:06 2006
@@ -5,30 +5,22 @@
 # $FreeBSD: ports/chinese/cnprint/Makefile,v 1.8 2006/07/24 13:03:09 jmelo Exp $
 #
 
-PORTNAME=		cnprint
-PORTVERSION=		3.30b
-CATEGORIES=		chinese print
-MASTER_SITES=		http://ftp.wustl.edu/pub/FreeBSD/distfiles/${PORTNAME}-${PORTVERSION}/ \
-			http://ftp.yz.yamagata-u.ac.jp/pub/FreeBSD/distfiles/${PORTNAME}-${PORTVERSION}/ \
-			http://ftp.osuosl.org/pub/FreeBSD/distfiles/${PORTNAME}-${PORTVERSION}/
-DISTFILES=		cnprint330b.c \
-			cnprint330b.readme \
-			ttfb330b.c \
-			cnprint330b.hlp \
-			cnprint33.cmd \
-			helvet.dat  \
-			mssong.ttf.gz mssong.htf \
-			mshei.ttf.gz mshei.htf \
-			cc48s.hbf cc48.sym.gz \
-			cc48s.1.gz \
-			cc48s.2.gz \
-			hbf.tar.gz \
-			ntu_kai48.hbf ntu_kai48.bin.gz
+PORTNAME=	cnprint
+PORTVERSION=	3.30b
+CATEGORIES=	chinese print
+MASTER_SITES=	http://ftp.yz.yamagata-u.ac.jp/pub/FreeBSD/distfiles/${PORTNAME}-${PORTVERSION}/ \
+		http://ftp.osuosl.org/pub/FreeBSD/distfiles/${PORTNAME}-${PORTVERSION}/
+DISTFILES=	cnprint330b.c cnprint330b.readme ttfb330b.c cnprint330b.hlp \
+		cnprint33.cmd helvet.dat  mssong.ttf.gz mssong.htf \
+		mshei.ttf.gz mshei.htf cc48s.hbf cc48.sym.gz cc48s.1.gz \
+		cc48s.2.gz hbf.tar.gz ntu_kai48.hbf ntu_kai48.bin.gz
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		Convert Chinese-Big5/GB encoded files to Postscript, using TTF fonts
+MAINTAINER=	chinsan@FreeBSD.org
+COMMENT=	Print CJK text (or convert to PostScript)
 
-DIST_SUBDIR=		${PORTNAME}-${PORTVERSION}
+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
+FILES=		${WRKSRC}/*.sym ${WRKSRC}/*.htf ${WRKSRC}/*.hbf \
+		${WRKSRC}/*.bin ${WRKSRC}/*.ttf
 
 do-extract:
 	${MKDIR} ${WRKSRC}
@@ -40,23 +32,21 @@
 	${RM} -fr hbf ; \
 	${GUNZIP_CMD} *.gz || ${TRUE}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,/usr/local/src,${PREFIX}/share,' \
+		${WRKSRC}/cnprint330b.c
+	@${REINPLACE_CMD} -e 's/\(DEFAULT_JIS_FONT\):.*$$/\1: kanji48.hbf/; \
+		s/\(DEFAULT_BIG5FONT\):.*$$/\1: ntu_kai48.hbf/; \
+		s/\(DEFAULT_ENCODING\):.*$$/\1: BIG5/' ${WRKSRC}/cnprint33.cmd
+
 do-build:
 	cd ${WRKSRC} ; \
-	${CC} cnprint330b.c ttfb330b.c -o cnprint -DPREFIX=\"${PREFIX}\" ; \
-	${SED} \
-		-e 's/\(DEFAULT_JIS_FONT\):.*$$/\1: kanji48.hbf/' \
-		-e 's/\(DEFAULT_BIG5FONT\):.*$$/\1: ntu_kai48.hbf/' \
-		-e 's/\(DEFAULT_ENCODING\):.*$$/\1: BIG5/' \
-		>cnprint.cmd <cnprint33.cmd
+	${CC} cnprint330b.c ttfb330b.c -o cnprint -DPREFIX=\"${PREFIX}\"
 
 do-install:
-	${MKDIR} ${PREFIX}/share/cnprint
-	${INSTALL_DATA} ${WRKSRC}/cnprint.cmd ${PREFIX}/share/cnprint
-	${INSTALL_DATA} ${WRKSRC}/*.sym ${PREFIX}/share/cnprint
-	${INSTALL_DATA} ${WRKSRC}/*.htf ${PREFIX}/share/cnprint
-	${INSTALL_DATA} ${WRKSRC}/*.hbf ${PREFIX}/share/cnprint
-	${INSTALL_DATA} ${WRKSRC}/*.bin ${PREFIX}/share/cnprint
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${PREFIX}/share/cnprint
+	${MKDIR} ${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/cnprint ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}33.cmd  ${DATADIR}/${PORTNAME}.cmd
+	${INSTALL_DATA} ${FILES} ${DATADIR}
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/chinese/cnprint/files/patch-cnprint330b.c /usr/home/chinsan/project/cnprint/files/patch-cnprint330b.c
--- /usr/ports/chinese/cnprint/files/patch-cnprint330b.c	Sun Apr 27 08:33:09 2003
+++ /usr/home/chinsan/project/cnprint/files/patch-cnprint330b.c	Thu Jan  1 08:00:00 1970
@@ -1,11 +0,0 @@
---- cnprint330b.c.orig	Tue Jul  2 01:22:08 2002
-+++ cnprint330b.c
-@@ -6216,7 +6216,7 @@
- 	if (s==NULL) {
- 		defpath[0]='\0';
- #ifdef unix
--		strcpy(defpath, "/usr/local/src/cnprint");
-+		strcpy(defpath, PREFIX "/share/cnprint");
- #endif
- 		s=defpath;
- 	}
diff -ruN --exclude=CVS /usr/ports/chinese/cnprint/pkg-plist /usr/home/chinsan/project/cnprint/pkg-plist
--- /usr/ports/chinese/cnprint/pkg-plist	Tue Jul 15 18:24:53 2003
+++ /usr/home/chinsan/project/cnprint/pkg-plist	Sat Dec  2 16:12:21 2006
@@ -1,22 +1,22 @@
 bin/cnprint
-share/cnprint/cc48.sym
-share/cnprint/cc48s.hbf
-share/cnprint/cnprint.cmd
-share/cnprint/hanglm24.bin
-share/cnprint/hanglm24.hbf
-share/cnprint/hanja65.hbf
-share/cnprint/jis16.hbf
-share/cnprint/jiskan24.bin
-share/cnprint/jiskan24.hbf
-share/cnprint/kanji48.bin
-share/cnprint/kanji48.hbf
-share/cnprint/ksc16.hbf
-share/cnprint/ntu_kai48.bin
-share/cnprint/ntu_kai48.hbf
-share/cnprint/uwjis-16.hbf
-share/cnprint/uwksc-16.hbf
-share/cnprint/mshei.htf
-share/cnprint/mshei.ttf
-share/cnprint/mssong.htf
-share/cnprint/mssong.ttf
-@dirrm share/cnprint
+%%DATADIR%%/cc48.sym
+%%DATADIR%%/cc48s.hbf
+%%DATADIR%%/cnprint.cmd
+%%DATADIR%%/hanglm24.bin
+%%DATADIR%%/hanglm24.hbf
+%%DATADIR%%/hanja65.hbf
+%%DATADIR%%/jis16.hbf
+%%DATADIR%%/jiskan24.bin
+%%DATADIR%%/jiskan24.hbf
+%%DATADIR%%/kanji48.bin
+%%DATADIR%%/kanji48.hbf
+%%DATADIR%%/ksc16.hbf
+%%DATADIR%%/ntu_kai48.bin
+%%DATADIR%%/ntu_kai48.hbf
+%%DATADIR%%/uwjis-16.hbf
+%%DATADIR%%/uwksc-16.hbf
+%%DATADIR%%/mshei.htf
+%%DATADIR%%/mshei.ttf
+%%DATADIR%%/mssong.htf
+%%DATADIR%%/mssong.ttf
+@dirrmtry %%DATADIR%%
--- cnprint-3.30b.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061202092202.4813E2E9DF>