Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Jan 2011 19:51:29 GMT
From:      Kuan-Chung Chiu <buganini@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/153741: [Maintainer Update] converters/bsdconv family to 4.0
Message-ID:  <201101061951.p06JpTRF001627@red.freebsd.org>
Resent-Message-ID: <201101062000.p06K0Jks070971@freefall.freebsd.org>

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

>Number:         153741
>Category:       ports
>Synopsis:       [Maintainer Update] converters/bsdconv family to 4.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 06 20:00:18 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Kuan-Chung Chiu
>Release:        9.0-CURRENT
>Organization:
N/A
>Environment:
FreeBSD Elizabeth.twbbs.org 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r216692M: Sat Dec 25 08:24:32 CST 2010     root@Elizabeth.twbbs.org:/usr/obj/usr/src/sys/ELIZABETH  amd64

>Description:
Update converters/bsdconv family to 4.0, including:
converters/bsdconv
converters/py-bsdconv
converters/php5-bsdconv
converters/p5-bsdconv
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN bsdconv.orig/Makefile bsdconv/Makefile
--- bsdconv.orig/Makefile	2010-09-09 11:33:05.000000000 +0800
+++ bsdconv/Makefile	2011-01-07 03:03:27.000000000 +0800
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bsdconv
-PORTVERSION=	3.6.2
+PORTVERSION=	4.0
 CATEGORIES=	converters
-MASTER_SITES=	http://security-hole.info/distfile/
-DISTNAME=	buganini-bsdconv-3.6.2-0-g66aab4b
+MASTER_SITES=	http://download.github.com/
+DISTNAME=	buganini-bsdconv-4.0-0-g1298adf
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	BSD licensed charset/encoding converter library
@@ -18,12 +18,25 @@
 
 MAKE_ARGS=	PREFIX=${PREFIX}
 
-WRKSRC=		${WRKDIR}/buganini-bsdconv-66aab4b
+WRKSRC=		${WRKDIR}/buganini-bsdconv-1298adf
+
+OPTIONS=	EXTRA_CODECS "Include extra conversion codecs" off
 
 .include <bsd.port.pre.mk>
 
-#.if ${OSVERSION} < 701101
+.if defined(WITH_EXTRA_CODECS)
+PLIST_SUB+=	WITH_EXTRA_CODECS=""
+.else
+PLIST_SUB+=	WITH_EXTRA_CODECS="@comment "
+.endif
+
+post-build:
+.if defined(WITH_EXTRA_CODECS)
+	cd ${WRKSRC} && ${MAKE} codecs_table_extra
+.endif
+
+.if ${OSVERSION} < 701101
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-strndup
-#.endif
+.endif
 
 .include <bsd.port.post.mk>
diff -ruN bsdconv.orig/distinfo bsdconv/distinfo
--- bsdconv.orig/distinfo	2010-09-09 11:33:05.000000000 +0800
+++ bsdconv/distinfo	2011-01-07 01:52:49.000000000 +0800
@@ -1,3 +1,2 @@
-MD5 (buganini-bsdconv-3.6.2-0-g66aab4b.tar.gz) = 66bf1c77b7f7ea983730213ab54d7cc1
-SHA256 (buganini-bsdconv-3.6.2-0-g66aab4b.tar.gz) = 4dbeee35523dbc30d6d344ef69854a3b4374b31a90a5291ef2e2606292dd09cb
-SIZE (buganini-bsdconv-3.6.2-0-g66aab4b.tar.gz) = 3591916
+SHA256 (buganini-bsdconv-4.0-0-g1298adf.tar.gz) = e54ddb21f33c665beef0f75dc5c0d982266c134012fe46826fc8290bb19305e4
+SIZE (buganini-bsdconv-4.0-0-g1298adf.tar.gz) = 3719307
diff -ruN bsdconv.orig/pkg-plist bsdconv/pkg-plist
--- bsdconv.orig/pkg-plist	2010-09-09 11:33:05.000000000 +0800
+++ bsdconv/pkg-plist	2011-01-07 02:55:03.000000000 +0800
@@ -2,7 +2,7 @@
 bin/bsdconv_mktable
 include/bsdconv.h
 lib/libbsdconv.so
-lib/libbsdconv.so.3
+lib/libbsdconv.so.4
 %%DATADIR%%/from/3F
 %%DATADIR%%/from/ASCII
 %%DATADIR%%/from/ASCII-NAMED-HTML-ENTITY
@@ -15,12 +15,21 @@
 %%DATADIR%%/from/BYTE
 %%DATADIR%%/from/CNS11643
 %%DATADIR%%/from/CNS11643.so
+%%DATADIR%%/from/CP1251
+%%DATADIR%%/from/CP1252
 %%DATADIR%%/from/CP936
