pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/Mosaic Convert to bl3 and make compile with gcc3.
details: https://anonhg.NetBSD.org/pkgsrc/rev/ab354f1267eb
branches: trunk
changeset: 474686:ab354f1267eb
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon May 03 23:30:00 2004 +0000
description:
Convert to bl3 and make compile with gcc3.
Convert patches to standard format.
diffstat:
www/Mosaic/Makefile | 18 +++++++------
www/Mosaic/distinfo | 15 ++++++-----
www/Mosaic/patches/patch-ab | 26 ++++++++++----------
www/Mosaic/patches/patch-ac | 26 ++++++++++----------
www/Mosaic/patches/patch-ad | 6 ++--
www/Mosaic/patches/patch-ae | 58 ++++++++++++++++----------------------------
www/Mosaic/patches/patch-af | 23 ++++++++++------
www/Mosaic/patches/patch-ah | 32 +++++++++---------------
www/Mosaic/patches/patch-as | 35 +++++++++++++++++++++++++++
9 files changed, 129 insertions(+), 110 deletions(-)
diffs (truncated from 320 to 300 lines):
diff -r 4b30e7740fa7 -r ab354f1267eb www/Mosaic/Makefile
--- a/www/Mosaic/Makefile Mon May 03 23:18:21 2004 +0000
+++ b/www/Mosaic/Makefile Mon May 03 23:30:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/01/20 12:27:57 agc Exp $
+# $NetBSD: Makefile,v 1.40 2004/05/03 23:30:00 wiz Exp $
# FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp
#
@@ -17,7 +17,7 @@
NOT_FOR_PLATFORM= *-*-alpha #LP64 problems
WRKSRC= ${WRKDIR}/Mosaic-src
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_X11BASE= YES
USE_MOTIF12= YES
@@ -26,7 +26,9 @@
CONFIGURE_ARGS+= --with-pngdir=${BUILDLINK_PREFIX.png}
CONFIGURE_ARGS+= --with-zdir=${BUILDLINK_PREFIX.zlib}
-CPPFLAGS+= -Dunix
+CPPFLAGS+= -Dunix -I${LOCALBASE}/LessTif/Motif1.2/include
+LDFLAGS+= -L${LOCALBASE}/LessTif/Motif1.2/lib
+LDFLAGS+= -Wl,-R${LOCALBASE}/LessTif/Motif1.2/lib
post-configure:
@${ECHO} '' >>${WRKSRC}/config.h
@@ -39,9 +41,9 @@
${PREFIX}/lib/X11/app-defaults/Mosaic
${INSTALL_DATA_DIR} ${PREFIX}/share/mosaic
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/motif.buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../mk/motif.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 4b30e7740fa7 -r ab354f1267eb www/Mosaic/distinfo
--- a/www/Mosaic/distinfo Mon May 03 23:18:21 2004 +0000
+++ b/www/Mosaic/distinfo Mon May 03 23:30:00 2004 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.5 2001/08/05 23:45:08 fredb Exp $
+$NetBSD: distinfo,v 1.6 2004/05/03 23:30:00 wiz Exp $
SHA1 (Mosaic-src-2.7b5.tar.gz) = 69705268cf8139ac51f394747e681c1bd8296fee
Size (Mosaic-src-2.7b5.tar.gz) = 980929 bytes
SHA1 (patch-aa) = 487e79e9756942d9ca67738c1676753e6d92b202
-SHA1 (patch-ab) = 3d5f8094fa381ac1bbe935add527a6257e2ee5bb
-SHA1 (patch-ac) = 4de6abbea35325b6a179f0633e2ddee25a9726e4
-SHA1 (patch-ad) = 16e27ae95df0d8a89b752624b0610622e05f76c0
-SHA1 (patch-ae) = 91122a34dbfe9d25b4c9ac0d16405b5801cefdff
-SHA1 (patch-af) = 6f28e5779ab21c4beddfb8f36daa8225ab59e83e
+SHA1 (patch-ab) = 072c393337032c2734562f07a9443dbf84ebab96
+SHA1 (patch-ac) = b87dfef54891950803a9f940ef98147f9a3bbe21
+SHA1 (patch-ad) = b39d04073ca7493fcce22e6dddf450ab8240877a
+SHA1 (patch-ae) = 808c7b715e3f7eacb3080e2c06955f96789ea331
+SHA1 (patch-af) = 95baf170eea4e70ec9a68f53cb7ae1243426dfcb
SHA1 (patch-ag) = b178d56ff81f3a65a565d04f0999defffb61f773
-SHA1 (patch-ah) = ef43ff9b0d72d7ffc6f11a759c4d6dfb3dcc1d67
+SHA1 (patch-ah) = 836b462559295232b553fa2714edf4ce0f5a4bed
SHA1 (patch-ai) = 3e38539760dbebc66d75b6f4f8510972dd739f47
SHA1 (patch-aj) = 5a5c4afe02ed464873f05d5010259652e44ef11d
SHA1 (patch-ak) = d7ddc0e984fb8fdd3272f052d35910f4bb4e276a
@@ -20,3 +20,4 @@
SHA1 (patch-ap) = 4166b3381736fe52db364fa62679a099415cc992
SHA1 (patch-aq) = 019a9c01857209a924002fc30d0f6194d6ad2fc6
SHA1 (patch-ar) = cb5a69ff6e14ae95b59cc3c6352920a405428137
+SHA1 (patch-as) = b87806ef8423f375f2240bb880baa488e26dc6e6
diff -r 4b30e7740fa7 -r ab354f1267eb www/Mosaic/patches/patch-ab
--- a/www/Mosaic/patches/patch-ab Mon May 03 23:18:21 2004 +0000
+++ b/www/Mosaic/patches/patch-ab Mon May 03 23:30:00 2004 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:14:15 agc Exp $
+$NetBSD: patch-ab,v 1.3 2004/05/03 23:30:00 wiz Exp $
-*** libwww2/HTTCP.c.orig Mon Aug 7 17:12:22 1995
---- libwww2/HTTCP.c Mon Aug 7 17:12:28 1995
-***************
-*** 65,71 ****
- extern int errno;
- #endif /* errno */
-
-- extern char *sys_errlist[]; /* see man perror on cernvax */
- extern int sys_nerr;
-
- /* Report Internet Error
---- 65,70 ----
+--- libwww2/HTTCP.c.orig 1996-06-27 02:22:48.000000000 +0200
++++ libwww2/HTTCP.c
+@@ -72,9 +72,6 @@ PRIVATE char *hostname=0; /* The name o
+ extern int errno;
+ #endif /* errno */
+
+-extern char *sys_errlist[]; /* see man perror on cernvax */
+-extern int sys_nerr;
+-
+ /* Report Internet Error
+ ** ---------------------
+ */
diff -r 4b30e7740fa7 -r ab354f1267eb www/Mosaic/patches/patch-ac
--- a/www/Mosaic/patches/patch-ac Mon May 03 23:18:21 2004 +0000
+++ b/www/Mosaic/patches/patch-ac Mon May 03 23:30:00 2004 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:14:16 agc Exp $
+$NetBSD: patch-ac,v 1.3 2004/05/03 23:30:00 wiz Exp $
-*** src/gui-dialogs.c.orig Mon Aug 7 18:23:34 1995
---- src/gui-dialogs.c Mon Aug 7 18:23:46 1995
-***************
-*** 75,81 ****
- /*swp -- for ~ expansion*/
- #include <pwd.h>
- extern int sys_nerr;
-- extern char *sys_errlist[];
- extern int errno;
- #define __MAX_HOME_LEN__ 256
- int pathEval(char *dest, char *src);
---- 75,80 ----
+--- src/gui-dialogs.c.orig 1996-07-18 09:49:41.000000000 +0200
++++ src/gui-dialogs.c
+@@ -87,9 +87,6 @@ extern int is_uncompressed;
+
+ /*swp -- for ~ expansion*/
+ #include <pwd.h>
+-extern int sys_nerr;
+-extern char *sys_errlist[];
+-extern int errno;
+ #define __MAX_HOME_LEN__ 256
+ int pathEval(char *dest, char *src);
+ char *getFileName(char *file_src);
diff -r 4b30e7740fa7 -r ab354f1267eb www/Mosaic/patches/patch-ad
--- a/www/Mosaic/patches/patch-ad Mon May 03 23:18:21 2004 +0000
+++ b/www/Mosaic/patches/patch-ad Mon May 03 23:30:00 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 1998/08/07 11:14:16 agc Exp $
+$NetBSD: patch-ad,v 1.4 2004/05/03 23:30:00 wiz Exp $
---- ./src/xresources.h.org Tue Apr 9 21:41:26 1996
-+++ ./src/xresources.h Tue Apr 9 21:43:12 1996
+--- src/xresources.h.org Tue Apr 9 21:41:26 1996
++++ src/xresources.h Tue Apr 9 21:43:12 1996
@@ -94,7 +94,7 @@
{ "confirmExit", "ConfirmExit", XtRBoolean, sizeof (Boolean),
offset (confirm_exit), XtRString, "True" },
diff -r 4b30e7740fa7 -r ab354f1267eb www/Mosaic/patches/patch-ae
--- a/www/Mosaic/patches/patch-ae Mon May 03 23:18:21 2004 +0000
+++ b/www/Mosaic/patches/patch-ae Mon May 03 23:30:00 2004 +0000
@@ -1,38 +1,22 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:14:17 agc Exp $
+$NetBSD: patch-ae,v 1.3 2004/05/03 23:30:00 wiz Exp $
-*** src/comment.h.bak Fri Jun 7 00:01:43 1996
---- src/comment.h Sat Aug 3 13:58:11 1996
-***************
-*** 67,73 ****
- #ifndef _COMMENT_H
- #define _COMMENT_H
-
-! char *comment_card_html_top= \
- "<title>\n" \
- " Comment Card for Mosaic 2.6\n" \
- "</title>\n" \
---- 67,73 ----
- #ifndef _COMMENT_H
- #define _COMMENT_H
-
-! static char *comment_card_html_top= \
- "<title>\n" \
- " Comment Card for Mosaic 2.6\n" \
- "</title>\n" \
-***************
-*** 103,109 ****
- " <p>\n" \
- "\n";
-
-! char *comment_card_html_bot= \
- " </p>\n" \
- " </li>\n" \
- " <br>\n" \
---- 103,109 ----
- " <p>\n" \
- "\n";
-
-! static char *comment_card_html_bot= \
- " </p>\n" \
- " </li>\n" \
- " <br>\n" \
+--- src/comment.h.orig 1996-06-06 22:01:43.000000000 +0200
++++ src/comment.h
+@@ -67,7 +67,7 @@
+ #ifndef _COMMENT_H
+ #define _COMMENT_H
+
+-char *comment_card_html_top= \
++static char *comment_card_html_top= \
+ "<title>\n" \
+ " Comment Card for Mosaic 2.6\n" \
+ "</title>\n" \
+@@ -103,7 +103,7 @@ char *comment_card_html_top= \
+ " <p>\n" \
+ "\n";
+
+-char *comment_card_html_bot= \
++static char *comment_card_html_bot= \
+ " </p>\n" \
+ " </li>\n" \
+ " <br>\n" \
diff -r 4b30e7740fa7 -r ab354f1267eb www/Mosaic/patches/patch-af
--- a/www/Mosaic/patches/patch-af Mon May 03 23:18:21 2004 +0000
+++ b/www/Mosaic/patches/patch-af Mon May 03 23:30:00 2004 +0000
@@ -1,12 +1,17 @@
-$NetBSD: patch-af,v 1.3 1999/11/27 23:50:25 rh Exp $
+$NetBSD: patch-af,v 1.4 2004/05/03 23:30:00 wiz Exp $
---- libnut/system.c.orig Sun Nov 28 00:47:49 1999
-+++ libnut/system.c Sun Nov 28 00:47:49 1999
-@@ -103,7 +103,6 @@
-
- #ifndef VMS
- extern int sys_nerr;
--extern char *sys_errlist[];
- extern int errno;
+--- libnut/system.c.orig 1996-06-27 03:08:52.000000000 +0200
++++ libnut/system.c
+@@ -101,12 +101,6 @@
+ extern char *strdup(char *str);
#endif
+-#ifndef VMS
+-extern int sys_nerr;
+-extern char *sys_errlist[];
+-extern int errno;
+-#endif
+-
+
+ #ifndef DISABLE_TRACE
+ int nutTrace=0;
diff -r 4b30e7740fa7 -r ab354f1267eb www/Mosaic/patches/patch-ah
--- a/www/Mosaic/patches/patch-ah Mon May 03 23:18:21 2004 +0000
+++ b/www/Mosaic/patches/patch-ah Mon May 03 23:30:00 2004 +0000
@@ -1,21 +1,13 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 11:14:18 agc Exp $
+$NetBSD: patch-ah,v 1.3 2004/05/03 23:30:00 wiz Exp $
-*** src/readJPEG.c.bak Thu Jun 27 02:57:16 1996
---- src/readJPEG.c Sat Aug 3 14:04:36 1996
-***************
-*** 127,133 ****
- fprintf(stderr,"cinfo.actual_number_of_colors=%d\n",cinfo.actual_number_of_colors);
- fprintf(stderr,"colrs[0].red=%d colrs[99].red=%d\n",colrs[0].red,colrs[99].red);
- fprintf(stderr,"cinfo.colormap[0][0]=%d\n",cinfo.colormap[0][0]);
-! {char dummy[80]; fprintf(stderr,"RETURN\n"); gets(dummy);}
- }
- #endif
-
---- 127,133 ----
- fprintf(stderr,"cinfo.actual_number_of_colors=%d\n",cinfo.actual_number_of_colors);
- fprintf(stderr,"colrs[0].red=%d colrs[99].red=%d\n",colrs[0].red,colrs[99].red);
- fprintf(stderr,"cinfo.colormap[0][0]=%d\n",cinfo.colormap[0][0]);
-! {char dummy[80]; fprintf(stderr,"RETURN\n"); fgets(dummy, sizeof(dummy), stdin);}
- }
- #endif
-
+--- src/readJPEG.c.orig 1996-06-27 00:57:16.000000000 +0200
++++ src/readJPEG.c
+@@ -127,7 +127,7 @@ int i;
+ fprintf(stderr,"cinfo.actual_number_of_colors=%d\n",cinfo.actual_number_of_colors);
+ fprintf(stderr,"colrs[0].red=%d colrs[99].red=%d\n",colrs[0].red,colrs[99].red);
+ fprintf(stderr,"cinfo.colormap[0][0]=%d\n",cinfo.colormap[0][0]);
+- {char dummy[80]; fprintf(stderr,"RETURN\n"); gets(dummy);}
++ {char dummy[80]; fprintf(stderr,"RETURN\n"); fgets(dummy, sizeof(dummy), stdin);}
+ }
+ #endif
+
diff -r 4b30e7740fa7 -r ab354f1267eb www/Mosaic/patches/patch-as
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/Mosaic/patches/patch-as Mon May 03 23:30:00 2004 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-as,v 1.1 2004/05/03 23:30:00 wiz Exp $
+
+--- libhtmlw/HTML-PSformat.c.orig 1996-06-27 01:36:53.000000000 +0200
++++ libhtmlw/HTML-PSformat.c
+@@ -59,9 +59,9 @@
+ *
+ */
+ #include "../config.h"
+-#include <varargs.h>
+
+ #include <string.h>
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <math.h>
Home |
Main Index |
Thread Index |
Old Index