Date: Mon, 24 Nov 1997 12:30:01 -0800 (PST)
From: bgingery@gtcs.com
To: freebsd-ports
Subject: ports/4248 moved ${MASTER_SITES}, update in version
Message-ID: <199711242030.MAA02459@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/4248; it has been noted by GNATS.
From: bgingery@gtcs.com
To: FreeBSD-gnats-submit@freebsd.org
Cc: Bill Fenner <fenner@freebsd.org>
Subject: ports/4248 moved ${MASTER_SITES}, update in version
Date: Mon, 24 Nov 1997 13:25:47 -0700 (MST)
>Submitter-Id: current-users
>Originator: Bruce Gingery <bgingery@gtcs.com>
>Organization: Advanced Integrators, LC
>Confidential: no
>Synopsis: ports/4248 moved ${MASTER_SITES}, update in version
>Severity: non-critical
>Priority: medium
>Category: ports
>Release: FreeBSD 2.2.1-RELEASE i386
>Class: change-request
>Environment:
FreeBSD
>Description:
MASTER_SITES subdirectory changed, breaking earlier port.
While correcting this, I've moved it to the latest release,
which is v2.0a11 (original port submission was v2.0a2),
and portlint'ed it.
Since this is still in alpha, and v1.65 has been upgraded
to v1.70, someone else would like to do that one, but I
really don't see the reason, unless someone needs a pre-
Wilbur spec HTML browser, deliberately. From what I can
see, this alpha version is at least as stable as v1.65.
>How-To-Repeat:
N/A
>Fix:
Patch to port tarball follows...
FreeBSD patches above "patch-ac" deleted. No files added to port.
==========[ Begin tarball patch ]===============
diff -uNr chimera2/Makefile chimera-2.0a11/Makefile
--- chimera2/Makefile Thu Aug 7 04:52:52 1997
+++ chimera-2.0a11/Makefile Mon Nov 24 11:35:44 1997
@@ -1,25 +1,27 @@
# New ports collection makefile for: chimera
-# Version required: 2.0a2
-# Date created:
+# Version required: 2.0a11
+# Date created: 24 Nov 1997
# Whom: Bruce Gingery <bgingery@gtcs.com>
#
# $Id: Exp $
#
-DISTNAME= chimera-2.0a2
-PKGNAME= chimera-2.0a2
+DISTNAME= chimera-2.0a11
CATEGORIES= www x11
-MASTER_SITES= ftp://ftp.cs.unlv.edu/pub/chimera/
+MASTER_SITES= ftp://ftp.cs.unlv.edu/pub/chimera-alpha/
-LIB_DEPENDS= jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
- png\\.0\\.:${PORTSDIR}/graphics/png
+MAINTAINER= bgingery@gtcs.com
-USE_IMAKE= yes
+#LIB_DEPENDS= jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
+# png\\.0\\.:${PORTSDIR}/graphics/png
+# I'm pretty sure that both dependencies have been removed.
+# Previous versions depended on libjpeg and libpng
-#MAINTAINER=
+USE_IMAKE= yes
post-patch:
- mv ${WRKSRC}/Common.tmpl.dist ${WRKSRC}/Common.tmpl
- cp ${FILESDIR}/protopng.h ${WRKSRC}/image/
+ ${MV} ${WRKSRC}/Common.tmpl.dist ${WRKSRC}/Common.tmpl
+ ${CP} ${FILESDIR}/protopng.h ${WRKSRC}/image/
+ ln -s ${WRKSRC}/chimera ${WRKSRC}/main
.include <bsd.port.mk>
diff -uNr chimera2/files/md5 chimera-2.0a11/files/md5
--- chimera2/files/md5 Thu Aug 7 00:47:21 1997
+++ chimera-2.0a11/files/md5 Mon Nov 24 10:30:31 1997
@@ -1 +1 @@
-MD5 (chimera-2.0a2.tar.gz) = 4366a7c3cd52e61f2f6bd0a31f2adad9
+MD5 (chimera-2.0a11.tar.gz) = c422accc01edcf2be5dfcea6df42f0cc
diff -uNr chimera2/patches/patch-aa chimera-2.0a11/patches/patch-aa
--- chimera2/patches/patch-aa Thu Aug 7 06:39:01 1997
+++ chimera-2.0a11/patches/patch-aa Mon Nov 24 10:36:32 1997
@@ -1,70 +1,50 @@
-*** Common.tmpl.dist Mon May 19 20:43:17 1997
---- Common.tmpl Thu Aug 7 06:38:01 1997
+*** Imakefile.orig Sun Aug 17 23:18:18 1997
+--- Imakefile Mon Nov 24 10:34:00 1997
***************
-*** 10,18 ****
- * CHIMERA_MANDIR - directory to hold the outdated man page.
- */
- /*
-! CHIMERA_PREFIX = /usr/local
- CHIMERA_BINDIR = $(CHIMERA_PREFIX)/bin
-! CHIMERA_LIBDIR = $(CHIMERA_PREFIX)/lib/chimera
- CHIMERA_MANDIR = $(CHIMERA_PREFIX)/man
- */
-
---- 10,18 ----
- * CHIMERA_MANDIR - directory to hold the outdated man page.
- */
- /*
-! CHIMERA_PREFIX = /usr/X11R6
- CHIMERA_BINDIR = $(CHIMERA_PREFIX)/bin
-! CHIMERA_LIBDIR = $(CHIMERA_PREFIX)/lib/X11/chimera
- CHIMERA_MANDIR = $(CHIMERA_PREFIX)/man
- */
+*** 4,10 ****
+ #if HasGcc
+ #ifdef CDebugging
+! #define PassCDebugFlags "CDEBUGFLAGS=-g -Wall"
+ #else
+ #define PassCDebugFlags "CDEBUGFLAGS=-O -Wall"
+ #endif
+--- 4,10 ----
+
+ #if HasGcc
+ #ifdef CDebugging
+! #define PassCDebugFlags "CDEBUGFLAGS=-g -Wall ${CFLAGS}"
+ #else
+ #define PassCDebugFlags "CDEBUGFLAGS=-O -Wall"
+ #endif
***************
-*** 33,54 ****
- */
+*** 19,32 ****
+ SUBDIRS = port common image html plain proto mxw chimera
- /* Uncomment and modify if you have the JPEG 6 library */
-! /*
- #define Use_JPEG
- JPEGDIR = /usr/local
- JPEGINCLUDE = -I$(JPEGDIR)/include
- JPEGLIB = -L$(JPEGDIR)/lib -ljpeg$(IMGLEXT)
- JPEGDEPLIB = $(JPEGDIR)/lib/libjpeg$(IMGLEXT).a
-! */
-
- /* Uncomment and modify if you have the PNG library */
-! /*
- #define Use_PNG
- PNGDIR = /usr/local
- PNGINCLUDE = -I$(PNGDIR)/include
- PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT)
- PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a $(PNGDIR)/lib/libz$(IMGLEXT).a
-! */
-
- /*
- * Uncomment if you need GNU rx. Not actually used right now.
---- 33,54 ----
- */
-
- /* Uncomment and modify if you have the JPEG 6 library */
-!
- #define Use_JPEG
- JPEGDIR = /usr/local
- JPEGINCLUDE = -I$(JPEGDIR)/include
- JPEGLIB = -L$(JPEGDIR)/lib -ljpeg$(IMGLEXT)
- JPEGDEPLIB = $(JPEGDIR)/lib/libjpeg$(IMGLEXT).a
-!
-
- /* Uncomment and modify if you have the PNG library */
-!
- #define Use_PNG
- PNGDIR = /usr/local
- PNGINCLUDE = -I$(PNGDIR)/include
- PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT)
- PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a $(PNGDIR)/lib/libz$(IMGLEXT).a
-!
-
- /*
- * Uncomment if you need GNU rx. Not actually used right now.
+ MakeSubdirs($(SUBDIRS))
+! InstallSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
+ CleanSubdirs($(SUBDIRS))
+ MakefileSubdirs($(SUBDIRS))
+! InstallManSubdirs($(SUBDIRS))
+
+ myclean: clean
+ $(RM) Common.tmpl Makefile Makefile.bak make.err make.out .depend
+! for i in $(SUBDIRS); do \
+ $(RM) $$i/Makefile $$i/Makefile.bak $$i/.depend; \
+ done
+--- 19,32 ----
+ SUBDIRS = port common image html plain proto mxw chimera
+
+ MakeSubdirs($(SUBDIRS))
+! InstallSubdirs(main)
+ DependSubdirs($(SUBDIRS))
+ CleanSubdirs($(SUBDIRS))
+ MakefileSubdirs($(SUBDIRS))
+! InstallManSubdirs(main)
+
+ myclean: clean
+ $(RM) Common.tmpl Makefile Makefile.bak make.err make.out .depend
+! for i in $(SUBDIRS) $(SOSUBDIRS); do \
+ $(RM) $$i/Makefile $$i/Makefile.bak $$i/.depend; \
+ done
diff -uNr chimera2/patches/patch-ac chimera-2.0a11/patches/patch-ac
--- chimera2/patches/patch-ac Thu Aug 7 01:36:10 1997
+++ chimera-2.0a11/patches/patch-ac Thu Aug 7 01:57:30 1997
@@ -1,19 +1,12 @@
-*** common/uproc.c.orig Fri Feb 28 19:49:55 1997
---- common/uproc.c Thu Aug 7 01:35:55 1997
+*** image/image.c.orig Fri Mar 7 22:52:04 1997
+--- image/image.c Thu Aug 7 01:56:59 1997
***************
-*** 43,49 ****
- do
- {
- errno = 0;
-! pid = wait3(&st, WNOHANG, 0);
- }
- while (pid <= 0 && errno == EINTR);
- #else
---- 43,49 ----
- do
- {
- errno = 0;
-! pid = wait3((int *)&st, WNOHANG, (struct rusage *)0);
- }
- while (pid <= 0 && errno == EINTR);
- #else
+*** 33,38 ****
+--- 33,39 ----
+ #include "image_endian.h"
+ #include "imagep.h"
+ #include "image_format.h"
++ #include "protopng.h"
+
+ #include "WWW.h"
+
diff -uNr chimera2/patches/patch-ad chimera-2.0a11/patches/patch-ad
--- chimera2/patches/patch-ad Thu Aug 7 01:57:30 1997
+++ chimera-2.0a11/patches/patch-ad Wed Dec 31 17:00:00 1969
@@ -1,12 +0,0 @@
-*** image/image.c.orig Fri Mar 7 22:52:04 1997
---- image/image.c Thu Aug 7 01:56:59 1997
-***************
-*** 33,38 ****
---- 33,39 ----
- #include "image_endian.h"
- #include "imagep.h"
- #include "image_format.h"
-+ #include "protopng.h"
-
- #include "WWW.h"
-
diff -uNr chimera2/patches/patch-ae chimera-2.0a11/patches/patch-ae
--- chimera2/patches/patch-ae Thu Aug 7 04:52:19 1997
+++ chimera-2.0a11/patches/patch-ae Wed Dec 31 17:00:00 1969
@@ -1,50 +0,0 @@
-*** Imakefile.orig Sat Feb 8 20:34:56 1997
---- Imakefile Thu Aug 7 04:51:28 1997
-***************
-*** 3,9 ****
- #define IHaveSubDirs
- #ifdef CDebugging
- #if HasGcc
-! #define PassCDebugFlags 'CDEBUGFLAGS=-g -Wall'
- #else
- #ifdef AlphaArchitecture
- #define PassCDebugFlags 'CDEBUGFLAGS=-g -std1'
---- 3,9 ----
- #define IHaveSubDirs
- #ifdef CDebugging
- #if HasGcc
-! #define PassCDebugFlags 'CDEBUGFLAGS=-g -O -Wall -m486'
- #else
- #ifdef AlphaArchitecture
- #define PassCDebugFlags 'CDEBUGFLAGS=-g -std1'
-***************
-*** 26,39 ****
- SUBDIRS = common www image html plain proto mxw main
-
- MakeSubdirs($(SUBDIRS))
-! InstallSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
- CleanSubdirs($(SUBDIRS))
- MakefileSubdirs($(SUBDIRS))
-! InstallManSubdirs($(SUBDIRS))
-
- myclean: clean
- $(RM) Common.tmpl Makefile Makefile.bak make.err make.out .depend
-! for i in $(SUBDIRS); do \
- $(RM) $$i/Makefile $$i/Makefile.bak $$i/.depend; \
- done
---- 26,39 ----
- SUBDIRS = common www image html plain proto mxw main
-
- MakeSubdirs($(SUBDIRS))
-! InstallSubdirs(main)
- DependSubdirs($(SUBDIRS))
- CleanSubdirs($(SUBDIRS))
- MakefileSubdirs($(SUBDIRS))
-! InstallManSubdirs(main)
-
- myclean: clean
- $(RM) Common.tmpl Makefile Makefile.bak make.err make.out .depend
-! for i in $(SUBDIRS) $(SOSUBDIRS); do \
- $(RM) $$i/Makefile $$i/Makefile.bak $$i/.depend; \
- done
diff -uNr chimera2/patches/patch-af chimera-2.0a11/patches/patch-af
--- chimera2/patches/patch-af Thu Aug 7 06:51:55 1997
+++ chimera-2.0a11/patches/patch-af Wed Dec 31 17:00:00 1969
@@ -1,19 +0,0 @@
-*** main/Imakefile.orig Fri Mar 7 04:50:04 1997
---- main/Imakefile Thu Aug 7 06:51:27 1997
-***************
-*** 15,21 ****
-
- NormalProgramTarget(chimera, $(OBJS), $(CHIMERA_DEPLIBS), MyNull, MyNull)
-
-! InstallProgram(chimera,$(CHIMERA_BINDIR))
-! InstallManPage(chimera,$(CHIMERA_MANDIR))
-
- DependTarget()
---- 15,21 ----
-
- NormalProgramTarget(chimera, $(OBJS), $(CHIMERA_DEPLIBS), MyNull, MyNull)
-
-! InstallProgram(chimera,$(BINDIR))
-! InstallManPage(chimera,$(MANDIR))
-
- DependTarget()
diff -uNr chimera2/pkg/COMMENT chimera-2.0a11/pkg/COMMENT
--- chimera2/pkg/COMMENT Thu Aug 7 01:12:23 1997
+++ chimera-2.0a11/pkg/COMMENT Mon Nov 24 11:30:34 1997
@@ -1 +1 @@
-X/Athena World-Wide Web client - Wilbur compliant
+X/Athena World-Wide Web client - Wilbur (HTML3.2) compliant
diff -uNr chimera2/pkg/DESCR chimera-2.0a11/pkg/DESCR
--- chimera2/pkg/DESCR Thu Aug 7 02:19:21 1997
+++ chimera-2.0a11/pkg/DESCR Mon Nov 24 12:07:16 1997
@@ -3,13 +3,21 @@
graphical interface using the X Window System and the Athena Widgets.
While it does NOT do Frames, Java, JavaScript, or even embedded Tcl
-(yet at least), it *is* ``Wilbur'' (HTML v3.2) compliant. This is
-an alpha version - so don't be surprised if something doesn't properly
-work (e.g. bookmarks?). OTOH, it *does* do tables and forms, and
-multiple windows.
+(yet at least), it *is* designed to be ``Wilbur'' (HTML v3.2) compliant,
+and handles .gif, .jpg and quite a number of other image formats
+internally. Yet image handling is a little odd, as compared to other
+browsers. Each image is *often* surrounded by scrollbars, rather than
+being resized to a specified size. Hence it makes a good visual tool
+for proper sizing information.
+
+THIS IS AN ALPHA VERSION - so don't be surprised if something doesn't
+properly work OTOH, it *does* do tables and forms, and multiple windows.
Unlike version 1.65 previously distributed, it is an all-in-one binary
and depends upon X- resources settings for configuration. It may
be touchy about interrupted image fetches, or other things, as well.
+Each user is expected to create a ~/.chimera subdirectory for
+bookmarks and personal preferences, and a ~/.chimera/cache (which may
+be a symlink to somewhere else).
-This is version 2.0 alpha 2 - essentially a complete rewrite
+Ref: <URL: http://www.unlv.edu/chimera/two/ >
================[ end Tarball patch ]========================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199711242030.MAA02459>