From 130d33bc83191a8aa8977a596cf63cc19e4aa50d Mon Sep 17 00:00:00 2001
From: Dirk Froemberg <dirk@FreeBSD.org>
Date: Wed, 3 May 2000 14:54:23 +0000
Subject: - upgrade to 1.1.4.3 (patch-1.1.4fix3) - use shared intl.1 instead of
supplied static library
PR: ports/17267, ports/17268
---
print/lyx-devel/Makefile | 12 ++++++------
print/lyx-devel/distinfo | 1 +
print/lyx-devel/files/patch-ab | 11 +++++++++++
print/lyx/Makefile | 12 ++++++------
print/lyx/distinfo | 1 +
print/lyx/files/patch-ab | 11 +++++++++++
print/lyx14/Makefile | 12 ++++++------
print/lyx14/distinfo | 1 +
print/lyx14/files/patch-ab | 11 +++++++++++
print/lyx15/Makefile | 12 ++++++------
print/lyx15/distinfo | 1 +
print/lyx15/files/patch-ab | 11 +++++++++++
print/lyx16/Makefile | 12 ++++++------
print/lyx16/distinfo | 1 +
print/lyx16/files/patch-ab | 11 +++++++++++
15 files changed, 90 insertions(+), 30 deletions(-)
create mode 100644 print/lyx-devel/files/patch-ab
create mode 100644 print/lyx/files/patch-ab
create mode 100644 print/lyx14/files/patch-ab
create mode 100644 print/lyx15/files/patch-ab
create mode 100644 print/lyx16/files/patch-ab
(limited to 'print')
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index d232f6cbec3d..4719ac6c40d4 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= lyx
-PORTVERSION= 1.1.4.2
+PORTVERSION= 1.1.4.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
DISTNAME= lyx-1.1.4
PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz
+PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz patch-1.1.4fix3.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= dirk@FreeBSD.org
@@ -25,14 +25,14 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \
- Xpm.4:${PORTSDIR}/graphics/xpm
+ Xpm.4:${PORTSDIR}/graphics/xpm \
+ intl.1:${PORTSDIR}/devel/gettext
USE_NEWGCC= yes
USE_PERL5= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib \
- --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11 ${LOCALBASE}/include" \
- --with-included-gettext
+CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
+ --with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
MAN1= lyx.1 reLyX.1
.if !defined(WITH_ISPELL)
diff --git a/print/lyx-devel/distinfo b/print/lyx-devel/distinfo
index 858a9b9dc6e3..a06028b0f244 100644
--- a/print/lyx-devel/distinfo
+++ b/print/lyx-devel/distinfo
@@ -1,3 +1,4 @@
MD5 (lyx-1.1.4.tar.gz) = 65a919db1ef4eff04e0d89ca705efa43
MD5 (patch-1.1.4fix1.gz) = 091d7238b8c79fd05ca68f7ce66a8baa
MD5 (patch-1.1.4fix2.gz) = 64512696cf8f452ac3d9d2c6ea1233af
+MD5 (patch-1.1.4fix3.gz) = 977dce6c9d0f4ddbaaa51b503a83c1ec
diff --git a/print/lyx-devel/files/patch-ab b/print/lyx-devel/files/patch-ab
new file mode 100644
index 000000000000..3e3ecce8853e
--- /dev/null
+++ b/print/lyx-devel/files/patch-ab
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig Mon Jan 17 21:04:28 2000
++++ po/Makefile.in.in Tue May 2 21:53:41 2000
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index d232f6cbec3d..4719ac6c40d4 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= lyx
-PORTVERSION= 1.1.4.2
+PORTVERSION= 1.1.4.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
DISTNAME= lyx-1.1.4
PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz
+PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz patch-1.1.4fix3.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= dirk@FreeBSD.org
@@ -25,14 +25,14 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \
- Xpm.4:${PORTSDIR}/graphics/xpm
+ Xpm.4:${PORTSDIR}/graphics/xpm \
+ intl.1:${PORTSDIR}/devel/gettext
USE_NEWGCC= yes
USE_PERL5= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib \
- --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11 ${LOCALBASE}/include" \
- --with-included-gettext
+CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
+ --with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
MAN1= lyx.1 reLyX.1
.if !defined(WITH_ISPELL)
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index 858a9b9dc6e3..a06028b0f244 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1,3 +1,4 @@
MD5 (lyx-1.1.4.tar.gz) = 65a919db1ef4eff04e0d89ca705efa43
MD5 (patch-1.1.4fix1.gz) = 091d7238b8c79fd05ca68f7ce66a8baa
MD5 (patch-1.1.4fix2.gz) = 64512696cf8f452ac3d9d2c6ea1233af
+MD5 (patch-1.1.4fix3.gz) = 977dce6c9d0f4ddbaaa51b503a83c1ec
diff --git a/print/lyx/files/patch-ab b/print/lyx/files/patch-ab
new file mode 100644
index 000000000000..3e3ecce8853e
--- /dev/null
+++ b/print/lyx/files/patch-ab
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig Mon Jan 17 21:04:28 2000
++++ po/Makefile.in.in Tue May 2 21:53:41 2000
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index d232f6cbec3d..4719ac6c40d4 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= lyx
-PORTVERSION= 1.1.4.2
+PORTVERSION= 1.1.4.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
DISTNAME= lyx-1.1.4
PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz
+PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz patch-1.1.4fix3.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= dirk@FreeBSD.org
@@ -25,14 +25,14 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \
- Xpm.4:${PORTSDIR}/graphics/xpm
+ Xpm.4:${PORTSDIR}/graphics/xpm \
+ intl.1:${PORTSDIR}/devel/gettext
USE_NEWGCC= yes
USE_PERL5= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib \
- --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11 ${LOCALBASE}/include" \
- --with-included-gettext
+CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
+ --with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
MAN1= lyx.1 reLyX.1
.if !defined(WITH_ISPELL)
diff --git a/print/lyx14/distinfo b/print/lyx14/distinfo
index 858a9b9dc6e3..a06028b0f244 100644
--- a/print/lyx14/distinfo
+++ b/print/lyx14/distinfo
@@ -1,3 +1,4 @@
MD5 (lyx-1.1.4.tar.gz) = 65a919db1ef4eff04e0d89ca705efa43
MD5 (patch-1.1.4fix1.gz) = 091d7238b8c79fd05ca68f7ce66a8baa
MD5 (patch-1.1.4fix2.gz) = 64512696cf8f452ac3d9d2c6ea1233af
+MD5 (patch-1.1.4fix3.gz) = 977dce6c9d0f4ddbaaa51b503a83c1ec
diff --git a/print/lyx14/files/patch-ab b/print/lyx14/files/patch-ab
new file mode 100644
index 000000000000..3e3ecce8853e
--- /dev/null
+++ b/print/lyx14/files/patch-ab
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig Mon Jan 17 21:04:28 2000
++++ po/Makefile.in.in Tue May 2 21:53:41 2000
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index d232f6cbec3d..4719ac6c40d4 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= lyx
-PORTVERSION= 1.1.4.2
+PORTVERSION= 1.1.4.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
DISTNAME= lyx-1.1.4
PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz
+PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz patch-1.1.4fix3.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= dirk@FreeBSD.org
@@ -25,14 +25,14 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \
- Xpm.4:${PORTSDIR}/graphics/xpm
+ Xpm.4:${PORTSDIR}/graphics/xpm \
+ intl.1:${PORTSDIR}/devel/gettext
USE_NEWGCC= yes
USE_PERL5= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib \
- --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11 ${LOCALBASE}/include" \
- --with-included-gettext
+CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
+ --with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
MAN1= lyx.1 reLyX.1
.if !defined(WITH_ISPELL)
diff --git a/print/lyx15/distinfo b/print/lyx15/distinfo
index 858a9b9dc6e3..a06028b0f244 100644
--- a/print/lyx15/distinfo
+++ b/print/lyx15/distinfo
@@ -1,3 +1,4 @@
MD5 (lyx-1.1.4.tar.gz) = 65a919db1ef4eff04e0d89ca705efa43
MD5 (patch-1.1.4fix1.gz) = 091d7238b8c79fd05ca68f7ce66a8baa
MD5 (patch-1.1.4fix2.gz) = 64512696cf8f452ac3d9d2c6ea1233af
+MD5 (patch-1.1.4fix3.gz) = 977dce6c9d0f4ddbaaa51b503a83c1ec
diff --git a/print/lyx15/files/patch-ab b/print/lyx15/files/patch-ab
new file mode 100644
index 000000000000..3e3ecce8853e
--- /dev/null
+++ b/print/lyx15/files/patch-ab
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig Mon Jan 17 21:04:28 2000
++++ po/Makefile.in.in Tue May 2 21:53:41 2000
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index d232f6cbec3d..4719ac6c40d4 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= lyx
-PORTVERSION= 1.1.4.2
+PORTVERSION= 1.1.4.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
DISTNAME= lyx-1.1.4
PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz
+PATCHFILES= patch-1.1.4fix1.gz patch-1.1.4fix2.gz patch-1.1.4fix3.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= dirk@FreeBSD.org
@@ -25,14 +25,14 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \
- Xpm.4:${PORTSDIR}/graphics/xpm
+ Xpm.4:${PORTSDIR}/graphics/xpm \
+ intl.1:${PORTSDIR}/devel/gettext
USE_NEWGCC= yes
USE_PERL5= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib \
- --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11 ${LOCALBASE}/include" \
- --with-included-gettext
+CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
+ --with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
MAN1= lyx.1 reLyX.1
.if !defined(WITH_ISPELL)
diff --git a/print/lyx16/distinfo b/print/lyx16/distinfo
index 858a9b9dc6e3..a06028b0f244 100644
--- a/print/lyx16/distinfo
+++ b/print/lyx16/distinfo
@@ -1,3 +1,4 @@
MD5 (lyx-1.1.4.tar.gz) = 65a919db1ef4eff04e0d89ca705efa43
MD5 (patch-1.1.4fix1.gz) = 091d7238b8c79fd05ca68f7ce66a8baa
MD5 (patch-1.1.4fix2.gz) = 64512696cf8f452ac3d9d2c6ea1233af
+MD5 (patch-1.1.4fix3.gz) = 977dce6c9d0f4ddbaaa51b503a83c1ec
diff --git a/print/lyx16/files/patch-ab b/print/lyx16/files/patch-ab
new file mode 100644
index 000000000000..3e3ecce8853e
--- /dev/null
+++ b/print/lyx16/files/patch-ab
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig Mon Jan 17 21:04:28 2000
++++ po/Makefile.in.in Tue May 2 21:53:41 2000
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0