From 61226cc60005b10abfb6e9e0da4033d2c398f12a Mon Sep 17 00:00:00 2001
From: John Polstra <jdp@FreeBSD.org>
Date: Thu, 12 Jun 1997 21:58:57 +0000
Subject: Upgrade to version 0.3 (from 0.2.5).

I modified the submitted version slightly, (a) to honor the user's
CFLAGS setting, and (b) to eliminate some compilation warnings.

PR:		ports/3825
Submitted by:	Yukihiro Nakai Nakai@Mlab.t.u-tokyo.ac.jp
---
 java/guavac/Makefile       | 12 ++++++------
 java/guavac/distinfo       |  2 +-
 java/guavac/files/patch-ad | 25 ++++++++++++++-----------
 java/guavac/files/patch-ae | 10 ++++++++++
 4 files changed, 31 insertions(+), 18 deletions(-)
 create mode 100644 java/guavac/files/patch-ae

(limited to 'java')

diff --git a/java/guavac/Makefile b/java/guavac/Makefile
index 125e2871277a..4b48c2438524 100644
--- a/java/guavac/Makefile
+++ b/java/guavac/Makefile
@@ -1,20 +1,20 @@
-# New ports collection makefile for:   guavac-0.2.5
-# Version required:    0.2.5
+# New ports collection makefile for:   guavac
+# Version required:    0.3
 # Date created:        10 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1997/02/16 01:31:37 obrien Exp $
+# $Id: Makefile,v 1.2 1997/02/16 11:56:45 asami Exp $
 #
 
-DISTNAME=	guavac-0.2.5
+DISTNAME=	guavac-0.3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://summit.stanford.edu/pub/guavac/ \
 		ftp://ftp.Germany.EU.net/pub/programming/languages/java/guavac/\
-		ftp://sunsite.mff.cuni.cz/Languages/Java/guavac/  \
-		ftp://sunsite.auc.dk/pub/languages/java/guavac/
+		ftp://sunsite.mff.cuni.cz/Languages/Java/guavac/
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAN1=		guavac.1
 
diff --git a/java/guavac/distinfo b/java/guavac/distinfo
index bc9dd5b96260..b7ce455f4c9c 100644
--- a/java/guavac/distinfo
+++ b/java/guavac/distinfo
@@ -1 +1 @@
-MD5 (guavac-0.2.5.tar.gz) = f3a401b65e368da92c273caec3ced1ac
+MD5 (guavac-0.3.tar.gz) = dc3b10cec02c9a9a0940cf3b2b542962
diff --git a/java/guavac/files/patch-ad b/java/guavac/files/patch-ad
index 5a42fdc8b9a3..0d193d5fa48c 100644
--- a/java/guavac/files/patch-ad
+++ b/java/guavac/files/patch-ad
@@ -1,11 +1,14 @@
---- configure.orig	Fri Aug  2 19:55:11 1996
-+++ configure	Sun Feb 16 19:28:11 1997
-@@ -1598,7 +1598,7 @@
- 
- 
- 
--CFLAGS="-g -I. -I.. -I../common"
-+CFLAGS="-I. -I.. -I../common"
- cat >> confdefs.h <<EOF
- #define CFLAGS "$CFLAGS"
- EOF
+*** configure.orig	Mon Apr 28 12:41:52 1997
+--- configure	Thu Jun 12 13:32:18 1997
+***************
+*** 520,528 ****
+  
+  
+  
+- if test -z "${CFLAGS}"; then
+-   CFLAGS=-g
+- fi
+  CFLAGS="$CFLAGS -I. -I.. -I\$(srcdir)/../common"
+  cat >> confdefs.h <<EOF
+  #define CFLAGS "$CFLAGS"
+--- 520,525 ----
diff --git a/java/guavac/files/patch-ae b/java/guavac/files/patch-ae
new file mode 100644
index 000000000000..7b4e525eb6af
--- /dev/null
+++ b/java/guavac/files/patch-ae
@@ -0,0 +1,10 @@
+*** common/string.h.orig	Sat Jan 13 18:40:28 1996
+--- common/string.h	Thu Jun 12 10:49:44 1997
+***************
+*** 5,8 ****
+--- 5,9 ----
+  #ifndef __SINST__
+  #define __SINST__
+  #endif
++ #include_next <string.h>	// Get missing memmove() prototype for libg++
+  #include <string>
-- 
cgit v1.2.3