[PC-BSD Commits] r3337 - in pbibuild/modules/lyx: . kmenu-dir overlay-dir

svn at pcbsd.org svn at pcbsd.org
Mon Jan 26 17:31:00 PST 2009


Author: kris
Date: 2009-01-26 17:30:59 -0800 (Mon, 26 Jan 2009)
New Revision: 3337

Removed:
   pbibuild/modules/lyx/kmenu-dir/uninstall
Modified:
   pbibuild/modules/lyx/build.sh
   pbibuild/modules/lyx/copy-files
   pbibuild/modules/lyx/kmenu-dir/lyx
   pbibuild/modules/lyx/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/lyx/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/lyx/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/lyx/pbi.conf
   pbibuild/modules/lyx/preportmake.sh
Log:

Updated lyx to be 100% self-contained, now it works properly with texmf and others :)



Modified: pbibuild/modules/lyx/build.sh
===================================================================
--- pbibuild/modules/lyx/build.sh	2009-01-26 21:05:04 UTC (rev 3336)
+++ pbibuild/modules/lyx/build.sh	2009-01-27 01:30:59 UTC (rev 3337)
@@ -9,7 +9,6 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Lyx${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
+# Remove some dirs in share which aren't needed for program execution
+rm -rf ${PBIDIR}/share/doc
+rm -rf ${PBIDIR}/share/examples

Modified: pbibuild/modules/lyx/copy-files
===================================================================
--- pbibuild/modules/lyx/copy-files	2009-01-26 21:05:04 UTC (rev 3336)
+++ pbibuild/modules/lyx/copy-files	2009-01-27 01:30:59 UTC (rev 3337)
@@ -1,2 +1,3 @@
-/usr/local/bin/lyx bin/
-/usr/local/share/lyx share/
+/usr/local/bin/* bin/
+/usr/local/lib/* lib/
+/usr/local/share/* share/

Modified: pbibuild/modules/lyx/kmenu-dir/lyx
===================================================================
--- pbibuild/modules/lyx/kmenu-dir/lyx	2009-01-26 21:05:04 UTC (rev 3336)
+++ pbibuild/modules/lyx/kmenu-dir/lyx	2009-01-27 01:30:59 UTC (rev 3337)
@@ -1,5 +1,5 @@
 ExePath: bin/lyx
-ExeIcon: share/lyx/images/lyx.xpm
+ExeIcon: lyx.png
 ExeDescr: LyX
 ExeNoDesktop: 0
 ExeNoMenu: 0

Modified: pbibuild/modules/lyx/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/lyx/overlay-dir/PBI.FirstRun.sh	2009-01-26 21:05:04 UTC (rev 3336)
+++ pbibuild/modules/lyx/overlay-dir/PBI.FirstRun.sh	2009-01-27 01:30:59 UTC (rev 3337)
@@ -15,37 +15,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-
-PROG="lyx"
-PROGL="LYX"
-BINARY="/usr/local/bin/lyx"
-
-if [ -e ${BINARY} ]
-then
-    # Looks like ${PROG} is installed, ask if they want to remove the old one
-    ls -al ${BINARY} | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "${PROGL} is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        TODEL="`ls -al ${BINARY} | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo ${TODEL} | grep ${PROG}
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${TODEL}
-        else
-          kdialog --sorry "${PROGL} could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "${PROGL} is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "${PROGL} is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi

Modified: pbibuild/modules/lyx/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/lyx/overlay-dir/PBI.RemoveScript.sh	2009-01-26 21:05:04 UTC (rev 3336)
+++ pbibuild/modules/lyx/overlay-dir/PBI.RemoveScript.sh	2009-01-27 01:30:59 UTC (rev 3337)
@@ -7,24 +7,7 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/lyx
-rm /usr/local/share/services/kfile_lyx.desktop
-rm /usr/local/share/lyx
 
-# Remove the services links
-cd /Programs/${1}/autolibs/kde3/
-for i in * 
-do
- rm /usr/local/lib/kde3/${i}
-done
-
-# Remove the sound links
-cd /Programs/${1}/share/sounds/
-for i in *
-do
- rm /usr/local/share/sounds/${i}
-done
-
 cd /home
 for i in *
    do

Modified: pbibuild/modules/lyx/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/lyx/overlay-dir/PBI.SetupScript.sh	2009-01-26 21:05:04 UTC (rev 3336)
+++ pbibuild/modules/lyx/overlay-dir/PBI.SetupScript.sh	2009-01-27 01:30:59 UTC (rev 3337)
@@ -14,23 +14,14 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/lyx /usr/local/bin/lyx
-ln -s /Programs/${PROGDIR}/share/lyx /usr/local/share/lyx
 
-# Make links for services
-cd /Programs/${PROGDIR}/autolibs/lyx
-for i in *
-do
-# Link the services now
- ln -s /Programs/${PROGDIR}/autolibs/kde3/${i} /usr/local/lib/kde3/${i}
-done
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-# Make links for sounds wav files
-cd /Programs/${PROGDIR}/share/sounds/
-for i in *
-do
- # Link the services now
- ln -s /Programs/${PROGDIR}/share/sounds/${i} /usr/local/share/sounds/${i}
-done
 
-echo "LAUNCHCLOSE: /usr/local/bin/lyx"
+echo "LAUNCHCLOSE: /Programs/bin/lyx"

Modified: pbibuild/modules/lyx/pbi.conf
===================================================================
--- pbibuild/modules/lyx/pbi.conf	2009-01-26 21:05:04 UTC (rev 3336)
+++ pbibuild/modules/lyx/pbi.conf	2009-01-27 01:30:59 UTC (rev 3337)
@@ -13,7 +13,7 @@
 PROGAUTHOR="Lyx Team"
 
 # Default Icon (Relative to overlay-dir)
-PROGICON="share/lyx/images/lyx.xpm"
+PROGICON="lyx.png"
 
 # Port we want to build
 PBIPORT="/usr/ports/print/lyx/"
@@ -28,10 +28,10 @@
 OTHERPORT=""
 
 # Enter your custom make options here
-MAKEOPTS=""
+MAKEOPTS="WITH_QT=YES"
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="00"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/lyx/preportmake.sh
===================================================================
--- pbibuild/modules/lyx/preportmake.sh	2009-01-26 21:05:04 UTC (rev 3336)
+++ pbibuild/modules/lyx/preportmake.sh	2009-01-27 01:30:59 UTC (rev 3337)
@@ -1,9 +1 @@
 #!/bin/sh
-cat<<EOF>>/etc/make.conf
-CFLAGS= -O2 -fno-strict-aliasing -pipe
-# Options for lyx-1.4.5.1_1
-_OPTIONS_READ=lyx-1.4.5.1_1
-WITH_QT=true
-WITH_ASPELL=true
-WITH_AIKSAUR=true
-WITHOUT_ISPELL=true



More information about the Commits mailing list