Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Aug 2013 11:27:16 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r324759 - in head/textproc/pcrs: . files
Message-ID:  <201308151127.r7FBRGx0092736@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Thu Aug 15 11:27:16 2013
New Revision: 324759
URL: http://svnweb.freebsd.org/changeset/ports/324759

Log:
  - Try to unbreak parallel builds (-jX) by adding missing dependencies
    for static library target
  - Unbreak configure script against Clang's cpp(1): suppress harmless
    warning that was treated as an error (=> missing pcre.h)
  - While here, trim Makefile header, remove defunct mirrors from the
    MASTER_SITES, convert LIB_DEPENDS and USE_GMAKE, kill spaces at EOL
    of port description, define LICENSE (LGPL21)
  
  Reported by:	marino
  Approved by:	miwi, bapt (portmgr, implicit)

Modified:
  head/textproc/pcrs/Makefile
  head/textproc/pcrs/files/patch-Makefile.in
  head/textproc/pcrs/files/patch-configure
  head/textproc/pcrs/pkg-descr

Modified: head/textproc/pcrs/Makefile
==============================================================================
--- head/textproc/pcrs/Makefile	Thu Aug 15 11:18:56 2013	(r324758)
+++ head/textproc/pcrs/Makefile	Thu Aug 15 11:27:16 2013	(r324759)
@@ -1,31 +1,26 @@
-# New ports collection makefile for:	pcrs
-# Date created:				31 July 2005
-# Whom:					Ken Wong <wongk@apt.homeunix.net>
-#
+# Created by: Ken Wong <wongk@apt.homeunix.net>
 # $FreeBSD$
-#
 
 PORTNAME=	pcrs
 PORTVERSION=	0.0.3
 PORTREVISION=	2
 CATEGORIES=	textproc
-MASTER_SITES=	http://distfiles.master.finkmirrors.net/\
-		http://download.mirror.ac.uk/mirror/master.us.finkmirrors.net/distfiles/\
-		http://mirror.phy.olemiss.edu/mirror/fink/distfiles/
+MASTER_SITES=	http://distfiles.master.finkmirrors.net/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	wongk@apt.homeunix.net
-COMMENT=	Perl compatible regular expression based substitutions
+COMMENT=	Perl-compatible regular expression based substitutions
 
-LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre
+LICENSE=	LGPL21
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
+USES=		gmake
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-
 USE_LDCONFIG=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 MAN3=		pcrs.3
 PLIST_FILES=	bin/pcrsed \
 		lib/libpcrs.a \

Modified: head/textproc/pcrs/files/patch-Makefile.in
==============================================================================
--- head/textproc/pcrs/files/patch-Makefile.in	Thu Aug 15 11:18:56 2013	(r324758)
+++ head/textproc/pcrs/files/patch-Makefile.in	Thu Aug 15 11:27:16 2013	(r324759)
@@ -23,7 +23,8 @@
 -	$(CC) $(CLFLAGS) $(LDFLAGS) $(LIBFLAGS) -Wl,-soname,libpcrs.so.$(VERSION_MAJOR) -o libpcrs.so.$(VERSION) pcrs.@OBJEXT@ $(LIBS)
 +	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBFLAGS) -Wl,-soname,libpcrs.so.$(VERSION_MAJOR) -o libpcrs.so.$(VERSION_MAJOR) pcrs.@OBJEXT@ $(LIBS)
  
- static:
+-static:
++static:	pcrs.@OBJEXT@
  	$(AR) libpcrs.a pcrs.@OBJEXT@
  
  install: all

Modified: head/textproc/pcrs/files/patch-configure
==============================================================================
--- head/textproc/pcrs/files/patch-configure	Thu Aug 15 11:18:56 2013	(r324758)
+++ head/textproc/pcrs/files/patch-configure	Thu Aug 15 11:27:16 2013	(r324759)
@@ -38,3 +38,12 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+@@ -1256,7 +1256,7 @@
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:1259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v warning:`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"

Modified: head/textproc/pcrs/pkg-descr
==============================================================================
--- head/textproc/pcrs/pkg-descr	Thu Aug 15 11:18:56 2013	(r324758)
+++ head/textproc/pcrs/pkg-descr	Thu Aug 15 11:27:16 2013	(r324759)
@@ -1,3 +1,3 @@
-PCRS is a small library, written as a supplement to the PCRE library, 
-that implements regex based substitution with the syntax and semantics 
-of Perl's s/// operator. 
+PCRS is a small library, written as a supplement to the PCRE library,
+that implements regex based substitution with the syntax and semantics
+of Perl's s/// operator.



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