[PC-BSD Commits] r3379 - in pbibuild/modules/pgadmin: . overlay-dir overlay-dir/bin

[svn at pcbsd.org]

Author: kris
Date: 2009-01-30 12:05:10 -0800 (Fri, 30 Jan 2009)
New Revision: 3379

Modified:
   pbibuild/modules/pgadmin/build.sh
   pbibuild/modules/pgadmin/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/pgadmin/overlay-dir/bin/pgadmin3.sh
   pbibuild/modules/pgadmin/pbi.conf
Log:

Fixed a few bugs creating pgadmin, and launching it properly



Modified: pbibuild/modules/pgadmin/build.sh
===================================================================
--- pbibuild/modules/pgadmin/build.sh	2009-01-30 19:58:11 UTC (rev 3378)
+++ pbibuild/modules/pgadmin/build.sh	2009-01-30 20:05:10 UTC (rev 3379)
@@ -9,3 +9,8 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
+# Save the right version number in the pgadmin3.sh script
+MODFILE="${PBIDIR}/bin/pgadmin3.sh"
+sed -e "s,CHANGEME,pgAdmin${PORTVER},g" ${MODFILE} > ${MODFILE}.tmp
+mv ${MODFILE}.tmp ${MODFILE}
+chmod 755 ${MODFILE}

Modified: pbibuild/modules/pgadmin/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/pgadmin/overlay-dir/PBI.SetupScript.sh	2009-01-30 19:58:11 UTC (rev 3378)
+++ pbibuild/modules/pgadmin/overlay-dir/PBI.SetupScript.sh	2009-01-30 20:05:10 UTC (rev 3379)
@@ -22,4 +22,4 @@
   ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
 fi
 
-echo "LAUNCHCLOSE: /Programs/bin/pgadmin3"
+echo "LAUNCHCLOSE: /Programs/bin/pgadmin3.sh"

Modified: pbibuild/modules/pgadmin/overlay-dir/bin/pgadmin3.sh
===================================================================
--- pbibuild/modules/pgadmin/overlay-dir/bin/pgadmin3.sh	2009-01-30 19:58:11 UTC (rev 3378)
+++ pbibuild/modules/pgadmin/overlay-dir/bin/pgadmin3.sh	2009-01-30 20:05:10 UTC (rev 3379)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PROGDIR="CHANGE"
+PROGDIR=CHANGEME
 
 # Unset the LANG variable if its set to en, which is default
 if [ "$LANG" = "en_US" ]

Modified: pbibuild/modules/pgadmin/pbi.conf
===================================================================
--- pbibuild/modules/pgadmin/pbi.conf	2009-01-30 19:58:11 UTC (rev 3378)
+++ pbibuild/modules/pgadmin/pbi.conf	2009-01-30 20:05:10 UTC (rev 3379)
@@ -32,6 +32,6 @@
 
 # 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="01"
+BUILDKEY="02"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY