summaryrefslogtreecommitdiff
path: root/print/lyx
diff options
context:
space:
mode:
authorfredb <fredb@pkgsrc.org>2002-04-18 23:55:26 +0000
committerfredb <fredb@pkgsrc.org>2002-04-18 23:55:26 +0000
commit3d215bc45ca2851c7cb00acedaa3c1a477102544 (patch)
tree0165086c82199728774e0d44b30a197a980e970c /print/lyx
parentc69459e095d30078317949e9e1a136d0425275d3 (diff)
downloadpkgsrc-3d215bc45ca2851c7cb00acedaa3c1a477102544.tar.gz
- - Force the locale dir to ${prefix}/share in a more definite way.
(On my my Mac with an NFS mounted object directory, it keeps rebuilding po/Makefile and getting it wrong.) - - Take a stab at fixing PR pkg/16308: X11BASE -> X11PREFIX.
Diffstat (limited to 'print/lyx')
-rw-r--r--print/lyx/Makefile13
-rw-r--r--print/lyx/distinfo4
-rw-r--r--print/lyx/patches/patch-aa11
3 files changed, 16 insertions, 12 deletions
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index d03922fa49e..4c05d8501e5 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2002/04/17 04:45:16 fredb Exp $
+# $NetBSD: Makefile,v 1.43 2002/04/18 23:55:26 fredb Exp $
# FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp
#
@@ -22,15 +22,10 @@ DEPENDS+= xforms>=0.9999:../../x11/xforms
USE_PERL5= YES
USE_XPM= YES
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib" \
- --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
+CONFIGURE_ARGS= --with-extra-lib="${X11PREFIX}/lib" \
+ --with-extra-inc="${X11PREFIX}/include ${X11PREFIX}/include/X11"
-LDFLAGS+= -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
-
-post-configure:
- ${MV} ${WRKSRC}/po/Makefile ${WRKSRC}/po/Makefile.orig
- ${SED} '/^datadir/s/lib/share/g' \
- < ${WRKSRC}/po/Makefile.orig > ${WRKSRC}/po/Makefile
+LDFLAGS+= -L${X11PREFIX}/lib -Wl,-R${X11PREFIX}/lib
post-install:
${CHMOD} +x ${PREFIX}/share/lyx/configure
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index 564714cb361..d15e9cb0083 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2002/04/18 15:59:55 fredb Exp $
+$NetBSD: distinfo,v 1.9 2002/04/18 23:55:27 fredb Exp $
SHA1 (lyx-1.1.6fix4.tar.gz) = 0256ba5955bf98068f8dc0768224d70840858418
Size (lyx-1.1.6fix4.tar.gz) = 5564584 bytes
-SHA1 (patch-aa) = 4ebd6cab59d6db11c5a8e49db610573fb8bb80f2
+SHA1 (patch-aa) = 91117be8d09ccc7c85fd6c5e38e26f44ea063f78
SHA1 (patch-ab) = d56a17928e8ddc6dc0b76140f8ecf9d592049794
diff --git a/print/lyx/patches/patch-aa b/print/lyx/patches/patch-aa
index 0175ae8d588..fad0002e169 100644
--- a/print/lyx/patches/patch-aa
+++ b/print/lyx/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2002/04/17 04:45:17 fredb Exp $
+$NetBSD: patch-aa,v 1.8 2002/04/18 23:55:27 fredb Exp $
--- configure.orig Fri Aug 3 07:21:35 2001
+++ configure
@@ -20,3 +20,12 @@ $NetBSD: patch-aa,v 1.7 2002/04/17 04:45:17 fredb Exp $
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for fl_initialize in -lxforms""... $ac_c" 1>&6
+@@ -9764,7 +9764,7 @@
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CATOBJEXT=.mo
+- DATADIRNAME=lib
++ DATADIRNAME=share
+ fi
+ rm -f conftest*
+ INSTOBJEXT=.mo