Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors
In directory vz-cvs-3.sog:/tmp/cvs-serv24064/10.4/stable/main/finkinfo/editors
Modified Files:
lyx2-10.5.info lyx2-10.6.info
Log Message:
Fix installation directly into the filesystem and use of non-approved
directory.
Index: lyx2-10.5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/lyx2-10.5.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lyx2-10.5.info 7 May 2012 03:06:28 -0000 1.2
+++ lyx2-10.5.info 15 Jun 2012 18:49:30 -0000 1.3
@@ -2,7 +2,7 @@
Package: lyx2%type_pkg[-ui]
Type: -ui ( -x11 -mac )
Version: 2.0.3
-Revision: 22
+Revision: 23
Distribution: 10.5
Source: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-%v.tar.gz
Source-MD5: 5848a92c42e86bda0c9e9acab47433b1
@@ -41,8 +41,13 @@
PatchFile: lyx.patch
PatchFile-MD5: 21f0b994568a271f66c7c6da1bfbf114
PatchScript: <<
- sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
- ln -s %p/share/automake-1.11/mkinstalldirs mkinstalldirs
+ #!/bin/sh -ev
+ sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+ patch -p1 < %{PatchFile2}
+ ln -s %p/share/automake-1.11/mkinstalldirs mkinstalldirs
+ if [ "%type_raw[-ui]" = "-x11" ] ; then
+ perl -pi -e 's,(mkdir -p )(\$\(pkgdatadir),\1\$(DESTDIR)\2,'
development/MacOSX/Makefile.in
+ fi
<<
ConfigureParams: <<
@@ -70,7 +75,7 @@
<<
InstallScript: <<
#!/bin/sh -ev
- export PYTHON=/usr/bin/python
+ export PYTHON=/usr/bin/python
if [ "%type_pkg[-ui]" == "-x11" ]; then
make install DESTDIR=%d
mkdir -p %i/etc/texmf.local/tex/latex
@@ -81,6 +86,7 @@
mv %i/bin/lyx %i/bin/lyxx
cp lyx.sh %i/bin/lyx
chmod 755 %i/bin/lyx
+ mv %i/Contents %i/share/lyx/Contents
else
make install-strip
find %i/Applications/LyX.app \( -name '*.pyc' -o -name '*.pyo' \) -delete;
@@ -141,16 +147,6 @@
Thanks to Ronald Florence for his instructions on getting
lyx-1.3.2 to compile (http://www.18james.com/lyx_on_osx.html)
-lyx is a wrapper script that sets up symlinks to latex-xft fonts
-fonts in ~/.fonts, so that LyX will find them.
-
-Patch to prevent BusError when new file is opened with keyboard
-shortcut.
-
-Since we pretty much have to set the prefix to build the .app
-bundle we have to reconstitute the python modules by hand in the
-Aqua version or the validator gripes.
-
Symlink to the real mkinstalldirs as a simple workaround to the
Makefile trying to find one in %b rather than %b/config.
@@ -169,6 +165,19 @@
Uses Fink's boost as of 1.6.5-22 and later.
+lyx is a wrapper script that sets up symlinks to latex-xft fonts
+fonts in ~/.fonts, so that LyX will find them.
+
+Since we pretty much have to set the prefix to build the .app
+bundle we have to reconstitute the python modules by hand in the
+Aqua version or the validator gripes.
+
+The X11 version creates %i/Contents, which isn't on the list of
+approved directories. Manually move that into %i/share/lyx.
+
+The X11 variant tries to install .lproj/ directories directly in %p,
+so we patch development/MacOSX/Makefile.in to avoid that.
+
Prior versions by Jeffrey Whitaker
<<
Homepage: http://www.lyx.org
Index: lyx2-10.6.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/lyx2-10.6.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lyx2-10.6.info 7 May 2012 03:06:28 -0000 1.2
+++ lyx2-10.6.info 15 Jun 2012 18:49:30 -0000 1.3
@@ -2,7 +2,7 @@
Package: lyx2%type_pkg[-ui]
Type: -ui ( -x11 -mac )
Version: 2.0.3
-Revision: 42
+Revision: 43
Distribution: 10.6
Source: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-%v.tar.gz
Source-MD5: 5848a92c42e86bda0c9e9acab47433b1
@@ -40,8 +40,13 @@
PatchFile: lyx.patch
PatchFile-MD5: 21f0b994568a271f66c7c6da1bfbf114
PatchScript: <<
- sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
- ln -s %p/share/automake-1.11/mkinstalldirs mkinstalldirs
+ #!/bin/sh -ev
+ sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+ patch -p1 < %{PatchFile2}
+ ln -s %p/share/automake-1.11/mkinstalldirs mkinstalldirs
+ if [ "%type_raw[-ui]" = "-x11" ] ; then
+ perl -pi -e 's,(mkdir -p )(\$\(pkgdatadir),\1\$(DESTDIR)\2,'
development/MacOSX/Makefile.in
+ fi
<<
ConfigureParams: <<
@@ -69,7 +74,7 @@
<<
InstallScript: <<
#!/bin/sh -ev
- export PYTHON=/usr/bin/python
+ export PYTHON=/usr/bin/python
if [ "%type_pkg[-ui]" == "-x11" ]; then
make install DESTDIR=%d
mkdir -p %i/etc/texmf.local/tex/latex
@@ -80,6 +85,7 @@
mv %i/bin/lyx %i/bin/lyxx
cp lyx.sh %i/bin/lyx
chmod 755 %i/bin/lyx
+ mv %i/Contents %i/share/lyx/Contents
else
make install-strip
find %i/Applications/LyX.app \( -name '*.pyc' -o -name '*.pyo' \) -delete;
@@ -140,16 +146,6 @@
Thanks to Ronald Florence for his instructions on getting
lyx-1.3.2 to compile (http://www.18james.com/lyx_on_osx.html)
-lyx is a wrapper script that sets up symlinks to latex-xft fonts
-fonts in ~/.fonts, so that LyX will find them.
-
-Patch to prevent BusError when new file is opened with keyboard
-shortcut.
-
-Since we pretty much have to set the prefix to build the .app
-bundle we have to reconstitute the python modules by hand in the
-Aqua version or the validator gripes.
-
Symlink to the real mkinstalldirs as a simple workaround to the
Makefile trying to find one in %b rather than %b/config.
<<
@@ -165,6 +161,19 @@
Uses Fink's boost as of 1.6.5-22 and later.
+lyx is a wrapper script that sets up symlinks to latex-xft fonts
+fonts in ~/.fonts, so that LyX will find them.
+
+Since we pretty much have to set the prefix to build the .app
+bundle we have to reconstitute the python modules by hand in the
+Aqua version or the validator gripes.
+
+The X11 version creates %i/Contents, which isn't on the list of
+approved directories. Manually move that into %i/share/lyx.
+
+The X11 variant tries to install .lproj/ directories directly in %p,
+so we patch development/MacOSX/Makefile.in to avoid that.
+
Prior versions by Jeffrey Whitaker
<<
Homepage: http://www.lyx.org
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
