8 files changed, 48 insertions, 50 deletions

diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index d76b659ba96c..8adeb05c5525 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -1,9 +1,14 @@
-DISTNAME=	chimera-1.61
+# New ports collection makefile for:	chimera
+# Version required:	1.63
+# Date created:		26 December 1994
+# Whom:			asami
+#
+# $Id:$
+#
+
+DISTNAME=	chimera-1.63
 USE_IMAKE=	yes
 MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera/
-
-pre-install:
-	@mkdir -p ${PREFIX}/man/man1
-	@install -c -m 644 ${WRKSRC}/src/chimera.man ${PREFIX}/man/man1/chimera.1
+INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>
diff --git a/www/chimera/files/patch-aa b/www/chimera/files/patch-aa
index fa72a559f000..7f4ed7ae0f24 100644
--- a/www/chimera/files/patch-aa
+++ b/www/chimera/files/patch-aa
@@ -1,14 +1,11 @@
-*** libhtmlw/HTML-PSformat.c~	Wed Sep 14 19:53:22 1994
---- libhtmlw/HTML-PSformat.c	Tue Oct 18 14:41:47 1994
-***************
-*** 47,53 ****
---- 47,55 ----
-  #include <stdio.h>
-  #include <ctype.h>
-  #include <math.h>
-+ #ifndef __FreeBSD__
-  #include <malloc.h>
-+ #endif
-  #include "HTMLP.h"
-  
-  /* Fix thanks to robm. */
+--- ./Common.tmpl.dist.org	Fri Dec 16 20:10:16 1994
++++ ./Common.tmpl.dist	Mon Dec 19 02:52:52 1994
+@@ -103,7 +103,7 @@
+ NEEDFUNCS = -DNEED_STRSTR -DNEED_GETCWD
+ */
+ 
+-EXTRA_DEFINES = -DHAVE_STDLIB_H -DHAVE_STRING_H -DHAVE_UNISTD_H -DHAVE_MALLOC_H $(MYPROTO) $(MYBSD) $(NEEDFUNCS)
++EXTRA_DEFINES = -DHAVE_STDLIB_H -DHAVE_STRING_H -DHAVE_UNISTD_H $(MYPROTO) $(MYBSD) $(NEEDFUNCS)
+ 
+ /*
+  * Extra libraries
diff --git a/www/chimera/pkg-comment b/www/chimera/pkg-comment
index 4017d90f8df3..ad36dd61384f 100644
--- a/www/chimera/pkg-comment
+++ b/www/chimera/pkg-comment
@@ -1 +1 @@
-chimera - X/Athena World-Wide Web Client. Version 1.60
+chimera - X/Athena World-Wide Web Client. Version 1.63
diff --git a/www/chimera/pkg-plist b/www/chimera/pkg-plist
index 36a35ce91a8e..00c2b55086f3 100644
--- a/www/chimera/pkg-plist
+++ b/www/chimera/pkg-plist
@@ -2,8 +2,8 @@
 @owner bin
 @mode 755
 bin/chimera
-bin/giftrans
 @mode 444
+lib/cacheinfo
 lib/convert
 lib/help.html
 lib/home.html
@@ -12,12 +12,9 @@ lib/mime.types
 lib/protocol
 lib/chimera/Chimera
 @mode 755
-lib/chimera/chimera-giftoppm
 lib/chimera/do3270
 lib/chimera/dotelnet
 lib/chimera/playaudio
 lib/chimera/pstopxm
-lib/chimera/textencode
-lib/chimera/wrapencode
 @mode 644
-man/man1/chimera.1
+man/man1/chimera.1.gz
diff --git a/www/chimera2/Makefile b/www/chimera2/Makefile
index d76b659ba96c..8adeb05c5525 100644
--- a/www/chimera2/Makefile
+++ b/www/chimera2/Makefile
@@ -1,9 +1,14 @@
-DISTNAME=	chimera-1.61
+# New ports collection makefile for:	chimera
+# Version required:	1.63
+# Date created:		26 December 1994
+# Whom:			asami
+#
+# $Id:$
+#
+
+DISTNAME=	chimera-1.63
 USE_IMAKE=	yes
 MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera/
-
-pre-install:
-	@mkdir -p ${PREFIX}/man/man1
-	@install -c -m 644 ${WRKSRC}/src/chimera.man ${PREFIX}/man/man1/chimera.1
+INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>
diff --git a/www/chimera2/files/patch-aa b/www/chimera2/files/patch-aa
index fa72a559f000..7f4ed7ae0f24 100644
--- a/www/chimera2/files/patch-aa
+++ b/www/chimera2/files/patch-aa
@@ -1,14 +1,11 @@
-*** libhtmlw/HTML-PSformat.c~	Wed Sep 14 19:53:22 1994
---- libhtmlw/HTML-PSformat.c	Tue Oct 18 14:41:47 1994
-***************
-*** 47,53 ****
---- 47,55 ----
-  #include <stdio.h>
-  #include <ctype.h>
-  #include <math.h>
-+ #ifndef __FreeBSD__
-  #include <malloc.h>
-+ #endif
-  #include "HTMLP.h"
-  
-  /* Fix thanks to robm. */
+--- ./Common.tmpl.dist.org	Fri Dec 16 20:10:16 1994
++++ ./Common.tmpl.dist	Mon Dec 19 02:52:52 1994
+@@ -103,7 +103,7 @@
+ NEEDFUNCS = -DNEED_STRSTR -DNEED_GETCWD
+ */
+ 
+-EXTRA_DEFINES = -DHAVE_STDLIB_H -DHAVE_STRING_H -DHAVE_UNISTD_H -DHAVE_MALLOC_H $(MYPROTO) $(MYBSD) $(NEEDFUNCS)
++EXTRA_DEFINES = -DHAVE_STDLIB_H -DHAVE_STRING_H -DHAVE_UNISTD_H $(MYPROTO) $(MYBSD) $(NEEDFUNCS)
+ 
+ /*
+  * Extra libraries
diff --git a/www/chimera2/pkg-comment b/www/chimera2/pkg-comment
index 4017d90f8df3..ad36dd61384f 100644
--- a/www/chimera2/pkg-comment
+++ b/www/chimera2/pkg-comment
@@ -1 +1 @@
-chimera - X/Athena World-Wide Web Client. Version 1.60
+chimera - X/Athena World-Wide Web Client. Version 1.63
diff --git a/www/chimera2/pkg-plist b/www/chimera2/pkg-plist
index 36a35ce91a8e..00c2b55086f3 100644
--- a/www/chimera2/pkg-plist
+++ b/www/chimera2/pkg-plist
@@ -2,8 +2,8 @@
 @owner bin
 @mode 755
 bin/chimera
-bin/giftrans
 @mode 444
+lib/cacheinfo
 lib/convert
 lib/help.html
 lib/home.html
@@ -12,12 +12,9 @@ lib/mime.types
 lib/protocol
 lib/chimera/Chimera
 @mode 755
-lib/chimera/chimera-giftoppm
 lib/chimera/do3270
 lib/chimera/dotelnet
 lib/chimera/playaudio
 lib/chimera/pstopxm
-lib/chimera/textencode
-lib/chimera/wrapencode
 @mode 644
-man/man1/chimera.1
+man/man1/chimera.1.gz