svn commit: r416864 - in head/lang/pcc: . files

[Kurt Jaeger]

Author: pi
Date: Mon Jun 13 19:53:48 2016
New Revision: 416864
URL: https://svnweb.freebsd.org/changeset/ports/416864

Log:
  lang/pcc: 1.0.0 -> 1.1.0
  
  - Add RUN_DEPENDS on devel/pcc-libs port on the same version
  - Adapt PLIST_FILES
  - Add THREADS option to "Enable Thread-local storage (TLS)"
  - Add new patch for ${WRKSRC}/cc/cc/cc.c file, related to inverted
    MULTIARCH_PATH define check
  - Replace some static patches with sed patches
  - Remove unneeded patches for this version
  
  PR:		196642
  Submitted by:	Sender Ghost <lightside at gmx.com>
  Approved by:	joel (maintainer)

Added:
  head/lang/pcc/files/patch-cc_cc_cc.c   (contents, props changed)
Deleted:
  head/lang/pcc/files/ccconfig.h
  head/lang/pcc/files/f77config.h
  head/lang/pcc/files/patch-cccc-Makefile.in
  head/lang/pcc/files/patch-configure
Modified:
  head/lang/pcc/Makefile
  head/lang/pcc/distinfo

Modified: head/lang/pcc/Makefile
==============================================================================
--- head/lang/pcc/Makefile	Mon Jun 13 19:30:55 2016	(r416863)
+++ head/lang/pcc/Makefile	Mon Jun 13 19:53:48 2016	(r416864)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pcc
-PORTVERSION=	1.0.0
+PORTVERSION=	1.1.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://pcc.ludd.ltu.se/pub/pcc-releases/ \
 		http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/ \
@@ -11,29 +11,44 @@ MASTER_SITES=	ftp://pcc.ludd.ltu.se/pub/
 MAINTAINER=	joel at FreeBSD.org
 COMMENT=	Portable C Compiler
 
+LICENSE=	BSDCOMPATIBLE BSD2CLAUSE BSD3CLAUSE
+LICENSE_COMB=	multi
+LICENSE_NAME_BSDCOMPATIBLE=	BSD-style compatible licenses
+LICENSE_TEXT_BSDCOMPATIBLE=	The license: BSDCOMPATIBLE (${LICENSE_NAME_BSDCOMPATIBLE}),\
+	please read from the web: http://pcc.ludd.ltu.se/licenses/
+LICENSE_PERMS_BSDCOMPATIBLE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+RUN_DEPENDS=	pcc-libs>=${PORTVERSION}:devel/pcc-libs
+
 ONLY_FOR_ARCHS=	i386 amd64
 
 USES=		gmake tar:tgz
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	YACC=${YACC}
 
-PLIST_FILES=	bin/pcc libexec/ccom libexec/cpp \
+PLIST_FILES=	bin/pcc bin/pcpp \
+		libexec/ccom libexec/cxxcom libexec/cpp \
 		man/man1/ccom.1.gz man/man1/cpp.1.gz \
 		man/man1/pcc.1.gz
 
 MAKE_JOBS_UNSAFE=	yes
 
-# Fix -jX builds: use -C switch instead of cd'ing and add missing dependency
+OPTIONS_DEFINE=	THREADS
+OPTIONS_DEFAULT=	THREADS
+THREADS_DESC=	Enable Thread-local storage (TLS)
+THREADS_CONFIGURE_ENABLE=	tls
+
+.include <bsd.port.pre.mk>
 
 post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -E \
-	's/cd (.+)(;| &&) (\$$[{(]MAKE[})][^$$]*)( \$$\(MFLAGS\))?/\3 -C \1/'
-	@${ECHO_CMD} 'builtins.o: pass1.h' >> ${WRKSRC}/cc/ccom/Makefile.in
-
-pre-configure:
-	${MKDIR} ${WRKSRC}/os/freebsd
-	${CP} ${FILESDIR}/*.h ${WRKSRC}/os/freebsd
-	${REINPLACE_CMD} -e "s,%%OSVERMAJOR%%,${OSREL:R}," \
+	# Don't make empty directories, which created by devel/pcc-libs port
+	@${REINPLACE_CMD} -e '/mkdir -p.*PCC.*DIR/d' \
+		${WRKSRC}/cc/cc/Makefile.in
+.if ${OPSYS} == FreeBSD
+	@${REINPLACE_CMD} -e '/targmach=amd64/s/x86_64/amd64/' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,\" MKS(TARGOSVER),${OSREL:R}\",' \
 		${WRKSRC}/os/freebsd/ccconfig.h
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/lang/pcc/distinfo
==============================================================================
--- head/lang/pcc/distinfo	Mon Jun 13 19:30:55 2016	(r416863)
+++ head/lang/pcc/distinfo	Mon Jun 13 19:53:48 2016	(r416864)
@@ -1,2 +1,2 @@
-SHA256 (pcc-1.0.0.tgz) = 5802dbba46d6ea3f9badaa55b9044a0416bb410020c24a5c2a8a2eaaf41156cb
-SIZE (pcc-1.0.0.tgz) = 652308
+SHA256 (pcc-1.1.0.tgz) = d9e3fed84c767dcddefb6b1f854d5da8921f3f65d8bd02997743412f41474d64
+SIZE (pcc-1.1.0.tgz) = 848427

Added: head/lang/pcc/files/patch-cc_cc_cc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/pcc/files/patch-cc_cc_cc.c	Mon Jun 13 19:53:48 2016	(r416864)
@@ -0,0 +1,11 @@
+--- cc/cc/cc.c.orig	2014-12-06 09:52:55 UTC
++++ cc/cc/cc.c
+@@ -206,7 +206,7 @@ char *cppmdadd[] = CPPMDADD;
+ #define PCCLIBDIR	NULL
+ #endif
+ #ifndef DEFLIBDIRS	/* default library search paths */
+-#ifdef MULTIARCH_PATH
++#ifndef MULTIARCH_PATH
+ #define DEFLIBDIRS	{ "/usr/lib/", 0 }
+ #else
+ #define DEFLIBDIRS	{ "/usr/lib/", "/usr/lib/" MULTIARCH_PATH "/", 0 }