Attachment #224503 for bug #245543




PORTNAME=	XML-Parser
PORTVERSION=	2.46
CATEGORIES=	textproc perl5
MASTER_SITES=	CPAN
PKGNAMEPREFIX=	p5-

MAINTAINER=	svysh.fbsd@gmail.com
COMMENT=	Perl extension interface to James Clark's XML parser, expat

LICENSE=	ART10 GPLv1+
LICENSE_COMB=	dual
LICENSE_FILE=	${WRKSRC}/Parser.pm

BUILD_DEPENDS=	${RUN_DEPENDS}
LIB_DEPENDS=	libexpat.so:textproc/expat2
RUN_DEPENDS=	p5-libwww>=6.43:www/p5-libwww

USES=		perl5
USE_PERL5=	configure

CONFIGURE_ARGS=	EXPATLIBPATH=${LOCALBASE}/lib EXPATINCPATH=${LOCALBASE}/include

PLIST_SUB=	EUCJP=${_EUCJP} SJIS=${_SJIS}

# XMLPARSER_EUCJP=	x-euc-jp-(jisx0221|unicode)
# XMLPARSER_SJIS=	x-sjis-(cp932|jdk117|jisx0221|unicode)
_CONV_ENC=	${PERL} -e '$$e=shift @ARGV; undef $$/; $$_=<>; substr($$_,4,40)=pack("a40","$$e"); print'
.if !defined(XMLPARSER_EUCJP)
_EUCJP=		"@comment "
.endif
.if !defined(XMLPARSER_SJIS)
_SJIS=		"@comment "
.endif
.if defined(XMLPARSER_EUCJP) || defined(XMLPARSER_SJIS)
USE_PERL5+=	patch

post-patch:
.if defined(XMLPARSER_EUCJP)
	cd ${WRKSRC}/Parser/Encodings; \
		${_CONV_ENC} euc-jp ${XMLPARSER_EUCJP}.enc > euc-jp.enc
	${ECHO_CMD} Parser/Encodings/euc-jp.enc >> ${WRKSRC}/MANIFEST
.endif
.if defined(XMLPARSER_SJIS)
	cd ${WRKSRC}/Parser/Encodings; \
		${_CONV_ENC} shift_jis ${XMLPARSER_SJIS}.enc > shift_jis.enc
	${ECHO_CMD} Parser/Encodings/Shift_JIS.enc >> ${WRKSRC}/MANIFEST
