Attachment 132558 Details for Bug 176867 – file.diff

[patch] file.diff

file.diff (text/plain), 10.94 KB, created by buganini on 2013-03-12 05:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: buganini

Created: 2013-03-12 05:00:00 UTC

Size: 10.94 KB

patch

obsolete

>diff -ruN /usr/ports/converters/bsdconv/Makefile bsdconv/Makefile
>--- /usr/ports/converters/bsdconv/Makefile	2012-12-08 00:53:02.000000000 +0800
>+++ bsdconv/Makefile	2013-03-12 11:59:41.000000000 +0800
>@@ -2,7 +2,7 @@
> # $FreeBSD: ports/converters/bsdconv/Makefile,v 1.20 2012/11/17 05:55:02 svnexp Exp $
> 
> PORTNAME=	bsdconv
>-PORTVERSION=	9.0
>+PORTVERSION=	9.1
> CATEGORIES=	converters
> DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
> 
>@@ -13,27 +13,35 @@
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	buganini
>-GH_COMMIT=	b514ea8
>+GH_COMMIT=	24b9f01
> 
>-OPTIONS_DEFINE=	EXTRA
>-EXTRA_DESC=	Extra codecs (Chinese specifics)
>+OPTIONS_DEFINE=	CHINESE EBCDIC
>+CHINESE_DESC=	Extra Chinese codecs
>+EBCDIC_DESC=	EBCDIC codecs
> 
> USE_LDCONFIG=	yes
> 
>-MAKE_JOBS_UNSAFE=	yes
> MAKE_ARGS=	PREFIX=${PREFIX}
> 
>-ALL_TARGET=	libbsdconv bsdconv_mktable meta bsdconv codecs_basic
>+ALL_TARGET=	libbsdconv bsdconv_mktable meta bsdconv_completion bsdconv codecs_basic
> INSTALL_TARGET=	installdir install_main install_basic
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MEXTRA}
>-ALL_TARGET+=	codecs_extra
>-INSTALL_TARGET+=install_extra
>-PLIST_SUB+=	EXTRA=""
>+.if ${PORT_OPTIONS:MCHINESE}
>+ALL_TARGET+=	codecs_chinese
>+INSTALL_TARGET+=install_chinese
>+PLIST_SUB+=	CHINESE=""
> .else
>-PLIST_SUB+=	EXTRA="@comment "
>+PLIST_SUB+=	CHINESE="@comment "
>+.endif
>+
>+.if ${PORT_OPTIONS:MEBCDIC}
>+ALL_TARGET+=	codecs_ebcdic
>+INSTALL_TARGET+=install_ebcdic
>+PLIST_SUB+=	EBCDIC=""
>+.else
>+PLIST_SUB+=	EBCDIC="@comment "
> .endif
> 
> pre-install:
>diff -ruN /usr/ports/converters/bsdconv/distinfo bsdconv/distinfo
>--- /usr/ports/converters/bsdconv/distinfo	2012-10-09 09:38:58.000000000 +0800
>+++ bsdconv/distinfo	2013-03-12 11:20:55.000000000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (buganini-bsdconv-9.0-0-gb514ea8.tar.gz) = b1450b19cf9b5089fd528377a04144bd7e05bba756dfbc1e14ee1d3aa0f2f2e5
>-SIZE (buganini-bsdconv-9.0-0-gb514ea8.tar.gz) = 5085298
>+SHA256 (buganini-bsdconv-9.1-0-g24b9f01.tar.gz) = 5f462cfd7b2f721f670577bfbd6553fb18b5681fce298e0ce47964b3d16f8547
>+SIZE (buganini-bsdconv-9.1-0-g24b9f01.tar.gz) = 5743844
>diff -ruN /usr/ports/converters/bsdconv/pkg-plist bsdconv/pkg-plist
>--- /usr/ports/converters/bsdconv/pkg-plist	2012-10-09 09:38:58.000000000 +0800
>+++ bsdconv/pkg-plist	2013-03-12 12:08:11.000000000 +0800
>@@ -1,183 +1,208 @@
> bin/bsdconv
>+bin/bsdconv_completion
> bin/bsdconv_mktable
> include/bsdconv.h
> lib/libbsdconv.so
> lib/libbsdconv.so.9
>+%%DATADIR%%/from/alias
>+%%DATADIR%%/inter/alias
>+%%DATADIR%%/to/alias
> %%DATADIR%%/from/00
> %%DATADIR%%/from/3F
>-%%DATADIR%%/from/3F.so
> %%DATADIR%%/from/ANSI-CONTROL
>-%%DATADIR%%/from/ANSI-CONTROL.so
>-%%DATADIR%%/from/ASCII
> %%DATADIR%%/from/ASCII-NAMED-HTML-ENTITY
> %%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY
>-%%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY.so
>+%%DATADIR%%/from/ASCII
> %%DATADIR%%/from/BIG5-5C
> %%DATADIR%%/from/BSDCONV
>-%%DATADIR%%/from/BSDCONV.so
> %%DATADIR%%/from/BSDCONV_KEYWORD
> %%DATADIR%%/from/BSDCONV_LOG
>-%%DATADIR%%/from/BSDCONV_LOG.so
> %%DATADIR%%/from/BYTE
> %%DATADIR%%/from/ESCAPE
>-%%DATADIR%%/from/ESCAPE.so
> %%DATADIR%%/from/PASS
>-%%DATADIR%%/from/PASS.so
> %%DATADIR%%/from/SKIP
>-%%DATADIR%%/from/SKIP.so
>+%%DATADIR%%/from/SUB
> %%DATADIR%%/from/UTF-16BE
>-%%DATADIR%%/from/UTF-16BE.so
> %%DATADIR%%/from/UTF-16LE
>-%%DATADIR%%/from/UTF-16LE.so
> %%DATADIR%%/from/UTF-32BE
>-%%DATADIR%%/from/UTF-32BE.so
> %%DATADIR%%/from/UTF-32LE
>-%%DATADIR%%/from/UTF-32LE.so
> %%DATADIR%%/from/_CP1251
> %%DATADIR%%/from/_CP1252
> %%DATADIR%%/from/_CP1253
> %%DATADIR%%/from/_CP874
> %%DATADIR%%/from/_CP949
> %%DATADIR%%/from/_GB18030
>-%%DATADIR%%/from/_GB18030.so
> %%DATADIR%%/from/_GBK
> %%DATADIR%%/from/_ISO-8859-1
> %%DATADIR%%/from/_JIS0212
> %%DATADIR%%/from/_SHIFT-JIS
> %%DATADIR%%/from/_UAO250
> %%DATADIR%%/from/_UTF-8
>-%%DATADIR%%/from/_UTF-8.so
>-%%DATADIR%%/from/alias
> %%DATADIR%%/inter/AMBIGUOUS-PAD
>-%%DATADIR%%/inter/AMBIGUOUS-PAD.so
> %%DATADIR%%/inter/AMBIGUOUS-UNPAD
>-%%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/FULL
> %%DATADIR%%/inter/HALF
> %%DATADIR%%/inter/INTER_ALIAS
> %%DATADIR%%/inter/KANA_PHONETIC
> %%DATADIR%%/inter/LOWER
> %%DATADIR%%/inter/MAC
>-%%DATADIR%%/inter/NL2BR
> %%DATADIR%%/inter/NOBOM
>+%%DATADIR%%/inter/NL2BR
> %%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/TRIM-WIDTH
>-%%DATADIR%%/inter/TRIM-WIDTH.so
> %%DATADIR%%/inter/UNIX
> %%DATADIR%%/inter/UPPER
> %%DATADIR%%/inter/UPSIDEDOWN
> %%DATADIR%%/inter/WHITESPACE-DERAIL
>-%%DATADIR%%/inter/WHITESPACE-DERAIL.so
> %%DATADIR%%/inter/WHITESPACE-RERAIL
>-%%DATADIR%%/inter/WHITESPACE-RERAIL.so
> %%DATADIR%%/inter/WIDTH
>-%%DATADIR%%/inter/WIDTH.so
> %%DATADIR%%/inter/WIN
> %%DATADIR%%/inter/ZH-STRINGS
>-%%DATADIR%%/inter/ZH-STRINGS.so
> %%DATADIR%%/inter/ZHCN
> %%DATADIR%%/inter/ZHTW
> %%DATADIR%%/inter/ZHTW_WORDS
>-%%DATADIR%%/inter/ZH_FUZZY_CN
> %%DATADIR%%/inter/ZH_FUZZY_TW
>-%%DATADIR%%/inter/alias
>+%%DATADIR%%/inter/ZH_FUZZY_CN
> %%DATADIR%%/to/00
> %%DATADIR%%/to/3F
>-%%DATADIR%%/to/3F.so
> %%DATADIR%%/to/ANSI-CONTROL
>-%%DATADIR%%/to/ANSI-CONTROL.so
>-%%DATADIR%%/to/ASCII
> %%DATADIR%%/to/ASCII-ESCAPED-UNICODE
>-%%DATADIR%%/to/ASCII-ESCAPED-UNICODE.so
> %%DATADIR%%/to/ASCII-HEX-NUMERIC-HTML-ENTITY
>-%%DATADIR%%/to/ASCII-HEX-NUMERIC-HTML-ENTITY.so
> %%DATADIR%%/to/ASCII-HTML-CNS11643-IMG
>-%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.so
> %%DATADIR%%/to/ASCII-HTML-INFO
>-%%DATADIR%%/to/ASCII-HTML-INFO.so
> %%DATADIR%%/to/ASCII-HTML-UNICODE-IMG
>-%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG.so
> %%DATADIR%%/to/ASCII-NAMED-HTML-ENTITY
>+%%DATADIR%%/to/ASCII
> %%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_RAW
>-%%DATADIR%%/to/BSDCONV_RAW.so
> %%DATADIR%%/to/BSDCONV_STDOUT
>-%%DATADIR%%/to/BSDCONV_STDOUT.so
> %%DATADIR%%/to/BYTE
>-%%DATADIR%%/to/CP936_TRANS
>-%%DATADIR%%/to/CP950_TRANS
>-%%DATADIR%%/to/NULL
>-%%DATADIR%%/to/NULL.so
>-%%DATADIR%%/to/PASS
>-%%DATADIR%%/to/PASS.so
>-%%DATADIR%%/to/RAW
>-%%DATADIR%%/to/RAW.so
>-%%DATADIR%%/to/UCS-2BE
>-%%DATADIR%%/to/UCS-2BE.so
>-%%DATADIR%%/to/UCS-2LE
>-%%DATADIR%%/to/UCS-2LE.so
>-%%DATADIR%%/to/UNICODE
>-%%DATADIR%%/to/UNICODE.so
>-%%DATADIR%%/to/UTF-16BE
>-%%DATADIR%%/to/UTF-16BE.so
>-%%DATADIR%%/to/UTF-16LE
>-%%DATADIR%%/to/UTF-16LE.so
>-%%DATADIR%%/to/UTF-32BE
>-%%DATADIR%%/to/UTF-32BE.so
>-%%DATADIR%%/to/UTF-32LE
>-%%DATADIR%%/to/UTF-32LE.so
> %%DATADIR%%/to/_CP1251
> %%DATADIR%%/to/_CP1252
> %%DATADIR%%/to/_CP1253
> %%DATADIR%%/to/_CP874
> %%DATADIR%%/to/_CP936
>+%%DATADIR%%/to/CP936_TRANS
> %%DATADIR%%/to/_CP949
> %%DATADIR%%/to/_CP950
>+%%DATADIR%%/to/CP950_TRANS
> %%DATADIR%%/to/_GB18030
>-%%DATADIR%%/to/_GB18030.so
> %%DATADIR%%/to/_GBK
> %%DATADIR%%/to/_ISO-8859-1
> %%DATADIR%%/to/_JIS0212
> %%DATADIR%%/to/_SHIFT-JIS
>+%%DATADIR%%/to/NULL
>+%%DATADIR%%/to/PASS
>+%%DATADIR%%/to/RAW
> %%DATADIR%%/to/_UAO250
>+%%DATADIR%%/to/UCS-2BE
>+%%DATADIR%%/to/UCS-2LE
>+%%DATADIR%%/to/UNICODE
>+%%DATADIR%%/to/UTF-16BE
>+%%DATADIR%%/to/UTF-16LE
>+%%DATADIR%%/to/UTF-32BE
>+%%DATADIR%%/to/UTF-32LE
> %%DATADIR%%/to/_UTF-8
>+%%DATADIR%%/from/3F.so
>+%%DATADIR%%/from/ANSI-CONTROL.so
>+%%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY.so
>+%%DATADIR%%/from/BSDCONV.so
>+%%DATADIR%%/from/BSDCONV_LOG.so
>+%%DATADIR%%/from/ESCAPE.so
>+%%DATADIR%%/from/PASS.so
>+%%DATADIR%%/from/SKIP.so
>+%%DATADIR%%/from/SUB.so
>+%%DATADIR%%/from/UTF-16BE.so
>+%%DATADIR%%/from/UTF-16LE.so
>+%%DATADIR%%/from/UTF-32BE.so
>+%%DATADIR%%/from/UTF-32LE.so
>+%%DATADIR%%/from/_GB18030.so
>+%%DATADIR%%/from/_UTF-8.so
>+%%DATADIR%%/inter/AMBIGUOUS-PAD.so
>+%%DATADIR%%/inter/AMBIGUOUS-UNPAD.so
>+%%DATADIR%%/inter/BIG5-DEFRAG.so
>+%%DATADIR%%/inter/FROM_ALIAS.so
>+%%DATADIR%%/inter/SCORE.so
>+%%DATADIR%%/inter/SCORE_TRAIN.so
>+%%DATADIR%%/inter/SPLIT.so
>+%%DATADIR%%/inter/TO_ALIAS.so
>+%%DATADIR%%/inter/TRIM-WIDTH.so
>+%%DATADIR%%/inter/WHITESPACE-DERAIL.so
>+%%DATADIR%%/inter/WHITESPACE-RERAIL.so
>+%%DATADIR%%/inter/WIDTH.so
>+%%DATADIR%%/inter/ZH-STRINGS.so
>+%%DATADIR%%/to/3F.so
>+%%DATADIR%%/to/ANSI-CONTROL.so
>+%%DATADIR%%/to/ASCII-ESCAPED-UNICODE.so
>+%%DATADIR%%/to/ASCII-HEX-NUMERIC-HTML-ENTITY.so
>+%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.so
>+%%DATADIR%%/to/ASCII-HTML-INFO.so
>+%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG.so
>+%%DATADIR%%/to/BSDCONV.so
>+%%DATADIR%%/to/BSDCONV_LOG.so
>+%%DATADIR%%/to/BSDCONV_RAW.so
>+%%DATADIR%%/to/BSDCONV_STDOUT.so
>+%%DATADIR%%/to/NULL.so
>+%%DATADIR%%/to/PASS.so
>+%%DATADIR%%/to/RAW.so
>+%%DATADIR%%/to/UCS-2BE.so
>+%%DATADIR%%/to/UCS-2LE.so
>+%%DATADIR%%/to/UNICODE.so
>+%%DATADIR%%/to/UTF-16BE.so
>+%%DATADIR%%/to/UTF-16LE.so
>+%%DATADIR%%/to/UTF-32BE.so
>+%%DATADIR%%/to/UTF-32LE.so
>+%%DATADIR%%/to/_GB18030.so
> %%DATADIR%%/to/_UTF-8.so
>-%%DATADIR%%/to/alias
>-%%EXTRA%%%%DATADIR%%/from/CCCII
>-%%EXTRA%%%%DATADIR%%/from/_CNS11643
>-%%EXTRA%%%%DATADIR%%/from/_CNS11643.so
>-%%EXTRA%%%%DATADIR%%/from/_CP936
>-%%EXTRA%%%%DATADIR%%/from/_CP950
>-%%EXTRA%%%%DATADIR%%/from/_GB2312
>-%%EXTRA%%%%DATADIR%%/from/_UAO241
>-%%EXTRA%%%%DATADIR%%/inter/CHEWING
>-%%EXTRA%%%%DATADIR%%/inter/CNS11643
>-%%EXTRA%%%%DATADIR%%/inter/HAN_PINYIN
>-%%EXTRA%%%%DATADIR%%/inter/UNICODE
>-%%EXTRA%%%%DATADIR%%/inter/ZH_COMP
>-%%EXTRA%%%%DATADIR%%/inter/ZH_DECOMP
>-%%EXTRA%%%%DATADIR%%/to/CCCII
>-%%EXTRA%%%%DATADIR%%/to/_CNS11643
>-%%EXTRA%%%%DATADIR%%/to/_CNS11643.so
>-%%EXTRA%%%%DATADIR%%/to/_GB2312
>-%%EXTRA%%%%DATADIR%%/to/_UAO241
>-@dirrmtry %%DATADIR%%/from
>-@dirrmtry %%DATADIR%%/inter
>+%%CHINESE%%%%DATADIR%%/from/CCCII
>+%%CHINESE%%%%DATADIR%%/from/_CNS11643
>+%%CHINESE%%%%DATADIR%%/from/_CP936
>+%%CHINESE%%%%DATADIR%%/from/_CP950
>+%%CHINESE%%%%DATADIR%%/from/_GB2312
>+%%CHINESE%%%%DATADIR%%/from/_UAO241
>+%%CHINESE%%%%DATADIR%%/inter/CHEWING
>+%%CHINESE%%%%DATADIR%%/inter/CNS11643
>+%%CHINESE%%%%DATADIR%%/inter/HAN_PINYIN
>+%%CHINESE%%%%DATADIR%%/inter/UNICODE
>+%%CHINESE%%%%DATADIR%%/inter/ZH_COMP
>+%%CHINESE%%%%DATADIR%%/inter/ZH_DECOMP
>+%%CHINESE%%%%DATADIR%%/to/CCCII
>+%%CHINESE%%%%DATADIR%%/to/_CNS11643
>+%%CHINESE%%%%DATADIR%%/to/_GB2312
>+%%CHINESE%%%%DATADIR%%/to/_UAO241
>+%%CHINESE%%%%DATADIR%%/from/_CNS11643.so
>+%%CHINESE%%%%DATADIR%%/to/_CNS11643.so
>+%%EBCDIC%%%%DATADIR%%/from/IBM-37
>+%%EBCDIC%%%%DATADIR%%/from/IBM-930
>+%%EBCDIC%%%%DATADIR%%/from/IBM-933
>+%%EBCDIC%%%%DATADIR%%/from/IBM-935
>+%%EBCDIC%%%%DATADIR%%/from/IBM-937
>+%%EBCDIC%%%%DATADIR%%/from/IBM-939
>+%%EBCDIC%%%%DATADIR%%/to/IBM-37
>+%%EBCDIC%%%%DATADIR%%/to/IBM-930
>+%%EBCDIC%%%%DATADIR%%/to/IBM-933
>+%%EBCDIC%%%%DATADIR%%/to/IBM-935
>+%%EBCDIC%%%%DATADIR%%/to/IBM-937
>+%%EBCDIC%%%%DATADIR%%/to/IBM-939
>+%%EBCDIC%%%%DATADIR%%/from/IBM-930.so
>+%%EBCDIC%%%%DATADIR%%/from/IBM-933.so
>+%%EBCDIC%%%%DATADIR%%/from/IBM-935.so
>+%%EBCDIC%%%%DATADIR%%/from/IBM-937.so
>+%%EBCDIC%%%%DATADIR%%/from/IBM-939.so
>+%%EBCDIC%%%%DATADIR%%/to/IBM-930.so
>+%%EBCDIC%%%%DATADIR%%/to/IBM-933.so
>+%%EBCDIC%%%%DATADIR%%/to/IBM-935.so
>+%%EBCDIC%%%%DATADIR%%/to/IBM-937.so
>+%%EBCDIC%%%%DATADIR%%/to/IBM-939.so
> @dirrmtry %%DATADIR%%/to
>+@dirrmtry %%DATADIR%%/inter
>+@dirrmtry %%DATADIR%%/from
> @dirrmtry %%DATADIR%%

Actions: View | Diff

Attachments on bug 176867: 132558