[PC-BSD Commits] r3244 - in pbibuild/modules/amule: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Tue Jan 13 12:30:45 PST 2009


Author: kris
Date: 2009-01-13 12:30:45 -0800 (Tue, 13 Jan 2009)
New Revision: 3244

Removed:
   pbibuild/modules/amule/overlay-dir/servers.met.tar
Modified:
   pbibuild/modules/amule/copy-files
   pbibuild/modules/amule/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/amule/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/amule/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/amule/pbi.conf
Log:

Updated amule, now 100% self-contained, and downloads server lists just fine



Modified: pbibuild/modules/amule/copy-files
===================================================================
--- pbibuild/modules/amule/copy-files	2009-01-13 20:07:07 UTC (rev 3243)
+++ pbibuild/modules/amule/copy-files	2009-01-13 20:30:45 UTC (rev 3244)
@@ -59,4 +59,4 @@
 /usr/local/share/cas share/
 /usr/local/share/doc/aMule* share/doc/
 /usr/local/share/pixmaps/alc.xpm share/pixmaps/
-/usr/local/share/pixmaps/wxcas.xpm share/pixmaps/
\ No newline at end of file
+/usr/local/share/pixmaps/wxcas.xpm share/pixmaps/

Modified: pbibuild/modules/amule/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/amule/overlay-dir/PBI.FirstRun.sh	2009-01-13 20:07:07 UTC (rev 3243)
+++ pbibuild/modules/amule/overlay-dir/PBI.FirstRun.sh	2009-01-13 20:30:45 UTC (rev 3244)
@@ -15,35 +15,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-
-
-if [ -e "/usr/local/bin/amule" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/amule | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "aMule is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/amule | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep aMule 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "aMule could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "aMule 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 "aMule is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 
-

Modified: pbibuild/modules/amule/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/amule/overlay-dir/PBI.RemoveScript.sh	2009-01-13 20:07:07 UTC (rev 3243)
+++ pbibuild/modules/amule/overlay-dir/PBI.RemoveScript.sh	2009-01-13 20:30:45 UTC (rev 3244)
@@ -7,78 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm -fR /usr/local/bin/alc
-rm -fR /usr/local/bin/alcc
-rm -fR /usr/local/bin/amule
-rm -fR /usr/local/bin/amulecmd
-rm -fR /usr/local/bin/amuleweb
-rm -fR /usr/local/bin/cas
-rm -fR /usr/local/bin/ed2k
-rm -fR /usr/local/bin/wxcas
-rm -fR /usr/local/lib/xchat/plugins/xas.pl
-rm -fR /usr/local/man/de/man1/alc.1.gz
-rm -fR /usr/local/man/de/man1/alcc.1.gz
-rm -fR /usr/local/man/de/man1/amule.1.gz
-rm -fR /usr/local/man/de/man1/amulecmd.1.gz
-rm -fR /usr/local/man/de/man1/amuleweb.1.gz
-rm -fR /usr/local/man/de/man1/cas.1.gz
-rm -fR /usr/local/man/de/man1/ed2k.1.gz
-rm -fR /usr/local/man/de/man1/wxcas.1.gz
-rm -fR /usr/local/man/de/man1/xas.1.gz
-rm -fR /usr/local/man/es/man1/alc.1.gz
-rm -fR /usr/local/man/es/man1/alcc.1.gz
-rm -fR /usr/local/man/es/man1/amule.1.gz
-rm -fR /usr/local/man/es/man1/amulecmd.1.gz
-rm -fR /usr/local/man/es/man1/amuleweb.1.gz
-rm -fR /usr/local/man/es/man1/cas.1.gz
-rm -fR /usr/local/man/es/man1/ed2k.1.gz
-rm -fR /usr/local/man/es/man1/wxcas.1.gz
-rm -fR /usr/local/man/es/man1/xas.1.gz
-rm -fR /usr/local/man/fr/man1/alc.1.gz
-rm -fR /usr/local/man/fr/man1/alcc.1.gz
-rm -fR /usr/local/man/fr/man1/amule.1.gz
-rm -fR /usr/local/man/fr/man1/amulecmd.1.gz
-rm -fR /usr/local/man/fr/man1/amuleweb.1.gz
-rm -fR /usr/local/man/fr/man1/cas.1.gz
-rm -fR /usr/local/man/fr/man1/ed2k.1.gz
-rm -fR /usr/local/man/fr/man1/wxcas.1.gz
-rm -fR /usr/local/man/fr/man1/xas.1.gz
-rm -fR /usr/local/man/hu/man1/alc.1.gz
-rm -fR /usr/local/man/hu/man1/alcc.1.gz
-rm -fR /usr/local/man/hu/man1/amule.1.gz
-rm -fR /usr/local/man/hu/man1/amulecmd.1.gz
-rm -fR /usr/local/man/hu/man1/amuleweb.1.gz
-rm -fR /usr/local/man/hu/man1/cas.1.gz
-rm -fR /usr/local/man/hu/man1/ed2k.1.gz
-rm -fR /usr/local/man/hu/man1/wxcas.1.gz
-rm -fR /usr/local/man/hu/man1/xas.1.gz
-rm -fR /usr/local/man/man1/alc.1.gz
-rm -fR /usr/local/man/man1/alcc.1.gz
-rm -fR /usr/local/man/man1/amule.1.gz
-rm -fR /usr/local/man/man1/amulecmd.1.gz
-rm -fR /usr/local/man/man1/amuleweb.1.gz
-rm -fR /usr/local/man/man1/cas.1.gz
-rm -fR /usr/local/man/man1/ed2k.1.gz
-rm -fR /usr/local/man/man1/wxcas.1.gz
-rm -fR /usr/local/man/man1/xas.1.gz
-rm -fR /usr/local/share/amule
-#rm -fR /usr/local/share/applications/alc.desktop
-#rm -fR /usr/local/share/applications/amule.desktop
-#rm -fR /usr/local/share/applications/wxcas.desktop
-rm -fR /usr/local/share/cas
-rm -fR /usr/local/share/doc/aMule*
-rm -fR /usr/local/share/pixmaps/alc.xpm
-rm -fR /usr/local/share/pixmaps/wxcas.xpm
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="amule.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/amule/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/amule/overlay-dir/PBI.SetupScript.sh	2009-01-13 20:07:07 UTC (rev 3243)
+++ pbibuild/modules/amule/overlay-dir/PBI.SetupScript.sh	2009-01-13 20:30:45 UTC (rev 3244)
@@ -14,90 +14,13 @@
 # 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/alc /usr/local/bin/alc
-ln -s /Programs/${PROGDIR}/.sbin/alcc /usr/local/bin/alcc
-ln -s /Programs/${PROGDIR}/.sbin/amule /usr/local/bin/amule
-ln -s /Programs/${PROGDIR}/.sbin/amulecmd /usr/local/bin/amulecmd
-ln -s /Programs/${PROGDIR}/.sbin/amuleweb /usr/local/bin/amuleweb
-ln -s /Programs/${PROGDIR}/.sbin/cas /usr/local/bin/cas
-ln -s /Programs/${PROGDIR}/.sbin/ed2k /usr/local/bin/ed2k
-ln -s /Programs/${PROGDIR}/.sbin/wxcas /usr/local/bin/wxcas
-ln -s /Programs/${PROGDIR}/lib/xchat/plugins/xas.pl /usr/local/lib/xchat/plugins/xas.pl
-ln -s /Programs/${PROGDIR}/man/de/man1/alc.1.gz /usr/local/man/de/man1/alc.1.gz
-ln -s /Programs/${PROGDIR}/man/de/man1/alcc.1.gz /usr/local/man/de/man1/alcc.1.gz
-ln -s /Programs/${PROGDIR}/man/de/man1/amule.1.gz /usr/local/man/de/man1/amule.1.gz
-ln -s /Programs/${PROGDIR}/man/de/man1/amulecmd.1.gz /usr/local/man/de/man1/amulecmd.1.gz
-ln -s /Programs/${PROGDIR}/man/de/man1/amuleweb.1.gz /usr/local/man/de/man1/amuleweb.1.gz
-ln -s /Programs/${PROGDIR}/man/de/man1/cas.1.gz /usr/local/man/de/man1/cas.1.gz
-ln -s /Programs/${PROGDIR}/man/de/man1/ed2k.1.gz /usr/local/man/de/man1/ed2k.1.gz
-ln -s /Programs/${PROGDIR}/man/de/man1/wxcas.1.gz /usr/local/man/de/man1/wxcas.1.gz
-ln -s /Programs/${PROGDIR}/man/de/man1/xas.1.gz /usr/local/man/de/man1/xas.1.gz
-ln -s /Programs/${PROGDIR}/man/es/man1/alc.1.gz /usr/local/man/es/man1/alc.1.gz
-ln -s /Programs/${PROGDIR}/man/es/man1/alcc.1.gz /usr/local/man/es/man1/alcc.1.gz
-ln -s /Programs/${PROGDIR}/man/es/man1/amule.1.gz /usr/local/man/es/man1/amule.1.gz
-ln -s /Programs/${PROGDIR}/man/es/man1/amulecmd.1.gz /usr/local/man/es/man1/amulecmd.1.gz
-ln -s /Programs/${PROGDIR}/man/es/man1/amuleweb.1.gz /usr/local/man/es/man1/amuleweb.1.gz
-ln -s /Programs/${PROGDIR}/man/es/man1/cas.1.gz /usr/local/man/es/man1/cas.1.gz
-ln -s /Programs/${PROGDIR}/man/es/man1/ed2k.1.gz /usr/local/man/es/man1/ed2k.1.gz
-ln -s /Programs/${PROGDIR}/man/es/man1/wxcas.1.gz /usr/local/man/es/man1/wxcas.1.gz
-ln -s /Programs/${PROGDIR}/man/es/man1/xas.1.gz /usr/local/man/es/man1/xas.1.gz
-ln -s /Programs/${PROGDIR}/man/fr/man1/alc.1.gz /usr/local/man/fr/man1/alc.1.gz
-ln -s /Programs/${PROGDIR}/man/fr/man1/alcc.1.gz /usr/local/man/fr/man1/alcc.1.gz
-ln -s /Programs/${PROGDIR}/man/fr/man1/amule.1.gz /usr/local/man/fr/man1/amule.1.gz
-ln -s /Programs/${PROGDIR}/man/fr/man1/amulecmd.1.gz /usr/local/man/fr/man1/amulecmd.1.gz
-ln -s /Programs/${PROGDIR}/man/fr/man1/amuleweb.1.gz /usr/local/man/fr/man1/amuleweb.1.gz
-ln -s /Programs/${PROGDIR}/man/fr/man1/cas.1.gz /usr/local/man/fr/man1/cas.1.gz
-ln -s /Programs/${PROGDIR}/man/fr/man1/ed2k.1.gz /usr/local/man/fr/man1/ed2k.1.gz
-ln -s /Programs/${PROGDIR}/man/fr/man1/wxcas.1.gz /usr/local/man/fr/man1/wxcas.1.gz
-ln -s /Programs/${PROGDIR}/man/fr/man1/xas.1.gz /usr/local/man/fr/man1/xas.1.gz
-ln -s /Programs/${PROGDIR}/man/hu/man1/alc.1.gz /usr/local/man/hu/man1/alc.1.gz
-ln -s /Programs/${PROGDIR}/man/hu/man1/alcc.1.gz /usr/local/man/hu/man1/alcc.1.gz
-ln -s /Programs/${PROGDIR}/man/hu/man1/amule.1.gz /usr/local/man/hu/man1/amule.1.gz
-ln -s /Programs/${PROGDIR}/man/hu/man1/amulecmd.1.gz /usr/local/man/hu/man1/amulecmd.1.gz
-ln -s /Programs/${PROGDIR}/man/hu/man1/amuleweb.1.gz /usr/local/man/hu/man1/amuleweb.1.gz
-ln -s /Programs/${PROGDIR}/man/hu/man1/cas.1.gz /usr/local/man/hu/man1/cas.1.gz
-ln -s /Programs/${PROGDIR}/man/hu/man1/ed2k.1.gz /usr/local/man/hu/man1/ed2k.1.gz
-ln -s /Programs/${PROGDIR}/man/hu/man1/wxcas.1.gz /usr/local/man/hu/man1/wxcas.1.gz
-ln -s /Programs/${PROGDIR}/man/hu/man1/xas.1.gz /usr/local/man/hu/man1/xas.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/alc.1.gz /usr/local/man/man1/alc.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/alcc.1.gz /usr/local/man/man1/alcc.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/amule.1.gz /usr/local/man/man1/amule.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/amulecmd.1.gz /usr/local/man/man1/amulecmd.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/amuleweb.1.gz /usr/local/man/man1/amuleweb.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/cas.1.gz /usr/local/man/man1/cas.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/ed2k.1.gz /usr/local/man/man1/ed2k.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/wxcas.1.gz /usr/local/man/man1/wxcas.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/xas.1.gz /usr/local/man/man1/xas.1.gz
-ln -s /Programs/${PROGDIR}/share/amule /usr/local/share/amule
-#ln -s /Programs/${PROGDIR}/share/applications/alc.desktop /usr/local/share/applications/alc.desktop
-#ln -s /Programs/${PROGDIR}/share/applications/amule.desktop /usr/local/share/applications/amule.desktop
-#ln -s /Programs/${PROGDIR}/share/applications/wxcas.desktop /usr/local/share/applications/wxcas.desktop
-ln -s /Programs/${PROGDIR}/share/cas /usr/local/share/cas
-ln -s /Programs/${PROGDIR}/share/doc/aMule* /usr/local/share/doc/
-ln -s /Programs/${PROGDIR}/share/pixmaps/alc.xpm /usr/local/share/pixmaps/alc.xpm
-ln -s /Programs/${PROGDIR}/share/pixmaps/wxcas.xpm /usr/local/share/pixmaps/wxcas.xpm
 
-# Copy over all the LANG files
-LANGFILE="amule.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-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
 
-#LameFixing for .met bug in aMule 2.1.3
-cd /home
-for i in `ls`
-do
-  if [ ! -e "/home/${i}/.aMule" ]
-  then
-   mkdir /home/${i}/.aMule
-  fi
-
-  tar xvf /Programs/${PROGDIR}/servers.met.tar -C /home/${i}/.aMule/
-
-  chown -R ${i}:${i} /home/${i}/.aMule
-done
-
-echo "LAUNCHCLOSE: /usr/local/bin/amule"
+echo "LAUNCHCLOSE: /Programs/bin/amule"

Modified: pbibuild/modules/amule/pbi.conf
===================================================================
--- pbibuild/modules/amule/pbi.conf	2009-01-13 20:07:07 UTC (rev 3243)
+++ pbibuild/modules/amule/pbi.conf	2009-01-13 20:30:45 UTC (rev 3244)
@@ -25,13 +25,13 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
 MAKEOPTS=""
 
 # 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="24"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list