.endif
	@${CP} ${FILESDIR}/*.enc ${WRKSRC}/Parser/Encodings/

	@cd ${WRKDIR} && ${PERL} ${FILESDIR}/check_nfs.pl 2>/dev/null || \
	(${ECHO_MSG} "===>  lockf in \$$TMPDIR required"; ${FALSE})

_XE=	${.CURDIR}/../p5-XML-Encoding

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}/auto/XML/Parser/Expat/Expat.so

_extract-encodings:
	@cd ${_XE}; \
	${MAKE} patch

_build-encodings:
.for e in 1 6 10 11 13 14
	@cd `cd ${_XE}; ${MAKE} -VWRKSRC`; \
	compile_encoding -o ${FILESDIR}/iso-8859-${e}.enc maps/iso-8859-${e}.xml
.endfor


Lines 1-2 Link Here

(-)b/textproc/p5-XML-Parser/distinfo (-2 / +3 lines)
1	SHA256 (XML-Parser-2.44.tar.gz) = 1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216	1	TIMESTAMP = 1586303346
2	SIZE (XML-Parser-2.44.tar.gz) = 237377	2	SHA256 (XML-Parser-2.46.tar.gz) = d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d
		3	SIZE (XML-Parser-2.46.tar.gz) = 254763

Lines 1-4 Link Here

(-)b/textproc/p5-XML-Parser/files/check_nfs.pl (-1 / +1 lines)
1	#!/usr/bin/perl	1	#!/usr/bin/env perl
2		2
3	use strict;	3	use strict;
4	use warnings;	4	use warnings;




--- inc/Devel/CheckLib.pm.orig	2013-01-11 11:43:02.293444337 +0900
+++ inc/Devel/CheckLib.pm	2013-01-11 11:48:47.556449831 +0900
@@ -222,7 +222,7 @@
     for my $header (@headers) {
         push @use_headers, $header;
         my($ch, $cfile) = File::Temp::tempfile(
-            'assertlibXXXXXXXX', SUFFIX => '.c'
+            'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1,
         );
         print $ch qq{#include <$_>\n} for @use_headers;
         print $ch qq{int main(void) { return 0; }\n};
@@ -262,7 +262,7 @@
 
     # now do each library in turn with headers
     my($ch, $cfile) = File::Temp::tempfile(
-        'assertlibXXXXXXXX', SUFFIX => '.c'
+        'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1,
     );
     print $ch qq{#include <$_>\n} foreach (@headers);
     print $ch "int main(void) { ".($args{function} || 'return 0;')." }\n";




--- inc/Devel/CheckLib.pm.orig	2016-04-13 04:38:16 UTC
+++ inc/Devel/CheckLib.pm
@@ -227,7 +227,7 @@ sub assert_lib {
     # first figure out which headers we can't find ...
     for my $header (@headers) {
         push @use_headers, $header;
-        my ( $ch, $cfile ) = File::Temp::tempfile( 'assertlibXXXXXXXX', SUFFIX => '.c' );
+        my ( $ch, $cfile ) = File::Temp::tempfile( 'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1 );
         my $ofile = $cfile;
         $ofile =~ s/\.c$/$Config{_o}/;
         print $ch qq{#include <$_>\n} for @use_headers;
@@ -275,7 +275,7 @@ sub assert_lib {
     }
 
     # now do each library in turn with headers
-    my ( $ch, $cfile ) = File::Temp::tempfile( 'assertlibXXXXXXXX', SUFFIX => '.c' );
+    my ( $ch, $cfile ) = File::Temp::tempfile( 'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1 );
     my $ofile = $cfile;
     $ofile =~ s/\.c$/$Config{_o}/;
     print $ch qq{#include <$_>\n} foreach (@headers);

Return to bug 245543

Lines 1-31 Link Here

(-)b/textproc/p5-XML-Parser/Makefile (-14 / +22 lines)
1	PORTNAME= XML-Parser	1	PORTNAME= XML-Parser
2	PORTVERSION= 2.44	2	PORTVERSION= 2.46
3	CATEGORIES= textproc perl5	3	CATEGORIES= textproc perl5
4	MASTER_SITES= CPAN	4	MASTER_SITES= CPAN
5	PKGNAMEPREFIX= p5-	5	PKGNAMEPREFIX= p5-
6		6
7	MAINTAINER= kuriyama@FreeBSD.org	7	MAINTAINER= svysh.fbsd@gmail.com
8	COMMENT= Perl extension interface to James Clark's XML parser, expat	8	COMMENT= Perl extension interface to James Clark's XML parser, expat
9		9
10	LICENSE= ART10 GPLv1+	10	LICENSE= ART10 GPLv1+
11	LICENSE_COMB= dual	11	LICENSE_COMB= dual
		12	LICENSE_FILE= ${WRKSRC}/Parser.pm
12		13
		14	BUILD_DEPENDS= ${RUN_DEPENDS}
13	LIB_DEPENDS= libexpat.so:textproc/expat2	15	LIB_DEPENDS= libexpat.so:textproc/expat2
		16	RUN_DEPENDS= p5-libwww>=6.43:www/p5-libwww
14		17
15	USES= perl5	18	USES= perl5
16	USE_PERL5= configure	19	USE_PERL5= configure
		20
17	CONFIGURE_ARGS= EXPATLIBPATH=${LOCALBASE}/lib EXPATINCPATH=${LOCALBASE}/include	21	CONFIGURE_ARGS= EXPATLIBPATH=${LOCALBASE}/lib EXPATINCPATH=${LOCALBASE}/include
18		22
19	PLIST_SUB= EUCJP=${EUCJP} SJIS=${SJIS}	23	PLIST_SUB= EUCJP=${_EUCJP} SJIS=${_SJIS}
20		24
21	# XMLPARSER_EUCJP= x-euc-jp-(jisx0221\|unicode)	25	# XMLPARSER_EUCJP= x-euc-jp-(jisx0221\|unicode)
22	# XMLPARSER_SJIS= x-sjis-(cp932\|jdk117\|jisx0221\|unicode)	26	# XMLPARSER_SJIS= x-sjis-(cp932\|jdk117\|jisx0221\|unicode)
23	CONV_ENC= ${PERL} -e '$$e=shift @ARGV; undef $$/; $$_=<>; substr($$_,4,40)=pack("a40","$$e"); print'	27	_CONV_ENC= ${PERL} -e '$$e=shift @ARGV; undef $$/; $$_=<>; substr($$_,4,40)=pack("a40","$$e"); print'
24	.if !defined(XMLPARSER_EUCJP)	28	.if !defined(XMLPARSER_EUCJP)
25	EUCJP= "@comment "	29	_EUCJP= "@comment "
26	.endif	30	.endif
27	.if !defined(XMLPARSER_SJIS)	31	.if !defined(XMLPARSER_SJIS)
28	SJIS= "@comment "	32	_SJIS= "@comment "
29	.endif	33	.endif
30	.if defined(XMLPARSER_EUCJP) \|\| defined(XMLPARSER_SJIS)	34	.if defined(XMLPARSER_EUCJP) \|\| defined(XMLPARSER_SJIS)
31	USE_PERL5+= patch	35	USE_PERL5+= patch
Lines 34-45 USE_PERL5+= patch Link Here
34	post-patch:	38	post-patch:
35	.if defined(XMLPARSER_EUCJP)	39	.if defined(XMLPARSER_EUCJP)
36	cd ${WRKSRC}/Parser/Encodings; \	40	cd ${WRKSRC}/Parser/Encodings; \
37	${CONV_ENC} euc-jp ${XMLPARSER_EUCJP}.enc > euc-jp.enc	41	${_CONV_ENC} euc-jp ${XMLPARSER_EUCJP}.enc > euc-jp.enc
38	${ECHO_CMD} Parser/Encodings/euc-jp.enc >> ${WRKSRC}/MANIFEST	42	${ECHO_CMD} Parser/Encodings/euc-jp.enc >> ${WRKSRC}/MANIFEST
39	.endif	43	.endif
40	.if defined(XMLPARSER_SJIS)	44	.if defined(XMLPARSER_SJIS)
41	cd ${WRKSRC}/Parser/Encodings; \	45	cd ${WRKSRC}/Parser/Encodings; \
42	${CONV_ENC} shift_jis ${XMLPARSER_SJIS}.enc > shift_jis.enc	46	${_CONV_ENC} shift_jis ${XMLPARSER_SJIS}.enc > shift_jis.enc
43	${ECHO_CMD} Parser/Encodings/Shift_JIS.enc >> ${WRKSRC}/MANIFEST	47	${ECHO_CMD} Parser/Encodings/Shift_JIS.enc >> ${WRKSRC}/MANIFEST
44	.endif	48	.endif
45	@${CP} ${FILESDIR}/*.enc ${WRKSRC}/Parser/Encodings/	49	@${CP} ${FILESDIR}/*.enc ${WRKSRC}/Parser/Encodings/
Lines 55-68 pre-build: Link Here
55	@cd ${WRKDIR} && ${PERL} ${FILESDIR}/check_nfs.pl 2>/dev/null \|\| \	59	@cd ${WRKDIR} && ${PERL} ${FILESDIR}/check_nfs.pl 2>/dev/null \|\| \
56	(${ECHO_MSG} "===> lockf in \$$TMPDIR required"; ${FALSE})	60	(${ECHO_MSG} "===> lockf in \$$TMPDIR required"; ${FALSE})
57		61
58	XE= ${.CURDIR}/../p5-XML-Encoding	62	_XE= ${.CURDIR}/../p5-XML-Encoding
59	extract-encodings:	63
60	@cd ${XE}; \	64	post-install:
		65	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}/auto/XML/Parser/Expat/Expat.so
		66
		67	_extract-encodings:
		68	@cd ${_XE}; \
61	${MAKE} patch	69	${MAKE} patch
62		70
63	build-encodings:	71	_build-encodings:
64	.for e in 1 6 10 11 13 14 15	72	.for e in 1 6 10 11 13 14
65	@cd `cd ${XE}; ${MAKE} -VWRKSRC`; \	73	@cd `cd ${_XE}; ${MAKE} -VWRKSRC`; \
66	compile_encoding -o ${FILESDIR}/iso-8859-${e}.enc maps/iso-8859-${e}.xml	74	compile_encoding -o ${FILESDIR}/iso-8859-${e}.enc maps/iso-8859-${e}.xml
67	.endfor	75	.endfor
68		76

Removed Link Here

(-)a/textproc/p5-XML-Parser/files/patch-CheckLib.pm (-20 lines)
1	--- inc/Devel/CheckLib.pm.orig 2013-01-11 11:43:02.293444337 +0900
2	+++ inc/Devel/CheckLib.pm 2013-01-11 11:48:47.556449831 +0900
3	@@ -222,7 +222,7 @@
4	for my $header (@headers) {
5	push @use_headers, $header;
6	my($ch, $cfile) = File::Temp::tempfile(
7	- 'assertlibXXXXXXXX', SUFFIX => '.c'
8	+ 'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1,
9	);
10	print $ch qq{#include <$_>\n} for @use_headers;
11	print $ch qq{int main(void) { return 0; }\n};
12	@@ -262,7 +262,7 @@
13
14	# now do each library in turn with headers
15	my($ch, $cfile) = File::Temp::tempfile(
16	- 'assertlibXXXXXXXX', SUFFIX => '.c'
17	+ 'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1,
18	);
19	print $ch qq{#include <$_>\n} foreach (@headers);
20	print $ch "int main(void) { ".($args{function} \|\| 'return 0;')." }\n";

Added Link Here

(-)b/textproc/p5-XML-Parser/files/patch-inc_Devel_CheckLib.pm (+20 lines)
1	--- inc/Devel/CheckLib.pm.orig 2016-04-13 04:38:16 UTC
2	+++ inc/Devel/CheckLib.pm
3	@@ -227,7 +227,7 @@ sub assert_lib {
4	# first figure out which headers we can't find ...
5	for my $header (@headers) {
6	push @use_headers, $header;
7	- my ( $ch, $cfile ) = File::Temp::tempfile( 'assertlibXXXXXXXX', SUFFIX => '.c' );
8	+ my ( $ch, $cfile ) = File::Temp::tempfile( 'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1 );
9	my $ofile = $cfile;
10	$ofile =~ s/\.c$/$Config{_o}/;
11	print $ch qq{#include <$_>\n} for @use_headers;
12	@@ -275,7 +275,7 @@ sub assert_lib {
13	}
14
15	# now do each library in turn with headers
16	- my ( $ch, $cfile ) = File::Temp::tempfile( 'assertlibXXXXXXXX', SUFFIX => '.c' );
17	+ my ( $ch, $cfile ) = File::Temp::tempfile( 'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1 );
18	my $ofile = $cfile;
19	$ofile =~ s/\.c$/$Config{_o}/;
20	print $ch qq{#include <$_>\n} foreach (@headers);