Attachment 136910 Details for Bug 182258 – file.diff

[patch] file.diff

file.diff (text/plain), 9.04 KB, created by buganini on 2013-09-20 22:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: buganini

Created: 2013-09-20 22:40:00 UTC

Size: 9.04 KB

patch

obsolete

>diff -ruN /usr/ports/converters/bsdconv/Makefile converters/bsdconv/Makefile
>--- /usr/ports/converters/bsdconv/Makefile	2013-05-02 07:11:37.000000000 +0800
>+++ converters/bsdconv/Makefile	2013-09-18 01:34:27.170625563 +0800
>@@ -1,8 +1,8 @@
> # Created by: buganini@gmail.com
>-# $FreeBSD: converters/bsdconv/Makefile 317057 2013-05-01 23:11:37Z bdrewery $
>+# $FreeBSD: converters/bsdconv/Makefile 313968 2013-03-12 11:40:45Z bdrewery $
> 
> PORTNAME=	bsdconv
>-PORTVERSION=	10.0
>+PORTVERSION=	11.1
> CATEGORIES=	converters
> DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
> 
>@@ -13,7 +13,7 @@
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	buganini
>-GH_COMMIT=	d4bd6ac
>+GH_COMMIT=	8ccd7e3
> 
> OPTIONS_DEFINE=	CHINESE EBCDIC
> CHINESE_DESC=	Extra Chinese codecs
>diff -ruN /usr/ports/converters/bsdconv/distinfo converters/bsdconv/distinfo
>--- /usr/ports/converters/bsdconv/distinfo	2013-05-02 07:11:37.000000000 +0800
>+++ converters/bsdconv/distinfo	2013-09-18 02:01:07.664672823 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (buganini-bsdconv-10.0-0-gd4bd6ac.tar.gz) = bfe7a5039d3118450a2ea1ee6d358e546c6da544a83ff93781dd1ecad8a219d1
>-SIZE (buganini-bsdconv-10.0-0-gd4bd6ac.tar.gz) = 5753118
>+SHA256 (buganini-bsdconv-11.1-0-g8ccd7e3.tar.gz) = 5ce36848e37d6dac342518788ee40f4b774d92bedf30c52a52075d376ac94d0f
>+SIZE (buganini-bsdconv-11.1-0-g8ccd7e3.tar.gz) = 5812445
>diff -ruN /usr/ports/converters/bsdconv/files/patch-Makefile converters/bsdconv/files/patch-Makefile
>--- /usr/ports/converters/bsdconv/files/patch-Makefile	2013-07-08 19:20:27.000000000 +0800
>+++ converters/bsdconv/files/patch-Makefile	2013-09-20 03:30:49.294742557 +0800
>@@ -2,7 +2,7 @@
> +++ Makefile	2012-08-16 22:36:47.000000000 +0800
> @@ -3,17 +3,9 @@
>  CFLAGS+=-Wall -DPREFIX='"${PREFIX}"' -DBSDCONV_PATH='"${BSDCONV_PATH}"'
>- SHLIBVER=10
>+ SHLIBVER=7
>  
> -UNAME_S=$(shell uname -s)
> -ifeq (${UNAME_S}, Darwin)
>@@ -16,37 +16,4 @@
> -LIBS+=-ldl
> -endif
>  
>- TODO_CODECS_BASIC=
>- TODO_CODECS_BASIC+=from/00
>-@@ -184,27 +176,27 @@
>- bsdconv-man: builddir libbsdconv meta src/bsdconv.h src/bsdconv.c
>- 	$(CC) ${CFLAGS} src/bsdconv-man.c -L./build/lib/ -o build/bin/bsdconv-man -lbsdconv ${LIBS}
>- 
>--bsdconv-completion: builddir libbsdconv src/bsdconv.h src/bsdconv-completion.c
>-+bsdconv-completion: builddir libbsdconv meta src/bsdconv.h src/bsdconv-completion.c
>- 	$(CC) ${CFLAGS} src/bsdconv-completion.c -L./build/lib -o build/bin/bsdconv-completion -lbsdconv ${LIBS}
>- 
>- bsdconv_dbg: builddir libbsdconv src/libbsdconv.c src/bsdconv.h src/bsdconv_dbg.c
>- 	$(CC) ${CFLAGS} src/libbsdconv.c src/bsdconv_dbg.c -o build/bin/bsdconv_dbg ${LIBS}
>- 
>--codecs_basic: builddir bsdconv-mktable
>-+codecs_basic: builddir bsdconv-mktable libbsdconv meta
>- 	for item in ${TODO_CODECS_BASIC} ; do \
>- 		./build/bin/bsdconv-mktable codecs/$${item}.txt ./build/share/bsdconv/$${item} ; \
>- 		if [ -e codecs/$${item}.man ]; then cp codecs/$${item}.man ./build/share/bsdconv/$${item}.man ; fi ; \
>- 		if [ -e codecs/$${item}.c ]; then $(CC) ${CFLAGS} codecs/$${item}.c -L./build/lib/ -fPIC -shared -o ./build/share/bsdconv/$${item}.so -lbsdconv ${LIBS} ; fi ; \
>- 	done
>- 
>--codecs_chinese: builddir bsdconv-mktable
>-+codecs_chinese: builddir bsdconv-mktable libbsdconv meta
>- 	for item in ${TODO_CODECS_CHINESE} ; do \
>- 		./build/bin/bsdconv-mktable codecs/$${item}.txt ./build/share/bsdconv/$${item} ; \
>- 		if [ -e codecs/$${item}.man ]; then cp codecs/$${item}.man ./build/share/bsdconv/$${item}.man ; fi ; \
>- 		if [ -e codecs/$${item}.c ]; then $(CC) ${CFLAGS} codecs/$${item}.c -L./build/lib/ -fPIC -shared -o ./build/share/bsdconv/$${item}.so -lbsdconv ${LIBS} ; fi ; \
>- 	done
>- 
>--codecs_ebcdic: builddir bsdconv-mktable
>-+codecs_ebcdic: builddir bsdconv-mktable libbsdconv meta
>- 	for item in ${TODO_CODECS_EBCDIC} ; do \
>- 		./build/bin/bsdconv-mktable codecs/$${item}.txt ./build/share/bsdconv/$${item} ; \
>- 		if [ -e codecs/$${item}.man ]; then cp codecs/$${item}.man ./build/share/bsdconv/$${item}.man ; fi ; \
>+ TODO_CODECS_BASIC_TABLE=
>diff -ruN /usr/ports/converters/bsdconv/pkg-plist converters/bsdconv/pkg-plist
>--- /usr/ports/converters/bsdconv/pkg-plist	2013-05-02 07:11:37.000000000 +0800
>+++ converters/bsdconv/pkg-plist	2013-09-18 01:35:57.786625560 +0800
>@@ -4,7 +4,7 @@
> bin/bsdconv-mktable
> include/bsdconv.h
> lib/libbsdconv.so
>-lib/libbsdconv.so.10
>+lib/libbsdconv.so.11
> %%DATADIR%%/from/alias
> %%DATADIR%%/inter/alias
> %%DATADIR%%/to/alias
>@@ -22,14 +22,19 @@
> %%DATADIR%%/from/ASCII
> %%DATADIR%%/from/BIG5-5C
> %%DATADIR%%/from/BSDCONV
>+%%DATADIR%%/from/BSDCONV.man
> %%DATADIR%%/from/BSDCONV.so
>-%%DATADIR%%/from/BSDCONV_KEYWORD
>-%%DATADIR%%/from/BSDCONV_LOG
>-%%DATADIR%%/from/BSDCONV_LOG.so
>+%%DATADIR%%/from/BSDCONV-KEYWORD
>+%%DATADIR%%/from/BSDCONV-KEYWORD.man
>+%%DATADIR%%/from/BSDCONV-LOG
>+%%DATADIR%%/from/BSDCONV-LOG.man
>+%%DATADIR%%/from/BSDCONV-LOG.so
> %%DATADIR%%/from/BYTE
> %%DATADIR%%/from/ESCAPE
>+%%DATADIR%%/from/ESCAPE.man
> %%DATADIR%%/from/ESCAPE.so
> %%DATADIR%%/from/PASS
>+%%DATADIR%%/from/PASS.man
> %%DATADIR%%/from/PASS.so
> %%DATADIR%%/from/UTF-16BE
> %%DATADIR%%/from/UTF-16BE.so
>@@ -52,31 +57,41 @@
> %%DATADIR%%/from/_SHIFT-JIS
> %%DATADIR%%/from/_UAO250
> %%DATADIR%%/from/_UTF-8
>+%%DATADIR%%/from/_UTF-8.man
> %%DATADIR%%/from/_UTF-8.so
>+%%DATADIR%%/inter/ALIAS-FROM
>+%%DATADIR%%/inter/ALIAS-FROM.so
>+%%DATADIR%%/inter/ALIAS-INTER
>+%%DATADIR%%/inter/ALIAS-TO
>+%%DATADIR%%/inter/ALIAS-TO.so
> %%DATADIR%%/inter/AMBIGUOUS-PAD
>+%%DATADIR%%/inter/AMBIGUOUS-PAD.man
> %%DATADIR%%/inter/AMBIGUOUS-PAD.so
> %%DATADIR%%/inter/AMBIGUOUS-UNPAD
>+%%DATADIR%%/inter/AMBIGUOUS-UNPAD.man
> %%DATADIR%%/inter/AMBIGUOUS-UNPAD.so
> %%DATADIR%%/inter/BIG5-DEFRAG
> %%DATADIR%%/inter/BIG5-DEFRAG.so
>-%%DATADIR%%/inter/FROM_ALIAS
>-%%DATADIR%%/inter/FROM_ALIAS.so
>+%%DATADIR%%/inter/COUNT
>+%%DATADIR%%/inter/COUNT.man
>+%%DATADIR%%/inter/COUNT.so
> %%DATADIR%%/inter/FULL
> %%DATADIR%%/inter/HALF
>-%%DATADIR%%/inter/INTER_ALIAS
>-%%DATADIR%%/inter/KANA_PHONETIC
>+%%DATADIR%%/inter/INSERT
>+%%DATADIR%%/inter/INSERT.man
>+%%DATADIR%%/inter/INSERT.so
>+%%DATADIR%%/inter/KANA-PHONETIC
> %%DATADIR%%/inter/LOWER
> %%DATADIR%%/inter/MAC
> %%DATADIR%%/inter/NOBOM
> %%DATADIR%%/inter/NL2BR
>+%%DATADIR%%/inter/PASS
>+%%DATADIR%%/inter/PASS.man
>+%%DATADIR%%/inter/PASS.so
> %%DATADIR%%/inter/SCORE
> %%DATADIR%%/inter/SCORE.so
>-%%DATADIR%%/inter/SCORE_TRAIN
>-%%DATADIR%%/inter/SCORE_TRAIN.so
>-%%DATADIR%%/inter/SPLIT
>-%%DATADIR%%/inter/SPLIT.so
>-%%DATADIR%%/inter/TO_ALIAS
>-%%DATADIR%%/inter/TO_ALIAS.so
>+%%DATADIR%%/inter/SCORE-TRAIN
>+%%DATADIR%%/inter/SCORE-TRAIN.so
> %%DATADIR%%/inter/TRIM-WIDTH
> %%DATADIR%%/inter/TRIM-WIDTH.so
> %%DATADIR%%/inter/UNIX
>@@ -87,17 +102,31 @@
> %%DATADIR%%/inter/WHITESPACE-RERAIL
> %%DATADIR%%/inter/WHITESPACE-RERAIL.so
> %%DATADIR%%/inter/WIDTH
>+%%DATADIR%%/inter/WIDTH.man
> %%DATADIR%%/inter/WIDTH.so
> %%DATADIR%%/inter/WIN
> %%DATADIR%%/inter/ZH-STRINGS
>+%%DATADIR%%/inter/ZH-STRINGS.man
> %%DATADIR%%/inter/ZH-STRINGS.so
> %%DATADIR%%/inter/ZHCN
> %%DATADIR%%/inter/ZHTW
>-%%DATADIR%%/inter/ZHTW_WORDS
>-%%DATADIR%%/inter/ZH_FUZZY_TW
>-%%DATADIR%%/inter/ZH_FUZZY_CN
>+%%DATADIR%%/inter/ZHTW-WORDS
>+%%DATADIR%%/inter/ZH-FUZZY-TW
>+%%DATADIR%%/inter/ZH-FUZZY-CN
>+%%DATADIR%%/inter/_NFC
>+%%DATADIR%%/inter/_NFC.so
>+%%DATADIR%%/inter/_NFC-MAP
>+%%DATADIR%%/inter/_NFD
>+%%DATADIR%%/inter/_NFKD
>+%%DATADIR%%/inter/_NF-HANGUL-COMPOSITION
>+%%DATADIR%%/inter/_NF-HANGUL-COMPOSITION.so
>+%%DATADIR%%/inter/_NF-HANGUL-DECOMPOSITION
>+%%DATADIR%%/inter/_NF-HANGUL-DECOMPOSITION.so
>+%%DATADIR%%/inter/_NF-ORDER
>+%%DATADIR%%/inter/_NF-ORDER.so
> %%DATADIR%%/to/00
> %%DATADIR%%/to/ANY
>+%%DATADIR%%/to/ANY.man
> %%DATADIR%%/to/ANY.so
> %%DATADIR%%/to/ASCII-HTML-CNS11643-IMG
> %%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.so
>@@ -110,21 +139,22 @@
> %%DATADIR%%/to/BIG5-5C
> %%DATADIR%%/to/BSDCONV
> %%DATADIR%%/to/BSDCONV.so
>-%%DATADIR%%/to/BSDCONV_KEYWORD
>-%%DATADIR%%/to/BSDCONV_LOG
>-%%DATADIR%%/to/BSDCONV_LOG.so
>-%%DATADIR%%/to/BSDCONV_STDOUT
>-%%DATADIR%%/to/BSDCONV_STDOUT.so
>+%%DATADIR%%/to/BSDCONV-KEYWORD
>+%%DATADIR%%/to/BSDCONV-KEYWORD.man
>+%%DATADIR%%/to/BSDCONV-LOG
>+%%DATADIR%%/to/BSDCONV-LOG.so
>+%%DATADIR%%/to/BSDCONV-STDOUT
>+%%DATADIR%%/to/BSDCONV-STDOUT.so
> %%DATADIR%%/to/BYTE
> %%DATADIR%%/to/_CP1251
> %%DATADIR%%/to/_CP1252
> %%DATADIR%%/to/_CP1253
> %%DATADIR%%/to/_CP874
> %%DATADIR%%/to/_CP936
>-%%DATADIR%%/to/CP936_TRANS
>+%%DATADIR%%/to/CP936-TRANS
> %%DATADIR%%/to/_CP949
> %%DATADIR%%/to/_CP950
>-%%DATADIR%%/to/CP950_TRANS
>+%%DATADIR%%/to/CP950-TRANS
> %%DATADIR%%/to/ESCAPE
> %%DATADIR%%/to/ESCAPE.man
> %%DATADIR%%/to/ESCAPE.so
>@@ -137,8 +167,10 @@
> %%DATADIR%%/to/NULL
> %%DATADIR%%/to/NULL.so
> %%DATADIR%%/to/PASS
>+%%DATADIR%%/to/PASS.man
> %%DATADIR%%/to/PASS.so
> %%DATADIR%%/to/RAW
>+%%DATADIR%%/to/RAW.man
> %%DATADIR%%/to/RAW.so
> %%DATADIR%%/to/_UAO250
> %%DATADIR%%/to/UCS-2BE
>@@ -165,10 +197,10 @@
> %%CHINESE%%%%DATADIR%%/inter/CHEWING
> %%CHINESE%%%%DATADIR%%/inter/CHEWING.man
> %%CHINESE%%%%DATADIR%%/inter/CNS11643
>-%%CHINESE%%%%DATADIR%%/inter/HAN_PINYIN
>+%%CHINESE%%%%DATADIR%%/inter/HAN-PINYIN
> %%CHINESE%%%%DATADIR%%/inter/UNICODE
>-%%CHINESE%%%%DATADIR%%/inter/ZH_COMP
>-%%CHINESE%%%%DATADIR%%/inter/ZH_DECOMP
>+%%CHINESE%%%%DATADIR%%/inter/ZH-COMP
>+%%CHINESE%%%%DATADIR%%/inter/ZH-DECOMP
> %%CHINESE%%%%DATADIR%%/to/CCCII
> %%CHINESE%%%%DATADIR%%/to/_CNS11643
> %%CHINESE%%%%DATADIR%%/to/_CNS11643.so

Actions: View | Diff

Attachments on bug 182258: 136910