From 53d772a1075415a859c0144a5c22e08ab8b554a8 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Tue, 30 Dec 2008 03:29:35 +0000
Subject: Update to 081227.

PR:		129980
Submitted by:	Alex Kozlov <spam@rm-rf.kiev.ua>
---
 lang/pcc/Makefile                     | 13 +++++++++----
 lang/pcc/distinfo                     |  6 +++---
 lang/pcc/files/ccconfig.h             |  2 +-
 lang/pcc/files/patch-cccc-Makefile.in | 15 +++++++--------
 4 files changed, 20 insertions(+), 16 deletions(-)

(limited to 'lang')

diff --git a/lang/pcc/Makefile b/lang/pcc/Makefile
index 566500b9ff15..e91b12cf58dc 100644
--- a/lang/pcc/Makefile
+++ b/lang/pcc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	pcc
-DATESPEC=	080613
+DATESPEC=	081227
 PORTVERSION=	0.9.9.${DATESPEC}
 PORTREVISION?=	0
 CATEGORIES=	lang
@@ -25,13 +25,18 @@ ONLY_FOR_ARCHS=	i386
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DATESPEC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	YACC=${YACC}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 
-PLIST_FILES=	bin/pcc libexec/ccom libexec/cpp \
-		man/man1/pcc.1 man/man1/cpp.1 man/man1/ccom.1
+MAN1=		pcc.1 cpp.1 ccom.1
+PLIST_FILES=	bin/pcc libexec/ccom libexec/cpp
+
+OSVERMAJOR=${OSREL:C/\.[0-9.]*//}
 
 pre-configure:
 	${MKDIR} ${WRKSRC}/os/freebsd
-	${LN} -sf ${FILESDIR}/*.h ${WRKSRC}/os/freebsd
+	${CP} ${FILESDIR}/*.h ${WRKSRC}/os/freebsd
+	${REINPLACE_CMD} -e "s,%%OSVERMAJOR%%,${OSVERMAJOR}," \
+		${WRKSRC}/os/freebsd/ccconfig.h
 
 .include <bsd.port.mk>
diff --git a/lang/pcc/distinfo b/lang/pcc/distinfo
index 623eca4bafe5..bc6ce1badcfa 100644
--- a/lang/pcc/distinfo
+++ b/lang/pcc/distinfo
@@ -1,3 +1,3 @@
-MD5 (pcc-080613.tgz) = 55f305f39c1c666ee057c97790a41518
-SHA256 (pcc-080613.tgz) = 11c34e1f199b60d4ae25009105a07ff50e33f5a0760053a93520e55829fd4809
-SIZE (pcc-080613.tgz) = 526056
+MD5 (pcc-081227.tgz) = 93393dec36caa7dc2f4ec22e2c1a9f76
+SHA256 (pcc-081227.tgz) = 9fe643c2979482a565e9430019a74596df4a893e977327cb9a8fb9faeecb2cd9
+SIZE (pcc-081227.tgz) = 604716
diff --git a/lang/pcc/files/ccconfig.h b/lang/pcc/files/ccconfig.h
index 70f1cd37304f..1436444cdc1b 100644
--- a/lang/pcc/files/ccconfig.h
+++ b/lang/pcc/files/ccconfig.h
@@ -34,7 +34,7 @@
  */
 
 /* common cpp predefines */
-#define CPPADD	{ "-D__FreeBSD__", "-D__ELF__", "-D__unix__=1", "-D__unix=1", "-D__STDC__=1", NULL, }
+#define CPPADD	{ "-D__FreeBSD__=%%OSVERMAJOR%%", "-D__ELF__", "-D__unix__=1", "-D__unix=1", "-D__STDC__=1", NULL, }
 #define DYNLINKER { "-dynamic-linker", "/libexec/ld-elf.so.1", NULL }
 #define CRT0FILE "/usr/lib/crt1.o"
 #define STARTFILES { "/usr/lib/crti.o", "/usr/lib/crtbegin.o", NULL }
diff --git a/lang/pcc/files/patch-cccc-Makefile.in b/lang/pcc/files/patch-cccc-Makefile.in
index 5d2070b60f1c..f52adfb01bd2 100644
--- a/lang/pcc/files/patch-cccc-Makefile.in
+++ b/lang/pcc/files/patch-cccc-Makefile.in
@@ -1,14 +1,13 @@
---- cc/cc/Makefile.in.orig	2008-05-19 22:38:04.000000000 -0700
-+++ cc/cc/Makefile.in	2008-06-16 07:49:59.000000000 -0700
-@@ -53,8 +53,9 @@ install:
+Index: cc/cc/Makefile.in
+@@ -59,8 +59,9 @@
  	fi
  	test -z "${DESTDIR}$(mandir)/man1" || mkdir -p "${DESTDIR}$(mandir)/man1"
- 	${INSTALL} cc.1 ${DESTDIR}${mandir}/man1/${DEST}.1
--	test -z "$(PCCINCDIR)" || mkdir -p "$(PCCINCDIR)"
--	test -z "$(PCCLIBDIR)" || mkdir -p "$(PCCLIBDIR)"
+ 	${INSTALL} $(srcdir)/cc.1 ${DESTDIR}${mandir}/man1/${DEST}.1
+-	test -z "${DESTDIR}$(PCCINCDIR)" || mkdir -p "${DESTDIR}$(PCCINCDIR)"
+-	test -z "${DESTDIR}$(PCCLIBDIR)" || mkdir -p "${DESTDIR}$(PCCLIBDIR)"
 +	# Don't make unused empty directories for no reason.
-+	#test -z "$(PCCINCDIR)" || mkdir -p "$(PCCINCDIR)"
-+	#test -z "$(PCCLIBDIR)" || mkdir -p "$(PCCLIBDIR)"
++	#test -z "${DESTDIR}$(PCCINCDIR)" || mkdir -p "${DESTDIR}$(PCCINCDIR)"
++	#test -z "${DESTDIR}$(PCCLIBDIR)" || mkdir -p "${DESTDIR}$(PCCLIBDIR)"
  
  clean:
  	/bin/rm -f  $(OBJS) ${DEST}
-- 
cgit