+%%DATADIR%%/from/CP949
 %%DATADIR%%/from/CP950
+%%DATADIR%%/from/ESCAPE
+%%DATADIR%%/from/ESCAPE.so
 %%DATADIR%%/from/GB2312
 %%DATADIR%%/from/GBK
 %%DATADIR%%/from/ISO-8859-1
 %%DATADIR%%/from/MOZ18
+%%DATADIR%%/from/PASS
+%%DATADIR%%/from/SHIFT-JIS
+%%DATADIR%%/from/UNICODE
+%%DATADIR%%/from/UNICODE.so
 %%DATADIR%%/from/UTF-16BE
 %%DATADIR%%/from/UTF-16BE.so
 %%DATADIR%%/from/UTF-16LE
@@ -50,8 +59,9 @@
 %%DATADIR%%/inter/WIN
 %%DATADIR%%/inter/ZHCN
 %%DATADIR%%/inter/ZHTW
-%%DATADIR%%/inter/ZH_COMP
-%%DATADIR%%/inter/ZH_DECOMP
+%%DATADIR%%/inter/ZHTW_WORDS
+%%WITH_EXTRA_CODECS%%%%DATADIR%%/inter/ZH_COMP
+%%WITH_EXTRA_CODECS%%%%DATADIR%%/inter/ZH_DECOMP
 %%DATADIR%%/to/3F
 %%DATADIR%%/to/3F.so
 %%DATADIR%%/to/ASCII
@@ -80,10 +90,13 @@
 %%DATADIR%%/to/GB2312
 %%DATADIR%%/to/GBK
 %%DATADIR%%/to/ISO-8859-1
+%%DATADIR%%/to/PASS
 %%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
@@ -94,7 +107,7 @@
 %%DATADIR%%/to/UTF-32LE.so
 %%DATADIR%%/to/UTF-8
 %%DATADIR%%/to/UTF-8.so
+@dirrmtry %%DATADIR%%/to
 @dirrmtry %%DATADIR%%/inter
 @dirrmtry %%DATADIR%%/from
-@dirrmtry %%DATADIR%%/to
 @dirrmtry %%DATADIR%%
diff -ruN py-bsdconv.orig/Makefile py-bsdconv/Makefile
--- py-bsdconv.orig/Makefile	2011-01-07 03:26:01.000000000 +0800
+++ py-bsdconv/Makefile	2011-01-07 03:31:27.000000000 +0800
@@ -6,22 +6,22 @@
 #
 
 PORTNAME=	bsdconv
-PORTVERSION=	3.6.2
+PORTVERSION=	4.0
 CATEGORIES=	converters python
-MASTER_SITES=	http://security-hole.info/distfile/
+MASTER_SITES=	http://download.github.com/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	buganini-bsdconv-3.6.2-0-g66aab4b
+DISTNAME=	buganini-bsdconv-4.0-0-g1298adf
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	Python wrapper for bsdconv
 
-LIB_DEPENDS=	bsdconv.3:${PORTSDIR}/converters/bsdconv
+LIB_DEPENDS=	bsdconv.4:${PORTSDIR}/converters/bsdconv
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g}
 
-WRKSRC=		${WRKDIR}/buganini-bsdconv-66aab4b/wrapper/python
+WRKSRC=		${WRKDIR}/buganini-bsdconv-1298adf/wrapper/python
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
diff -ruN py-bsdconv.orig/distinfo py-bsdconv/distinfo
--- py-bsdconv.orig/distinfo	2011-01-07 03:26:01.000000000 +0800
+++ py-bsdconv/distinfo	2011-01-07 03:32:07.000000000 +0800
@@ -1,3 +1,2 @@
-MD5 (buganini-bsdconv-3.6.2-0-g66aab4b.tar.gz) = 66bf1c77b7f7ea983730213ab54d7cc1
-SHA256 (buganini-bsdconv-3.6.2-0-g66aab4b.tar.gz) = 4dbeee35523dbc30d6d344ef69854a3b4374b31a90a5291ef2e2606292dd09cb
-SIZE (buganini-bsdconv-3.6.2-0-g66aab4b.tar.gz) = 3591916
+SHA256 (buganini-bsdconv-4.0-0-g1298adf.tar.gz) = e54ddb21f33c665beef0f75dc5c0d982266c134012fe46826fc8290bb19305e4
+SIZE (buganini-bsdconv-4.0-0-g1298adf.tar.gz) = 3719307
diff -ruN php5-bsdconv.orig/Makefile php5-bsdconv/Makefile
--- php5-bsdconv.orig/Makefile	2011-01-07 03:25:52.000000000 +0800
+++ php5-bsdconv/Makefile	2011-01-07 03:29:00.000000000 +0800
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	bsdconv
-PORTVERSION=	3.6.2
+PORTVERSION=	4.0
 CATEGORIES=	converters
