diff options
| author | kuriyama <kuriyama@FreeBSD.org> | 2013-01-12 11:06:37 +0800 |
|---|---|---|
| committer | kuriyama <kuriyama@FreeBSD.org> | 2013-01-12 11:06:37 +0800 |
| commit | a6ab246d504a4d0196f8cb4758f9075c1c42a9e9 (patch) | |
| tree | 3c027481b91303db62a8d66e5350853b8bb84801 /textproc | |
| parent | cd394cbab5030f765e8b3b2573e66cb3aa9da373 (diff) | |
| download | freebsd-ports-gnome-a6ab246d504a4d0196f8cb4758f9075c1c42a9e9.tar.gz freebsd-ports-gnome-a6ab246d504a4d0196f8cb4758f9075c1c42a9e9.tar.zst freebsd-ports-gnome-a6ab246d504a4d0196f8cb4758f9075c1c42a9e9.zip | |
- Try to fix build on NFS without lockd (patch provided by Martin
Tournoij <martin@arp242.net> at ports/155991).
- Add pre-build check for locking to tell people why build fails.
PR: ports/155991, ports/164600
Submitted by: "Dmitry S. Luhtionov" <mitya@cabletv.dp.ua>
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/p5-XML-Parser/Makefile | 12 | ||||
| -rw-r--r-- | textproc/p5-XML-Parser/files/check_nfs.pl | 10 | ||||
| -rw-r--r-- | textproc/p5-XML-Parser/files/patch-CheckLib.pm | 22 |
3 files changed, 38 insertions, 6 deletions
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile index fa95a93c6762..c06244927a8b 100644 --- a/textproc/p5-XML-Parser/Makefile +++ b/textproc/p5-XML-Parser/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: XML::Parser -# Date created: 15 Nov 1998 -# Whom: Jun Kuriyama <kuriyama@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= XML-Parser PORTVERSION= 2.41 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,7 +10,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= kuriyama@FreeBSD.org COMMENT= Perl extension interface to James Clark's XML parser, expat -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 PERL_CONFIGURE= yes CONFIGURE_ARGS= EXPATLIBPATH=${LOCALBASE}/lib EXPATINCPATH=${LOCALBASE}/include @@ -57,6 +53,10 @@ post-configure: @${PERL} -i -pe 's|^(CC = ).*|$$1 ${CC}|;' \ -e 's|^(CCFLAGS = ).*|$$1 ${CFLAGS}|' ${WRKSRC}/Expat/Makefile +pre-build: + @cd ${WRKDIR} && ${PERL} ${FILESDIR}/check_nfs.pl 2>/dev/null || \ + (${ECHO_MSG} "===> lockf in \$$TMPDIR required"; ${FALSE}) + XE= ${.CURDIR}/../p5-XML-Encoding extract-encodings: @cd ${XE}; \ diff --git a/textproc/p5-XML-Parser/files/check_nfs.pl b/textproc/p5-XML-Parser/files/check_nfs.pl new file mode 100644 index 000000000000..b6471650f80b --- /dev/null +++ b/textproc/p5-XML-Parser/files/check_nfs.pl @@ -0,0 +1,10 @@ +#!/usr/bin/perl +# +# $FreeBSD$ + +use strict; +use warnings; +use File::Temp qw(tempfile); + +my ($fh, $fn) = tempfile("check-XXXXXX", SUFFIX => '.tmp', TMPDIR => 1, UNLINK => 1); +#print "$fn\n"; diff --git a/textproc/p5-XML-Parser/files/patch-CheckLib.pm b/textproc/p5-XML-Parser/files/patch-CheckLib.pm new file mode 100644 index 000000000000..e7ffd34ab48a --- /dev/null +++ b/textproc/p5-XML-Parser/files/patch-CheckLib.pm @@ -0,0 +1,22 @@ +$FreeBSD$ + +--- 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"; |