- use -R for $LOCALBASE/lib too to make ELF systems work;

- fix the path for the docs so they get found via help menu;
- use gv to view pdf files as default, we don't have acroread.

3 files changed, 83 insertions, 4 deletions

diff --git a/graphics/xfig/patches/patch-aa b/graphics/xfig/patches/patch-aa
index 28a1841d2d6..cafc3324137 100644
--- a/graphics/xfig/patches/patch-aa
+++ b/graphics/xfig/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:55 agc Exp $
+$NetBSD: patch-aa,v 1.4 1999/01/05 21:37:55 frueauf Exp $
 
 --- Imakefile.orig	Thu Jul  2 19:37:09 1998
-+++ Imakefile	Fri Jul  3 14:32:45 1998
++++ Imakefile	Tue Jan  5 21:40:08 1999
 @@ -40,7 +40,8 @@
  
  #ifdef USEJPEG
@@ -55,14 +55,25 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:55 agc Exp $
  XCOMM If your system doesn't have strstr undefine the following definition
  XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
  
-@@ -169,7 +172,6 @@
+@@ -169,8 +172,7 @@
  
  #ifdef USEJPEG
  #ifdef USEINSTALLEDJPEG
 -JPEGINCDIR = -I/usr/include/X11
- JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
+-JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
++JPEGLIB = -Wl,-R$(JPEGLIBDIR) -L$(JPEGLIBDIR) -ljpeg
  #else
  JPEGCONF = configure
+ JPEGINCDIR = -I$(JPEGLIBDIR)
+@@ -185,7 +187,7 @@
+ I18N_OBJ = w_i18n.o
+ #endif
+ 
+-DIR_DEFS=		-DXFIGLIBDIR=\"$(XFIGLIBDIR)\"
++DIR_DEFS=		-DXFIGLIBDIR=\"$(XFIGLIBDIR)\" -DXFIGDOCDIR=\"$(XFIGDOCDIR)\"
+ 
+ XCOMM location of Fig object libraries
+ OBJLIBDIR =		$(XFIGLIBDIR)/Libraries
 @@ -314,22 +316,23 @@
  
  XCOMM Install the object libraries here
diff --git a/graphics/xfig/patches/patch-ab b/graphics/xfig/patches/patch-ab
new file mode 100644
index 00000000000..6fb89a1e5b0
--- /dev/null
+++ b/graphics/xfig/patches/patch-ab
@@ -0,0 +1,55 @@
+$NetBSD: patch-ab,v 1.1 1999/01/05 21:37:55 frueauf Exp $
+
+--- w_help.c-orig	Tue Jun 16 18:06:43 1998
++++ w_help.c	Tue Jan  5 21:41:46 1999
+@@ -33,13 +33,13 @@
+ 	char filename[PATH_MAX];
+ 
+ 	/* first check if at least the index file is installed */
+-	sprintf(filename, "%s/html/index.html", XFIGLIBDIR);
++	sprintf(filename, "%s/html/index.html", XFIGDOCDIR);
+ #ifdef I18N
+ 	if (appres.international && getenv("LANG")) {
+-	  /* check localized file ($XFIGLIBDIR/html/$LANG/index.html) first */
+-	  sprintf(filename, "%s/html/%s/index.html", XFIGLIBDIR, getenv("LANG"));
++	  /* check localized file ($XFIGDOCDIR/html/$LANG/index.html) first */
++	  sprintf(filename, "%s/html/%s/index.html", XFIGDOCDIR, getenv("LANG"));
+ 	  if (!check_docfile(filename))
+-	    sprintf(filename, "%s/html/index.html", XFIGLIBDIR);
++	    sprintf(filename, "%s/html/index.html", XFIGDOCDIR);
+ 	}
+ #endif
+ 	if (!check_docfile(filename))
+@@ -63,13 +63,13 @@
+ 	int pid;
+ 
+ 	/* first check if the file is installed */
+-	sprintf(cmd,"%s/xfig-howto.pdf",XFIGLIBDIR);
++	sprintf(cmd,"%s/xfig-howto.pdf",XFIGDOCDIR);
+ 	if (!check_docfile(cmd))
+ 		return;
+ 	pid = fork();
+ 	if (pid == 0) {
+ 	    /* child process launches pdf viewer */
+-	    sprintf(cmd,"%s %s/xfig-howto.pdf &",appres.pdf_viewer,XFIGLIBDIR);
++	    sprintf(cmd,"%s %s/xfig-howto.pdf &",appres.pdf_viewer,XFIGDOCDIR);
+ 	    system(cmd);
+ 	    exit(0);
+ 	}
+@@ -84,14 +84,14 @@
+ 	int pid;
+ 
+ 	/* first check if the file is installed */
+-	sprintf(cmd,"%s/xfig.pdf",XFIGLIBDIR);
++	sprintf(cmd,"%s/xfig.pdf",XFIGDOCDIR);
+ 	if (!check_docfile(cmd))
+ 		return;
+ 	put_msg("Launching %s for man pages",appres.pdf_viewer);
+ 	pid = fork();
+ 	if (pid == 0) {
+ 	    /* child process launches pdf viewer */
+-	    sprintf(cmd,"%s %s/xfig.pdf &",appres.pdf_viewer,XFIGLIBDIR);
++	    sprintf(cmd,"%s %s/xfig.pdf &",appres.pdf_viewer,XFIGDOCDIR);
+ 	    system(cmd);
+ 	    exit(0);
+ 	}
diff --git a/graphics/xfig/patches/patch-ac b/graphics/xfig/patches/patch-ac
new file mode 100644
index 00000000000..0944c0f245f
--- /dev/null
+++ b/graphics/xfig/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 1999/01/05 21:37:55 frueauf Exp $
+
+--- Fig.ad-orig	Thu Jul  2 02:10:28 1998
++++ Fig.ad	Tue Jan  5 22:11:21 1999
+@@ -14,7 +14,7 @@
+ 
+ ! pdfviewer - put your favorite pdf viewer here.  
+ !		This is for viewing the xfig how-to guide and man pages
+-Fig.pdfviewer:			acroread
++Fig.pdfviewer:			gv
+ 
+ ! Spacing between buttons
+ Fig.internalborderwidth:	2