4 files changed, 30 insertions, 33 deletions

diff --git a/math/rascal/Makefile b/math/rascal/Makefile
index 2247c7abadcb..2e5f92aceaab 100644
--- a/math/rascal/Makefile
+++ b/math/rascal/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	rascal
-PORTVERSION=	0.2.3
+PORTVERSION=	0.2.5
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +22,12 @@ WRKSRC=		${WRKDIR}/Rascal-${PORTVERSION}
 USE_GMAKE=	yes
 ALL_TARGET=	
 
+MANCOMPRESSED=	yes
+MAN1=	rascal.1
+
 post-patch:
-	@${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
+	@${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g ; \
+		s,g\+\+,${CXX},g ; \
+		s,doc/,share/doc/,g" ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/math/rascal/distinfo b/math/rascal/distinfo
index 4eb574547632..2433425e3421 100644
--- a/math/rascal/distinfo
+++ b/math/rascal/distinfo
@@ -1 +1 @@
-MD5 (rascal-0.2.3.tar.gz) = f21be315306e48880e2e455397624674
+MD5 (rascal-0.2.5.tar.gz) = 4dea3fbc8ad2c4597c05aec51ad0e2d4
diff --git a/math/rascal/files/patch-Makefile b/math/rascal/files/patch-Makefile
index d7f728097898..2c6470845840 100644
--- a/math/rascal/files/patch-Makefile
+++ b/math/rascal/files/patch-Makefile
@@ -1,40 +1,20 @@
---- Makefile.orig	Sat Jun 23 08:05:50 2001
-+++ Makefile	Wed Jun 27 01:10:23 2001
+--- Makefile.orig	Thu Jun 28 02:07:37 2001
++++ Makefile	Thu Jun 28 02:11:27 2001
 @@ -21,4 +21,3 @@
  
 -CC=g++
 -CFLAGS=-O0 -g -DVERSION=\"$(VERSION)\"
-+CXXFLAGS=-O0 -DVERSION=\"$(VERSION)\" -I%%LOCALBASE%%/include
- # with the following options you might be able to optimize
-@@ -33,3 +32,3 @@
++CFLAGS+=-DVERSION=\"$(VERSION)\" -I%%LOCALBASE%%/include
+ # With the following options you may generate an optimized version of
+@@ -38,3 +37,3 @@
  
 -LIBS=-lm -lreadline -lcurses
 +LIBS=-lm -lreadline -lcurses -L%%LOCALBASE%%/lib -lgnugetopt
  OBJS=y.tab.o lex.yy.o symtab.o value.o
-@@ -38,4 +37,8 @@
- 
-+.SUFFIXES:	.o .c
+@@ -42,2 +41,6 @@
+ -include value.mak
 +
-+.c.o:	;	${CXX} ${CXXFLAGS} -c $*.c
++.SUFFIXES:	.o .c
 +
- rascal:	$(OBJS)
--	g++ -o rascal $(CFLAGS) $(OBJS) $(LIBS)
-+	g++ -o rascal $(CXXFLAGS) $(OBJS) $(LIBS)
- test: rascal
-@@ -73,7 +76,7 @@
- 	$(INSTALL) ./rascal.rc $(PREFIX)/bin/
-+	$(INSTDIR) $(PREFIX)/share/doc/rascal
- 	$(STRIP)   $(PREFIX)/bin/rascal
--	$(INSTDIR) $(PREFIX)/doc/rascal
--	$(INSTALL) rascal.ps $(PREFIX)/doc/rascal
--	$(INSTALL) rascal.pdf $(PREFIX)/doc/rascal
--	-$(INSTDIR) $(PREFIX)/doc/rascal/html
-+	$(INSTALL) rascal.ps $(PREFIX)/share/doc/rascal
-+	$(INSTALL) rascal.pdf $(PREFIX)/share/doc/rascal
-+	-$(INSTDIR) $(PREFIX)/share/doc/rascal/html
- 	-$(INSTALL) rascal_html/index.html rascal_html/rascal.html rascal_html/*.gif rascal_html/*.css $(PREFIX)/doc/rascal/html
-@@ -112,3 +115,3 @@
- value.o: value.hpp value.out value.cpp modules/*.cpp modules/*.hpp
--	g++ $(CFLAGS) -c -o value.o value.cpp
-+	g++ $(CXXFLAGS) -c -o value.o value.cpp
- parsevalue: parsevalue.cpp
++.c.o:	;	${CXX} ${CFLAGS} -c $*.c
+ 
diff --git a/math/rascal/pkg-plist b/math/rascal/pkg-plist
index 8a9b6a0d7a99..a7a35cb62f56 100644
--- a/math/rascal/pkg-plist
+++ b/math/rascal/pkg-plist
@@ -2,5 +2,17 @@ bin/rascal
 bin/rascal.rc
 share/doc/rascal/rascal.pdf
 share/doc/rascal/rascal.ps
+share/doc/rascal/CHANGES
+share/doc/rascal/TEST
+share/doc/rascal/html/img1.gif
+share/doc/rascal/html/img2.gif
+share/doc/rascal/html/img3.gif
+share/doc/rascal/html/img4.gif
+share/doc/rascal/html/img5.gif
+share/doc/rascal/html/img6.gif
+share/doc/rascal/html/img7.gif
+share/doc/rascal/html/index.html
+share/doc/rascal/html/rascal.css
+share/doc/rascal/html/rascal.html
 @dirrm share/doc/rascal/html
 @dirrm share/doc/rascal