Changeset 1040 in MondoRescue

Timestamp:

Jan 7, 2007, 12:20:30 AM (18 years ago)

Author:

Bruno Cornec

Message:

FreeBSD fixes

Location:

branches/stable/tools

Files:

• build2pkg (modified) (1 diff)
• distro-env (modified) (2 diffs)

branches/stable/tools/build2pkg

@@ -125 +125 @@
         export pkg="$pkg $p-${PVER}.deb"
         # Et voila !
-    elif [  _"$dtype" = _"freebsd" ]; then
+    elif [  _"$dtype" = _"port" ]; then
+        cd $TOPBUILDDIR
+        tar xfz $src
+        cd ${p}-${PVER}
+        mv distributions/${ddir}-$dver/* $TOPBUILDDIR
+        cd ..
+        rm -rf ${p}-${PVER}
+        make DISTDIR=$TOPBUILDDIR
     elif [  _"$dfam" = _"slackware" ]; then
         mkdir -p $TOPBUILDDIR/build-${p}/install

branches/stable/tools/distro-env

@@ -61 +61 @@
             export dver = "sid"
         fi
-    elif [ -e /etc/motd && grep -q FreeBSD /etc/motd ]; then
-        export ddir="freebsd"
-        export dver=`awk '{print $2}' /etc/motd | cut -d- -f1`
+    elif [ -e /etc/motd ]; then
+        grep -q FreeBSD /etc/motd
+        if [ $? -eq 0 ]; then
+            export ddir="freebsd"
+            export dver=`awk '{print $2}' /etc/motd | cut -d- -f1`
+        else
+            export ddir="unknown"
+            export dver=""
+        fi
     else
         export ddir="unknown"
@@ -145 +151 @@
 elif [ _"$dtype" = _"deb" ]; then
     mkdir -p ${TOPBUILDDIR}
+elif [ _"$dtype" = _"port" ]; then
+    mkdir -p ${TOPBUILDDIR}
 elif [ _"$dfam" = _"slackware" ]; then
     mkdir -p ${TOPBUILDDIR}