svn commit: r313251 - in head/lang/tcc: . files

[Martin Wilke]

Author: miwi
Date: Sat Mar  2 14:52:46 2013
New Revision: 313251
URL: http://svnweb.freebsd.org/changeset/ports/313251

Log:
  - Update to 0.9.25
  
  PR:		176551
  Submitted by:	Ports Fury

Modified:
  head/lang/tcc/Makefile   (contents, props changed)
  head/lang/tcc/files/patch-Makefile   (contents, props changed)
  head/lang/tcc/pkg-plist   (contents, props changed)

Modified: head/lang/tcc/Makefile
==============================================================================
--- head/lang/tcc/Makefile	Sat Mar  2 14:50:25 2013	(r313250)
+++ head/lang/tcc/Makefile	Sat Mar  2 14:52:46 2013	(r313251)
@@ -2,37 +2,47 @@
 
 PORTNAME=	tcc
 PORTVERSION=	0.9.25
-PORTREVISION=	2
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	tinycc
+MASTER_SITES=	SAVANNAH/tinycc
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Tiny C Compiler
 
+LICENSE=	LGPL21
+
+OPTIONS_DEFINE=	DOCS
+
 ONLY_FOR_ARCHS=	i386
 #ONLY_FOR_ARCHS=	i386 amd64 arm alpha mips powerpc
 
 CONFLICTS=	TenDRA-*
 
 USE_BZIP2=	yes
-HAS_CONFIGURE=	yes
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}"
-MAKE_ARGS+=	CONFIG_NOLDL=1
-MAN1=	tcc.1
+MAKE_ARGS=	CONFIG_NOLDL=1
+MAKE_JOBS_SAFE=	yes
 
-.if defined(NOPORTDOCS)
-MAKE_ARGS+=	NOPORTDOCS=1 CFLAGS="${CFLAGS}"
+MAN1=		tcc.1
+
+.include <bsd.port.options.mk>
+
+.if empty(PORT_OPTIONS:MDOCS)
+MAKE_ARGS+=	NOPORTDOCS=1
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if (${ARCH} == i386)
-PLIST_SUB+=	WITH_I386=""
+.if ${ARCH} == "i386"
+PLIST_SUB+=	I386=""
 .else
-PLIST_SUB+=	WITH_I386="@comment "
+PLIST_SUB+=	I386="@comment "
+.endif
+
+.if ${CC:T:M*clang*} || ${OSVERSION} >= 1000024
+CFLAGS+=	-fheinous-gnu-extensions
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/lang/tcc/files/patch-Makefile
==============================================================================
--- head/lang/tcc/files/patch-Makefile	Sat Mar  2 14:50:25 2013	(r313250)
+++ head/lang/tcc/files/patch-Makefile	Sat Mar  2 14:52:46 2013	(r313251)
@@ -41,11 +41,29 @@
  
  ifdef CONFIG_CROSS
  PROGS+=$(PROGS_CROSS)
+@@ -180,7 +193,7 @@
+ endif
+ 
+ %.o: %.c
+-	$(LIBTCC1_CC) -o $@ -c $< -O2 -Wall
++	$(LIBTCC1_CC) -o $@ -c $< $(CFLAGS) -Wall
+ 
+ %.o: %.S
+ 	$(LIBTCC1_CC) -o $@ -c $<
+@@ -189,7 +202,7 @@
+ 	$(AR) rcs $@ $^
+ 
+ bcheck.o: bcheck.c
+-	$(CC) -o $@ -c $< -O2 -Wall
++	$(CC) -o $@ -c $< $(CFLAGS) -Wall
+ 
+ # install
+ TCC_INCLUDES = stdarg.h stddef.h stdbool.h float.h varargs.h tcclib.h
 @@ -210,8 +223,10 @@
  	$(INSTALL) -m644 $(BCHECK_O) "$(tccdir)"
  endif
  	$(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include"
-+ifndef NOPORTSDOC
++ifndef NOPORTDOCS
  	mkdir -p "$(docdir)"
  	$(INSTALL) -m644 tcc-doc.html "$(docdir)"
 +endif

Modified: head/lang/tcc/pkg-plist
==============================================================================
--- head/lang/tcc/pkg-plist	Sat Mar  2 14:50:25 2013	(r313250)
+++ head/lang/tcc/pkg-plist	Sat Mar  2 14:52:46 2013	(r313251)
@@ -1,7 +1,7 @@
 bin/tcc
 include/libtcc.h
 lib/libtcc.a
-%%WITH_I386%%lib/tcc/bcheck.o
+%%I386%%lib/tcc/bcheck.o
 lib/tcc/include/float.h
 lib/tcc/include/stdarg.h
 lib/tcc/include/stdbool.h