Date: Mon, 4 Jun 2001 16:00:20 -0700 (PDT) From: Konstantinos Konstantinidis <kkonstan@duth.gr> To: freebsd-ports@FreeBSD.org Subject: Re: ports/25351: x11/colorsel fails to build Message-ID: <200106042300.f54N0Kj24209@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/25351; it has been noted by GNATS. From: Konstantinos Konstantinidis <kkonstan@duth.gr> To: freebsd-gnats-submit@FreeBSD.org, abgoeree@uwnet.nl, freebsd-ports@FreeBSD.org Cc: DougB@DougBarton.net Subject: Re: ports/25351: x11/colorsel fails to build Date: Tue, 05 Jun 2001 01:54:27 +0300 This is a multi-part message in MIME format. --------------ACDF56946E79B6F92D3BC860 Content-Type: text/plain; charset=iso-8859-7 Content-Transfer-Encoding: 7bit Attached patch fixes the port (for me at least :) It also sets maintainer from ports@FreeBSD.org to me. --kkonstan --------------ACDF56946E79B6F92D3BC860 Content-Type: text/plain; charset=iso-8859-7; name="xcolorsel.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xcolorsel.patch" diff -ruN xcolorsel.orig/Makefile xcolorsel/Makefile --- xcolorsel.orig/Makefile Tue Jun 5 00:38:06 2001 +++ xcolorsel/Makefile Tue Jun 5 01:47:38 2001 @@ -5,23 +5,22 @@ # $FreeBSD: ports/x11/xcolorsel/Makefile,v 1.5 2001/05/01 10:27:59 mharo Exp $ # -PORTNAME= xcolorsel -PORTVERSION= 1.1a -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XCONTRIB} +PORTNAME= xcolorsel +PORTVERSION= 1.1a +PORTREVISION= 1 +CATEGORIES= x11 +MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= utilities -DISTNAME= ${PKGNAME}-src +DISTNAME= ${PORTNAME}-${PORTVERSION}-src -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kkonstan@daemon.gr -BROKEN= This port is broken and needs a new maintainer +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d WRKSRC= $(WRKDIR)/xcolorsel MANCOMPRESSED= yes USE_IMAKE= yes - -PATCH_STRIP= -p1 -PATCH_DEBUG= true +USE_XPM= yes .include <bsd.port.mk> diff -ruN xcolorsel.orig/files/patch-Imakefile xcolorsel/files/patch-Imakefile --- xcolorsel.orig/files/patch-Imakefile Thu Jan 1 02:00:00 1970 +++ xcolorsel/files/patch-Imakefile Tue Jun 5 01:43:41 2001 @@ -0,0 +1,23 @@ +--- Imakefile.orig Tue Dec 13 22:31:19 1994 ++++ Imakefile Tue Jun 5 01:41:58 2001 +@@ -71,7 +71,7 @@ + all:: Xcolorsel.help + install:: Xcolorsel.help + +-NormalProgramTarget(xcolorsel,$(OBJS),,XawClientLibs,) ++NormalProgramTarget(xcolorsel,$(OBJS),,-lXaw3d $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB),) + + InstallProgram(xcolorsel,$(BINDIR)) + InstallManPage(xcolorsel,$(MANDIR)) +@@ -82,9 +82,9 @@ + DependTarget() + + appdef-c.h: Xcolorsel-color.ad +- app2head Xcolorsel-color.ad > appdef-c.h ++ ./app2head Xcolorsel-color.ad > appdef-c.h + appdef.h: Xcolorsel.ad +- app2head Xcolorsel.ad > appdef.h ++ ./app2head Xcolorsel.ad > appdef.h + purge: + $(RM) xcolorsel *.o appdef.h appdef-c.h Xcolorsel.help *.tar.Z Makefile Makefile.bak makefile *.tar *.tar.gz + Xcolorsel.help: xcolorsel.man diff -ruN xcolorsel.orig/files/patch-RgbSink.h xcolorsel/files/patch-RgbSink.h --- xcolorsel.orig/files/patch-RgbSink.h Thu Jan 1 02:00:00 1970 +++ xcolorsel/files/patch-RgbSink.h Tue Jun 5 01:36:09 2001 @@ -0,0 +1,11 @@ +--- RgbSink.h.orig Mon Nov 14 00:14:23 1994 ++++ RgbSink.h Tue Jun 5 01:35:35 2001 +@@ -85,7 +85,7 @@ + /*The Parent:*/ + #include "RgbText.h" + /* The superclass: */ +-#include <X11/Xaw/AsciiSink.h> ++#include <X11/Xaw3d/AsciiSink.h> + + /**************************************************************** + * diff -ruN xcolorsel.orig/files/patch-RgbSinkP.h xcolorsel/files/patch-RgbSinkP.h --- xcolorsel.orig/files/patch-RgbSinkP.h Thu Jan 1 02:00:00 1970 +++ xcolorsel/files/patch-RgbSinkP.h Tue Jun 5 01:36:09 2001 @@ -0,0 +1,11 @@ +--- RgbSinkP.h.orig Mon Nov 14 00:14:27 1994 ++++ RgbSinkP.h Tue Jun 5 01:35:35 2001 +@@ -85,7 +85,7 @@ + #include "RgbSink.h" + #include "config.h" + /* include superclass private header file */ +-#include <X11/Xaw/AsciiSinkP.h> ++#include <X11/Xaw3d/AsciiSinkP.h> + /* This is closely related to and uses parts of: */ + #include "RgbTextP.h" + diff -ruN xcolorsel.orig/files/patch-RgbSrc.c xcolorsel/files/patch-RgbSrc.c --- xcolorsel.orig/files/patch-RgbSrc.c Thu Jan 1 02:00:00 1970 +++ xcolorsel/files/patch-RgbSrc.c Tue Jun 5 01:36:09 2001 @@ -0,0 +1,11 @@ +--- RgbSrc.c.orig Mon Nov 14 00:14:31 1994 ++++ RgbSrc.c Tue Jun 5 01:35:35 2001 +@@ -134,7 +134,7 @@ + { /* text_src fields */ + /* Read */ XtInheritRead, + /* Replace */ XtInheritReplace, +- /* Scan */ (_XawTextPositionFunc)myscan, ++ /* Scan */ (_XawTextPositionFunc) myscan, + /* Search */ XtInheritSearch, + /* SetSelection */ XtInheritSetSelection, + /* ConvertSelection */ XtInheritConvertSelection, diff -ruN xcolorsel.orig/files/patch-RgbSrc.h xcolorsel/files/patch-RgbSrc.h --- xcolorsel.orig/files/patch-RgbSrc.h Thu Jan 1 02:00:00 1970 +++ xcolorsel/files/patch-RgbSrc.h Tue Jun 5 01:36:09 2001 @@ -0,0 +1,11 @@ +--- RgbSrc.h.orig Mon Nov 14 00:14:35 1994 ++++ RgbSrc.h Tue Jun 5 01:35:35 2001 +@@ -84,7 +84,7 @@ + /*The Parent:*/ + #include "RgbText.h" + /* The superclass: */ +-#include <X11/Xaw/AsciiSrc.h> ++#include <X11/Xaw3d/AsciiSrc.h> + + /**************************************************************** + * diff -ruN xcolorsel.orig/files/patch-RgbSrcP.h xcolorsel/files/patch-RgbSrcP.h --- xcolorsel.orig/files/patch-RgbSrcP.h Thu Jan 1 02:00:00 1970 +++ xcolorsel/files/patch-RgbSrcP.h Tue Jun 5 01:36:09 2001 @@ -0,0 +1,11 @@ +--- RgbSrcP.h.orig Mon Nov 14 00:14:42 1994 ++++ RgbSrcP.h Tue Jun 5 01:35:35 2001 +@@ -85,7 +85,7 @@ + #include "config.h" + + /* include superclass private header file */ +-#include <X11/Xaw/AsciiSrcP.h> ++#include <X11/Xaw3d/AsciiSrcP.h> + /* This is closely related to and uses parts of: */ + #include "RgbTextP.h" + diff -ruN xcolorsel.orig/files/patch-RgbText.c xcolorsel/files/patch-RgbText.c --- xcolorsel.orig/files/patch-RgbText.c Thu Jan 1 02:00:00 1970 +++ xcolorsel/files/patch-RgbText.c Tue Jun 5 01:36:09 2001 @@ -0,0 +1,16 @@ +--- RgbText.c.orig Wed Dec 14 00:13:27 1994 ++++ RgbText.c Tue Jun 5 01:35:35 2001 +@@ -78,12 +78,11 @@ + #include <stdlib.h> + /* And here we have a special gift for all SUN's outside >;-> */ + #include <unistd.h> +-#include <malloc.h> + #include <ctype.h> + #include <errno.h> + #include <X11/IntrinsicP.h> + #include <X11/StringDefs.h> +-#include <X11/Xaw/Paned.h> ++#include <X11/Xaw3d/Paned.h> + #include "RgbTextP.h" + #include "RgbSinkP.h" + #include "RgbSrc.h" diff -ruN xcolorsel.orig/files/patch-RgbText.h xcolorsel/files/patch-RgbText.h --- xcolorsel.orig/files/patch-RgbText.h Thu Jan 1 02:00:00 1970 +++ xcolorsel/files/patch-RgbText.h Tue Jun 5 01:36:09 2001 @@ -0,0 +1,11 @@ +--- RgbText.h.orig Mon Nov 14 00:14:49 1994 ++++ RgbText.h Tue Jun 5 01:35:35 2001 +@@ -133,7 +133,7 @@ + #ifndef _RgbText_h + #define _RgbText_h + +-#include <X11/Xaw/AsciiText.h> ++#include <X11/Xaw3d/AsciiText.h> + + #define XtNmaxRows "maxRows" + #define XtNrows "rows" diff -ruN xcolorsel.orig/files/patch-RgbTextP.h xcolorsel/files/patch-RgbTextP.h --- xcolorsel.orig/files/patch-RgbTextP.h Thu Jan 1 02:00:00 1970 +++ xcolorsel/files/patch-RgbTextP.h Tue Jun 5 01:36:09 2001 @@ -0,0 +1,11 @@ +--- RgbTextP.h.orig Wed Nov 16 22:27:10 1994 ++++ RgbTextP.h Tue Jun 5 01:35:35 2001 +@@ -78,7 +78,7 @@ + #include "RgbText.h" + #include "config.h" + +-#include <X11/Xaw/TextP.h> ++#include <X11/Xaw3d/TextP.h> + #include <X11/Xcms.h> + + typedef struct _colordef { unsigned short red, green, blue; /*Theoretic RGB*/ diff -ruN xcolorsel.orig/files/patch-Xcolorsel.ad xcolorsel/files/patch-Xcolorsel.ad --- xcolorsel.orig/files/patch-Xcolorsel.ad Thu Jan 1 02:00:00 1970 +++ xcolorsel/files/patch-Xcolorsel.ad Tue Jun 5 01:36:09 2001 @@ -0,0 +1,9 @@ +--- Xcolorsel.ad.orig Mon Nov 14 00:08:36 1994 ++++ Xcolorsel.ad Tue Jun 5 01:35:36 2001 +@@ -71,3 +71,6 @@ + + ! You can set an explicit helpfile location here ("" switches this off) + !*.helpFile: "" ++ ++! Set the location of the rgb.txt file for FreeBSD ++*.file: /usr/X11R6/lib/X11/rgb.txt diff -ruN xcolorsel.orig/files/patch-aa xcolorsel/files/patch-aa --- xcolorsel.orig/files/patch-aa Tue Jun 5 00:38:06 2001 +++ xcolorsel/files/patch-aa Thu Jan 1 02:00:00 1970 @@ -1,25 +0,0 @@ -diff -ruN ./Imakefile ../xcolorsel/Imakefile ---- ./Imakefile Wed Dec 14 05:31:19 1994 -+++ ../xcolorsel/Imakefile Sat Dec 12 00:52:04 1998 -@@ -82,9 +82,9 @@ - DependTarget() - - appdef-c.h: Xcolorsel-color.ad -- app2head Xcolorsel-color.ad > appdef-c.h -+ ./app2head Xcolorsel-color.ad > appdef-c.h - appdef.h: Xcolorsel.ad -- app2head Xcolorsel.ad > appdef.h -+ ./app2head Xcolorsel.ad > appdef.h - purge: - $(RM) xcolorsel *.o appdef.h appdef-c.h Xcolorsel.help *.tar.Z Makefile Makefile.bak makefile *.tar *.tar.gz - Xcolorsel.help: xcolorsel.man -diff -ruN ./Xcolorsel.ad ../xcolorsel/Xcolorsel.ad ---- ./Xcolorsel.ad Mon Nov 14 07:08:36 1994 -+++ ../xcolorsel/Xcolorsel.ad Sat Dec 12 00:52:04 1998 -@@ -71,3 +71,6 @@ - - ! You can set an explicit helpfile location here ("" switches this off) - !*.helpFile: "" -+ -+! Set the location of the rgb.txt file for FreeBSD -+*.file: /usr/X11R6/lib/X11/rgb.txt diff -ruN xcolorsel.orig/files/patch-xcolorsel.c xcolorsel/files/patch-xcolorsel.c --- xcolorsel.orig/files/patch-xcolorsel.c Thu Jan 1 02:00:00 1970 +++ xcolorsel/files/patch-xcolorsel.c Tue Jun 5 01:36:09 2001 @@ -0,0 +1,45 @@ +--- xcolorsel.c.orig Mon Nov 14 00:16:59 1994 ++++ xcolorsel.c Tue Jun 5 01:35:36 2001 +@@ -53,23 +53,22 @@ + #include <unistd.h> + #include <string.h> + #include <errno.h> +-#include <malloc.h> + #include <fcntl.h> + + #include <X11/Xlib.h> + #include <X11/Intrinsic.h> + #include <X11/Shell.h> + #include <X11/StringDefs.h> +-#include <X11/Xaw/Box.h> +-#include <X11/Xaw/Paned.h> +-#include <X11/Xaw/Form.h> +-#include <X11/Xaw/Label.h> +-#include <X11/Xaw/Command.h> +-#include <X11/Xaw/MenuButton.h> +-#include <X11/Xaw/Toggle.h> +-#include <X11/Xaw/SimpleMenu.h> +-#include <X11/Xaw/SmeBSB.h> +-#include <X11/Xaw/AsciiText.h> ++#include <X11/Xaw3d/Box.h> ++#include <X11/Xaw3d/Paned.h> ++#include <X11/Xaw3d/Form.h> ++#include <X11/Xaw3d/Label.h> ++#include <X11/Xaw3d/Command.h> ++#include <X11/Xaw3d/MenuButton.h> ++#include <X11/Xaw3d/Toggle.h> ++#include <X11/Xaw3d/SimpleMenu.h> ++#include <X11/Xaw3d/SmeBSB.h> ++#include <X11/Xaw3d/AsciiText.h> + + #include "config.h" + #include "RgbText.h" +@@ -253,7 +252,7 @@ + + String translations="<Message>WM_PROTOCOLS: wm_protocols()"; + +-void main(int argc,char *argv[]) ++int main(int argc,char *argv[]) + { + size_t i; + register char *(*ptr); --------------ACDF56946E79B6F92D3BC860-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200106042300.f54N0Kj24209>