-MASTER_SITES=	http://security-hole.info/distfile/
+MASTER_SITES=	http://download.github.com/
 PKGNAMEPREFIX=	php5-
-DISTNAME=	buganini-bsdconv-3.6.2-0-g66aab4b
+DISTNAME=	buganini-bsdconv-4.0-0-g1298adf
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	PHP wrapper for bsdconv
 
-LIB_DEPENDS=	bsdconv.3:${PORTSDIR}/converters/bsdconv
+LIB_DEPENDS=	bsdconv.4:${PORTSDIR}/converters/bsdconv
 
 USE_PHP=	yes
 USE_PHPIZE=	yes
@@ -24,6 +24,6 @@
 PHP_MODNAME=	bsdconv
 CONFIGURE_ARGS+=--with-bsdconv=${LOCALBASE}
 
-WRKSRC=		${WRKDIR}/buganini-bsdconv-66aab4b/wrapper/php
+WRKSRC=		${WRKDIR}/buganini-bsdconv-1298adf/wrapper/php
 
 .include <bsd.port.mk>
diff -ruN php5-bsdconv.orig/distinfo php5-bsdconv/distinfo
--- php5-bsdconv.orig/distinfo	2011-01-07 03:25:52.000000000 +0800
+++ php5-bsdconv/distinfo	2011-01-07 03:27:00.000000000 +0800
@@ -1,3 +1,2 @@
-MD5 (buganini-bsdconv-3.6.2-0-g66aab4b.tar.gz) = 66bf1c77b7f7ea983730213ab54d7cc1
-SHA256 (buganini-bsdconv-3.6.2-0-g66aab4b.tar.gz) = 4dbeee35523dbc30d6d344ef69854a3b4374b31a90a5291ef2e2606292dd09cb
-SIZE (buganini-bsdconv-3.6.2-0-g66aab4b.tar.gz) = 3591916
+SHA256 (buganini-bsdconv-4.0-0-g1298adf.tar.gz) = e54ddb21f33c665beef0f75dc5c0d982266c134012fe46826fc8290bb19305e4
+SIZE (buganini-bsdconv-4.0-0-g1298adf.tar.gz) = 3719307
diff -ruN p5-bsdconv.orig/Makefile p5-bsdconv/Makefile
--- p5-bsdconv.orig/Makefile	2011-01-07 03:25:56.000000000 +0800
+++ p5-bsdconv/Makefile	2011-01-07 03:28:48.000000000 +0800
@@ -6,22 +6,22 @@
 #
 
 PORTNAME=	bsdconv
-PORTVERSION=	3.6.2
+PORTVERSION=	4.0
 CATEGORIES=	converters perl5
-MASTER_SITES=	http://security-hole.info/distfile/
+MASTER_SITES=	http://download.github.com/
 PKGNAMEPREFIX=	p5-
-DISTNAME=	buganini-bsdconv-3.6.2-0-g66aab4b
+DISTNAME=	buganini-bsdconv-4.0-0-g1298adf
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	Perl wrapper for bsdconv
 
-LIB_DEPENDS=	bsdconv.3:${PORTSDIR}/converters/bsdconv
+LIB_DEPENDS=	bsdconv.4:${PORTSDIR}/converters/bsdconv
 
 PERL_CONFIGURE=	yes
 
-MAN3=		bsdconv.3
+MAN3=		bsdconv.4
 
-WRKSRC=		${WRKDIR}/buganini-bsdconv-66aab4b/wrapper/perl
+WRKSRC=		${WRKDIR}/buganini-bsdconv-1298adf/wrapper/perl
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
diff -ruN p5-bsdconv.orig/distinfo p5-bsdconv/distinfo
--- p5-bsdconv.orig/distinfo	2011-01-07 03:25:56.000000000 +0800
+++ p5-bsdconv/distinfo	2011-01-07 03:30:25.000000000 +0800
@@ -1,3 +1,2 @@
-MD5 (buganini-bsdconv-3.6.2-0-g66aab4b.tar.gz) = 66bf1c77b7f7ea983730213ab54d7cc1
-SHA256 (buganini-bsdconv-3.6.2-0-g66aab4b.tar.gz) = 4dbeee35523dbc30d6d344ef69854a3b4374b31a90a5291ef2e2606292dd09cb
-SIZE (buganini-bsdconv-3.6.2-0-g66aab4b.tar.gz) = 3591916
+SHA256 (buganini-bsdconv-4.0-0-g1298adf.tar.gz) = e54ddb21f33c665beef0f75dc5c0d982266c134012fe46826fc8290bb19305e4
+SIZE (buganini-bsdconv-4.0-0-g1298adf.tar.gz) = 3719307


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



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