[PC-BSD Commits] r3031 - pbibuild/pbibuilder/scripts

[svn at pcbsd.org]

Author: kris
Date: 2008-12-02 09:54:55 -0800 (Tue, 02 Dec 2008)
New Revision: 3031

Modified:
   pbibuild/pbibuilder/scripts/2.1.startmake.sh
   pbibuild/pbibuilder/scripts/3.makepbi.sh
Log:

Updated our pbibuilder scripts a bit more, to fix finding the PORTVERSION when
Makefile's are not formatted properly, and stop auto-building qmake for each PBI as well



Modified: pbibuild/pbibuilder/scripts/2.1.startmake.sh
===================================================================
--- pbibuild/pbibuilder/scripts/2.1.startmake.sh	2008-12-02 17:36:16 UTC (rev 3030)
+++ pbibuild/pbibuilder/scripts/2.1.startmake.sh	2008-12-02 17:54:55 UTC (rev 3031)
@@ -134,13 +134,13 @@
 ln -s /usr/local /usr/X11R6
 
 # Make gmake first, since almost all progs require it
-cd /usr/ports/devel/gmake
-make clean
-make install
+#cd /usr/ports/devel/gmake
+#make clean
+#make install
 
-cd /usr/ports/devel/qmake
-make clean
-make install
+#cd /usr/ports/devel/qmake
+#make clean
+#make install
 
 # Cd to the port and start the build
 cd ${PBIPORT}

Modified: pbibuild/pbibuilder/scripts/3.makepbi.sh
===================================================================
--- pbibuild/pbibuilder/scripts/3.makepbi.sh	2008-12-02 17:36:16 UTC (rev 3030)
+++ pbibuild/pbibuilder/scripts/3.makepbi.sh	2008-12-02 17:54:55 UTC (rev 3031)
@@ -60,20 +60,20 @@
 if [ ! -z "${VERKEY}" ]
 then
  # Now try the supplied VERKEY strings
- PORTVER="`grep $VERKEY ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
+ PORTVER="`grep $VERKEY ${PDESTDIR}/${PBIPORT}/Makefile | tr -d '\t' | tr -d ' ' | cut -d '=' -f 2`"
 fi
 
 if [ -z "${PORTVER}" ]
 then
  # Get the port version number
- PORTVER="`grep DISTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
+ PORTVER="`grep DISTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | tr -d '\t' | tr -d ' ' | cut -d '=' -f 2`"
 fi
 
 if [ -z "${PORTVER}" ]
 then
 
  # Now try the PORTVERSION= line
- PORTVER="`grep PORTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`" 
+ PORTVER="`grep PORTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | tr -d '\t' | tr -d ' ' | cut -d '=' -f 2`" 
  if [ -z "$PORTVER" -o "${PORTVER}" = " " ]
  then
    PORTVER="`grep PORTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 3`" 
@@ -84,7 +84,7 @@
 if [ -z "${PORTVER}" ]
 then
  # Now try the DISTVERSION?= line
- PORTVER="`grep DISTVERSION?= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
+ PORTVER="`grep DISTVERSION?= ${PDESTDIR}/${PBIPORT}/Makefile | tr -d '\t' | tr -d ' ' | cut -d '=' -f 2`"
 fi
 
 
@@ -92,7 +92,7 @@
 cat ${PDESTDIR}/${PBIPORT}/Makefile | grep "PORTREVISION="
 if [ "$?" = "0" ]
 then
-  PORTREV="`grep PORTREVISION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`" 
+  PORTREV="`grep PORTREVISION= ${PDESTDIR}/${PBIPORT}/Makefile | tr -d '\t' | tr -d ' ' | cut -d '=' -f 2`" 
   PORTVER="${PORTVER}_${PORTREV}" ; export PORTVER
 fi