From 94034fbdd72bc2fb33aff0603e9196bd42444491 Mon Sep 17 00:00:00 2001 From: marc Date: Fri, 28 Aug 1998 19:58:16 +0000 Subject: [PATCH] update to 1.2 --- lang/guavac/Makefile | 15 ++-------- lang/guavac/files/md5 | 2 +- lang/guavac/patches/patch-ab | 9 ------ lang/guavac/patches/patch-ac | 55 ++++++++++++++++++++++++++++-------- lang/guavac/pkg/PLIST | 4 ++- 5 files changed, 50 insertions(+), 35 deletions(-) delete mode 100644 lang/guavac/patches/patch-ab diff --git a/lang/guavac/Makefile b/lang/guavac/Makefile index 8a8bb88d7cc..5efa44d0ecd 100644 --- a/lang/guavac/Makefile +++ b/lang/guavac/Makefile @@ -3,25 +3,16 @@ # Date created: 24 December 1997 # Whom: Todd T. Fries # -# $OpenBSD: Makefile,v 1.1.1.1 1997/12/27 06:13:28 todd Exp $ +# $OpenBSD: Makefile,v 1.2 1998/08/28 19:58:16 marc Exp $ # -DISTNAME= guavac-1.0 +DISTNAME= guavac-1.2 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/ +MASTER_SITES= http://ftp.doc.ic.ac.uk/packages/guavac/ MAINTAINER= toddf@acm.org USE_GMAKE= yes GNU_CONFIGURE= yes -MAN1= guavac.1 -STRIP= - -CONFIGURE_ENV= CFLAGS=-O2 - -post-install: - @strip ${PREFIX}/bin/guavac ${PREFIX}/bin/guavad .include diff --git a/lang/guavac/files/md5 b/lang/guavac/files/md5 index b8587cbc84c..4dfdcbc2690 100644 --- a/lang/guavac/files/md5 +++ b/lang/guavac/files/md5 @@ -1 +1 @@ -MD5 (guavac-1.0.tar.gz) = d5456f8a90e66c5727e9a606b00fdfdd +MD5 (guavac-1.2.tar.gz) = 06b7391584fc6b22db7f16fc0a2f9b3e diff --git a/lang/guavac/patches/patch-ab b/lang/guavac/patches/patch-ab deleted file mode 100644 index a48939fa869..00000000000 --- a/lang/guavac/patches/patch-ab +++ /dev/null @@ -1,9 +0,0 @@ -diff -ur common/string.h.orig common/string.h ---- common/string.h.orig Sat Jan 13 20:40:28 1996 -+++ common/string.h Mon Dec 22 19:14:57 1997 -@@ -5,4 +5,5 @@ - #ifndef __SINST__ - #define __SINST__ - #endif -+#include_next // Get missing memmove() prototype for libg++ - #include diff --git a/lang/guavac/patches/patch-ac b/lang/guavac/patches/patch-ac index d52e8de2cc0..2d1b495757b 100644 --- a/lang/guavac/patches/patch-ac +++ b/lang/guavac/patches/patch-ac @@ -1,21 +1,52 @@ -diff -ur man/Makefile.in.orig man/Makefile.in ---- man/Makefile.in.orig Mon Mar 3 12:21:07 1997 -+++ man/Makefile.in Mon Dec 22 19:14:58 1997 -@@ -55,13 +55,13 @@ - cd $(srcdir) && for file in $(PRODUCT).1; do \ - $(INSTALL_DATA) $$file $(mandir)/man1/$$file; \ - done -- cd $(srcdir) && for file in $(PRODUCT).man; do \ -- $(INSTALL_DATA) $$file $(mandir)/cat1/$$file; \ +--- man/Makefile.in.~1~ Mon Mar 3 10:21:07 1997 ++++ man/Makefile.in Fri Aug 28 11:30:14 1998 +@@ -32,12 +32,12 @@ + prefix = @prefix@ + mandir = @mandir@ + +-DISTFILES = Makefile.in version.in $(PRODUCT).1 version.n stamp-vnr $(PRODUCT).man $(PRODUCT).ps ++DISTFILES = Makefile.in version.in $(PRODUCT).1 version.n stamp-vnr $(PRODUCT).0 $(PRODUCT).ps + +-all manpage: $(PRODUCT).man $(PRODUCT).ps ++all manpage: $(PRODUCT).0 $(PRODUCT).ps + +-$(PRODUCT).man: $(PRODUCT).1 version.n +- cd $(srcdir) && $(TROFF) $(TROFFOPTS) -Tascii $(PRODUCT).1 >$(PRODUCT).man ++$(PRODUCT).0: $(PRODUCT).1 version.n ++ cd $(srcdir) && $(TROFF) $(TROFFOPTS) -Tascii $(PRODUCT).1 >$(PRODUCT).0 + $(PRODUCT).ps: $(PRODUCT).1 version.n + cd $(srcdir) && $(TROFF) $(TROFFOPTS) -Tps $(PRODUCT).1 >$(PRODUCT).ps + +@@ -51,17 +51,17 @@ + date > $< + + install: all +- $(srcdir)/../mkinstalldirs $(mandir) $(mandir)/man1 $(mandir)/cat1 +- cd $(srcdir) && for file in $(PRODUCT).1; do \ +- $(INSTALL_DATA) $$file $(mandir)/man1/$$file; \ - done -+# cd $(srcdir) && for file in $(PRODUCT).man; do \ -+# $(INSTALL_DATA) $$file $(mandir)/cat1/$$file; \ +- cd $(srcdir) && for file in $(PRODUCT).man; do \ ++ $(srcdir)/../mkinstalldirs $(mandir) $(mandir)/cat1 ++# cd $(srcdir) && for file in $(PRODUCT).1; do \ ++# $(INSTALL_DATA) $$file $(mandir)/man1/$$file; \ +# done ++ cd $(srcdir) && for file in $(PRODUCT).0; do \ + $(INSTALL_DATA) $$file $(mandir)/cat1/$$file; \ + done uninstall: rm -f $(mandir)/man1/$(PRODUCT).1 - rm -f $(mandir)/cat1/$(PRODUCT).man -+# rm -f $(mandir)/cat1/$(PRODUCT).man ++ rm -f $(mandir)/cat1/$(PRODUCT).0 mostlyclean: rm -f *.tmp +@@ -72,7 +72,7 @@ + rm -f Makefile + + realclean: distclean +- rm -f stamp-vti $(PRODUCT).man $(PRODUCT).n $(PRODUCT).ps ++ rm -f stamp-vti $(PRODUCT).0 $(PRODUCT).n $(PRODUCT).ps + + dist: $(DISTFILES) + @echo "Copying distribution files" diff --git a/lang/guavac/pkg/PLIST b/lang/guavac/pkg/PLIST index 0975cd83947..1a873fc004e 100644 --- a/lang/guavac/pkg/PLIST +++ b/lang/guavac/pkg/PLIST @@ -1,6 +1,8 @@ +@cwd /usr/local +@name guavac-1.2 bin/guavac bin/guavad bin/gcok -man/man1/guavac.1 +man/cat1/guavac.0 share/guavac/classes.zip @dirrm share/guavac