Changeset 3937 for trunk/base

Timestamp:

Nov 13, 2003, 3:17:55 PM (20 years ago)

Author:

fkr

Message:

Bug:
Submitted by:
Reviewed by:
Approved by:
Obtained from:

enable --with-dports-dir.
Attention: this changes the default behavior upon installation, since it will
configure $PREFIX/$portconfigdir/sources.conf (commonly /etc/ports/sources.conf)
If you don't re-install (and remove your old sources.conf prior to that), this won't affect you.
(and it should not, since you most likely have a already configured sources.conf).
By default, it will add the dports-tree from your checked out copy from which you install
to sources.conf.

Location:

trunk/base

Files:

• aclocal.m4 (modified) (1 diff)
• configure.ac (modified) (1 diff)
• doc/Makefile (modified) (1 diff)

trunk/base/aclocal.m4

@@ -6 +6 @@
 # OD_PATH_DPORTSDIR(DEFAULT_DPORTSDIR)
 #---------------------------------------
-# AC_DEFUN([OD_PATH_DPORTSDIR],[
-#       dnl For ease of reading, run after gcc has been found/configured
-#       AC_REQUIRE([AC_PROG_CC])
-
-#       AC_ARG_WITH(dports-dir, [AC_HELP_STRING([--with-dports-dir=DIR], [Specify alternate dports directory])], [ dportsdir="$withval" ] )
-
-
-#       AC_MSG_CHECKING([for dports tree])
-        
-#       if test "x$dportsdir" != "x" ; then
-#         if test -d "$dportsdir" -a -e "$dportsdir/PortIndex" ; then
-#               :
-#         else
-#               AC_MSG_ERROR([$dportsdir not a valid dports tree])
-#         fi
-#       else
-#               dnl If the user didn't give a path, look for default
-#               if test "x$1" != "x" ; then
-#                 if test -d "$1" -a -e "$1/PortIndex" ; then
-#                       dportsdir=$1
-#                 fi
-#               fi
-#       fi
-
-#       if test "x$dportsdir" != "x" ; then
-#               AC_MSG_RESULT($dportsdir)
-#               DPORTSDIR="$dportsdir"
-#               AC_SUBST(DPORTSDIR)
-#       else
-#               AC_MSG_WARN([No dports tree found])
-#       fi
-
-#         ])
+ AC_DEFUN([OD_PATH_DPORTSDIR],[
+        dnl For ease of reading, run after gcc has been found/configured
+        AC_REQUIRE([AC_PROG_CC])
+
+        AC_ARG_WITH(dports-dir, [AC_HELP_STRING([--with-dports-dir=DIR], [Specify alternate dports directory])], [ dportsdir="$withval" ] )
+
+
+        AC_MSG_CHECKING([for dports tree])
+        if test "x$dportsdir" != "x" ; then
+          if test -d "$dportsdir" -a -e "$dportsdir/PortIndex" ; then
+                :
+          else
+                AC_MSG_ERROR([$dportsdir not a valid dports tree])
+          fi
+        else
+                dnl If the user didn't give a path, look for default
+                if test "x$1" != "x" ; then
+                  if test -d "$1" -a -e "$1/PortIndex" ; then
+                        dportsdir=$1
+                  fi
+                fi
+        fi
+
+        if test "x$dportsdir" != "x" ; then
+                AC_MSG_RESULT($dportsdir)
+                DPORTSDIR="$dportsdir"
+                AC_SUBST(DPORTSDIR)
+        else
+                AC_MSG_WARN([No dports tree found])
+        fi
+
+         ])
 
 

trunk/base/configure.ac

@@ -18 +18 @@
 OD_LIB_MD5
 
+# set default dports-directory
+DPORTS_DIR_DEFAULT=`pwd | sed -e "s/base/dports/"`
+
 # Check for paths
 AC_PREFIX_DEFAULT(/opt/local)
+OD_PATH_DPORTSDIR([$DPORTS_DIR_DEFAULT])
 OD_PATH_PORTCONFIGDIR([/etc/ports], [$prefix])
 

trunk/base/doc/Makefile

@@ -21 +21 @@
                 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 ports.conf ${DESTDIR}${portconfigdir}; \
         fi
-
+        
         $(SILENT)if test ! -e ${DESTDIR}${portconfigdir}/sources.conf ; then \
                 set -x; \
                 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 sources.conf ${DESTDIR}${portconfigdir}; \
+                echo "file://${dportsdir}" >> ${DESTDIR}${portconfigdir}/sources.conf; \
         fi
         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${DESTDIR}${portconfigdir}