summaryrefslogtreecommitdiff
path: root/graphics/xfig/patches
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/xfig/patches')
-rw-r--r--graphics/xfig/patches/patch-ab77
-rw-r--r--graphics/xfig/patches/patch-ac14
-rw-r--r--graphics/xfig/patches/patch-ad42
3 files changed, 71 insertions, 62 deletions
diff --git a/graphics/xfig/patches/patch-ab b/graphics/xfig/patches/patch-ab
index 027e3c98366..c8c96225785 100644
--- a/graphics/xfig/patches/patch-ab
+++ b/graphics/xfig/patches/patch-ab
@@ -1,24 +1,48 @@
-$NetBSD: patch-ab,v 1.10 2005/02/18 15:56:18 wiz Exp $
+$NetBSD: patch-ab,v 1.11 2005/11/12 16:08:21 itohy Exp $
---- Imakefile.orig 2005-02-18 16:32:46.000000000 +0100
-+++ Imakefile
-@@ -44,12 +44,13 @@ XCOMM purpose of DESTDIR is to test an i
- XCOMM BINDIR = /usr/bin/X11
- XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier
+--- Imakefile.orig Tue Apr 27 05:24:41 2004
++++ Imakefile Sat Nov 12 19:58:54 2005
+@@ -45,6 +45,7 @@
+ XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
+
XCOMM XAPPLOADDIR = /home/user/xfig
-+ XAPPLOADDIR = $(LIBDIR)/app-defaults
++ XAPPLOADDIR = $(LIBDIR)/app-defaults
+
+ XCOMM Uncomment the following definition for XAW3D if you want to use
+ XCOMM the 3d Athena Widget Set (highly recommended!)
+@@ -58,21 +59,24 @@
- XCOMM Redefine the following if your PNG library and/or include file
+ #ifdef XAW3D1_5E
+ DUSEXAW3D = -DXAW3D -DXAW3D1_5E
+- XAWLIB = -lXaw3d15e
++ XAWLIB = -lXaw3d
+ #else
+- XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
+- XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
+ # ifdef XAW3D
+- DUSEXAW3D = -DXAW3D
+- XAWLIB = -lXaw3d
++ DUSEXAW3D = -DXAW3D
++ XAWLIB = -lXaw3d
++ XAW_SRC = SmeCascade.c
++ XAW_OBJ = SmeCascade.o
++# else
++ XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
++ XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
+ # endif /* XAW3D */
+ #endif /* XAW3D1_5E */
+
+ XCOMM Redefine the following if your PNG library, zlib library and/or include file
XCOMM are in different places
-PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/local/include
+PNGLIBDIR = $(LOCALBASE)/lib
+PNGINC = -I$(LOCALBASE)/include
+ ZLIBDIR = $(USRLIBDIR)
XCOMM If don't want JPEG support, comment out the #define USEJPEG line
- XCOMM Uncomment the #define for USEJPEG if you want to be able to import
-@@ -68,8 +69,8 @@ XCOMM You must have version 5b or newer
+@@ -92,8 +96,8 @@
#ifdef USEJPEG
#ifdef USEINSTALLEDJPEG
@@ -29,14 +53,8 @@ $NetBSD: patch-ab,v 1.10 2005/02/18 15:56:18 wiz Exp $
#else
JPEGLIBDIR = ../jpeg
JPEGINC = -I$(JPEGLIBDIR)
-@@ -87,12 +88,12 @@ XCOMM in /contrib/libraries.
- XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
- XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
-
--XCOMM #define USEXPM
--XCOMM #define USEXPM_ICON
-+#define USEXPM
-+#define USEXPM_ICON
+@@ -115,8 +119,8 @@
+ #define USEXPM_ICON
#ifdef USEXPM
-XPMLIBDIR = $(USRLIBDIR)
@@ -46,16 +64,7 @@ $NetBSD: patch-ab,v 1.10 2005/02/18 15:56:18 wiz Exp $
#endif
XCOMM Uncomment the following definiton if you want to use the small icons
-@@ -108,7 +109,7 @@ XCOMM 3D Athena widget headers are locat
- XCOMM #define XAW3D
-
- #ifdef XAW3D
--XAW3DINC = -I/usr/include/X11/Xaw3d
-+XAW3DINC = -I$(LOCALBASE)/include/X11/Xaw3d
- DUSEXAW3D = -DXAW3D
- XAWLIB = -lXaw3d
- #else
-@@ -157,7 +158,7 @@ XCOMM uncomment the following line if yo
+@@ -157,7 +161,7 @@
XCOMM inline functions. With the "INLINE" keyword, you should notice that
XCOMM the display will be a bit faster in complex figures
@@ -64,7 +73,7 @@ $NetBSD: patch-ab,v 1.10 2005/02/18 15:56:18 wiz Exp $
XCOMM use (and change) the following if you want the multi-key data base file
XCOMM somewhere other than the standard X11 library directory
-@@ -169,7 +170,7 @@ XFIGLIBDIR = $(LIBDIR)/xfig
+@@ -169,7 +173,7 @@
XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
@@ -73,7 +82,7 @@ $NetBSD: patch-ab,v 1.10 2005/02/18 15:56:18 wiz Exp $
XCOMM MANDIR tells where the standard man pages should go (no need to change it
XCOMM if you want the man pages installed in the standard place on your system
-@@ -227,7 +228,7 @@ XCOMM **********************************
+@@ -229,7 +233,7 @@
#ifdef USEJPEG
#ifdef USEINSTALLEDJPEG
@@ -82,16 +91,16 @@ $NetBSD: patch-ab,v 1.10 2005/02/18 15:56:18 wiz Exp $
#else
JPEGCONF = configure
JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
-@@ -264,7 +265,7 @@ InstallManPageLong(file,dest,file)
+@@ -266,7 +270,7 @@
DUSESMALLICONS = -DUSE_SMALL_ICONS
#endif /* USESMALLICONS */
--PNGLIBS = -L$(PNGLIBDIR) -lpng -lz
+-PNGLIBS = -L$(PNGLIBDIR) -lpng -L$(ZLIBDIR) -lz
+PNGLIBS = -Wl,-R$(LOCALBASE)/lib -L$(PNGLIBDIR) -lpng -lz
#ifdef USEJPEG
DUSEJPEG = -DUSE_JPEG
-@@ -274,7 +275,7 @@ READJPEGO = f_readjpg.o
+@@ -276,7 +280,7 @@
#ifdef USEXPM
DUSEXPM = -DUSE_XPM
@@ -100,7 +109,7 @@ $NetBSD: patch-ab,v 1.10 2005/02/18 15:56:18 wiz Exp $
READXPMS = f_readxpm.c
READXPMO = f_readxpm.o
#ifdef USEXPM_ICON
-@@ -410,6 +411,8 @@ install.html::
+@@ -411,6 +415,8 @@
install.rhtml::
@(cd Doc ; \
echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
diff --git a/graphics/xfig/patches/patch-ac b/graphics/xfig/patches/patch-ac
index 955fa20b9d7..3ed871c99e1 100644
--- a/graphics/xfig/patches/patch-ac
+++ b/graphics/xfig/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2003/01/07 06:30:36 rh Exp $
+$NetBSD: patch-ac,v 1.5 2005/11/12 16:08:21 itohy Exp $
---- f_util.c.orig Mon Dec 2 17:05:47 2002
-+++ f_util.c
-@@ -111,15 +111,15 @@
+--- f_util.c.orig Wed Jan 7 04:46:08 2004
++++ f_util.c Sat Nov 12 14:16:03 2005
+@@ -111,15 +111,15 @@ change_directory(path)
get_directory(direct)
char *direct;
{
@@ -19,11 +19,11 @@ $NetBSD: patch-ac,v 1.4 2003/01/07 06:30:36 rh Exp $
-#if defined(SYSV) || defined(SVR4) || defined(_POSIX_SOURCE)
+#if defined(SYSV) || defined(SVR4) || defined(_POSIX_SOURCE) || defined(__NetBSD__)
if (getcwd(direct, PATH_MAX) == NULL) { /* get current working dir */
- put_msg("Can't get current directory");
+ file_msg("Can't get current directory");
beep();
-@@ -127,7 +127,7 @@
+@@ -127,7 +127,7 @@ get_directory(direct)
if (getwd(direct) == NULL) { /* get current working dir */
- put_msg("%s", direct); /* err msg is in directory */
+ file_msg("%s", direct); /* err msg is in direct var */
beep();
-#endif /* defined(SYSV) || defined(SVR4) || defined(_POSIX_SOURCE) */
+#endif /* defined(SYSV) || defined(SVR4) || defined(_POSIX_SOURCE) || defined(__NetBSD__) */
diff --git a/graphics/xfig/patches/patch-ad b/graphics/xfig/patches/patch-ad
index e88bb2941bd..c19fbed048a 100644
--- a/graphics/xfig/patches/patch-ad
+++ b/graphics/xfig/patches/patch-ad
@@ -1,22 +1,22 @@
-$NetBSD: patch-ad,v 1.3 2003/01/15 07:11:44 rh Exp $
+$NetBSD: patch-ad,v 1.4 2005/11/12 16:08:21 itohy Exp $
---- SimpleMenu.c.orig Sat Sep 21 05:28:45 2002
-+++ SimpleMenu.c
-@@ -39,10 +39,17 @@
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
-
-+#ifdef XAW3D
- #include <X11/Xaw3d/XawInit.h>
- #include <X11/Xaw3d/SimpleMenP.h>
- #include <X11/Xaw3d/SmeBSB.h>
- #include <X11/Xaw3d/Cardinals.h>
-+#else
-+#include <X11/Xaw/XawInit.h>
-+#include <X11/Xaw/SimpleMenP.h>
-+#include <X11/Xaw/SmeBSB.h>
-+#include <X11/Xaw/Cardinals.h>
-+#endif
-
- #include <X11/Xmu/Initer.h>
- #include <X11/Xmu/CharSet.h>
+--- w_cmdpanel.c.orig Wed Mar 17 09:53:55 2004
++++ w_cmdpanel.c Sat Nov 12 19:55:19 2005
+@@ -349,7 +349,7 @@ rebuild_file_menu(menu)
+ sprintf(id, "%1d", j + 1);
+ FirstArg(XtNvertSpace, 10);
+ NextArg(XtNunderline, 0); /* underline # digit */
+-#ifndef XAW3D1_5E
++#ifndef XAW3D
+ entry = XtCreateWidget(id, figSmeBSBObjectClass, menu, Args, ArgCount);
+ #else
+ entry = XtCreateWidget(id, smeBSBObjectClass, menu, Args, ArgCount);
+@@ -407,7 +407,7 @@ create_menu_item(menup)
+ NextArg(XtNleftMargin, 12);
+ }
+ NextArg(XtNunderline, menup->menu[i].u_line); /* any underline */
+-#ifndef XAW3D1_5E
++#ifndef XAW3D
+ entry = XtCreateManagedWidget(menup->menu[i].name, figSmeBSBObjectClass,
+ menu, Args, ArgCount);
+ #else
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 03:33:34 +0000