summaryrefslogtreecommitdiff
path: root/graphics/xfig
diff options
context:
space:
mode:
authorbouyer <bouyer@pkgsrc.org>2002-10-26 19:45:00 +0000
committerbouyer <bouyer@pkgsrc.org>2002-10-26 19:45:00 +0000
commit10d70b84235f59a7a8f0a6055022edead26403fb (patch)
treef8dc7598ffa3dddd5c017e75dd2a5d202792238f /graphics/xfig
parent44e5874a7e86a5887400b8684d2acd505b46d928 (diff)
downloadpkgsrc-10d70b84235f59a7a8f0a6055022edead26403fb.tar.gz
Correct XPM include and lib paths.
Diffstat (limited to 'graphics/xfig')
-rw-r--r--graphics/xfig/distinfo4
-rw-r--r--graphics/xfig/patches/patch-ab26
2 files changed, 20 insertions, 10 deletions
diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index e9e39f70942..a0c0d25600e 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2002/10/08 13:24:22 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/10/26 19:45:00 bouyer Exp $
SHA1 (xfig.3.2.3d.full.tar.gz) = 49806d4e081c722bb35e335b3d34a8ad9f7d78af
Size (xfig.3.2.3d.full.tar.gz) = 2846844 bytes
SHA1 (patch-aa) = dd528f771d7b30a7f2504d2e9043cdce7a98f0c1
-SHA1 (patch-ab) = f6262c528440dc38a1877da704320cf9e70ad89e
+SHA1 (patch-ab) = 98ccdc167efef31438aa016e2e0c4c1671151588
SHA1 (patch-ac) = 1d18e319873a4aa20d60b477318fd05c951c6b16
diff --git a/graphics/xfig/patches/patch-ab b/graphics/xfig/patches/patch-ab
index c82ea98ba22..6a71319e3bc 100644
--- a/graphics/xfig/patches/patch-ab
+++ b/graphics/xfig/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.6 2002/10/08 13:24:22 jlam Exp $
+$NetBSD: patch-ab,v 1.7 2002/10/26 19:45:00 bouyer Exp $
---- Imakefile.orig Tue May 29 14:32:11 2001
-+++ Imakefile
+--- Imakefile.orig Tue May 29 20:32:11 2001
++++ Imakefile Tue Oct 22 14:31:10 2002
@@ -47,8 +47,8 @@
#ifdef USEJPEG
@@ -37,8 +37,8 @@ $NetBSD: patch-ab,v 1.6 2002/10/08 13:24:22 jlam Exp $
#ifdef USEXPM
-XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
-+XPMLIBDIR = $(LOCALBASE)/lib
-+XPMINC = -I$(LOCALBASE)/include/X11
++XPMLIBDIR = $(X11BASE)/lib
++XPMINC = -I$(X11BASE)/include/X11
#endif
XCOMM Uncomment the following definiton if you want to use the small icons
@@ -87,7 +87,7 @@ $NetBSD: patch-ab,v 1.6 2002/10/08 13:24:22 jlam Exp $
#else
JPEGCONF = configure
JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
-@@ -255,14 +260,14 @@
+@@ -255,7 +260,7 @@
#ifdef USEPNG
DUSEPNG = -DUSE_PNG
@@ -96,11 +96,12 @@ $NetBSD: patch-ab,v 1.6 2002/10/08 13:24:22 jlam Exp $
READPNGS = f_readpng.c
READPNGO = f_readpng.o
#endif /* USEPNG */
+@@ -262,7 +267,7 @@
#ifdef USEXPM
DUSEXPM = -DUSE_XPM
-XPMLIBS = -L$(XPMLIBDIR) -lXpm
-+XPMLIBS = -Wl,-R$(LOCALBASE)/lib -L$(XPMLIBDIR) -lXpm
++XPMLIBS = -Wl,-R$(XPMLIBDIR) -L$(XPMLIBDIR) -lXpm
READXPMS = f_readxpm.c
READXPMO = f_readxpm.o
#ifdef USEXPM_ICON
@@ -113,8 +114,17 @@ $NetBSD: patch-ab,v 1.6 2002/10/08 13:24:22 jlam Exp $
DEPLIBS = XawClientDepLibs
LOCAL_LIBRARIES = $(JPEGLIB)
-@@ -384,6 +389,8 @@
+@@ -378,12 +383,16 @@
+ @$(MAKE) install.html
+
+ XCOMM Install the HTML documentation here with "make install.html"
+-install.html::
+ #ifdef I18N
++install.html::
+ @$(MAKE) install.jhtml
#endif
++
++install.html::
@(cd Doc ; \
echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
+ if [ -d $(DESTDIR)$(XFIGDOCDIR) ]; then set +x; \