Changeset 123004

Timestamp:

Aug 3, 2014, 6:55:09 PM (10 years ago)

Author:

afb@…

Message:

base: remove package support for rpm and deb

Location:

trunk/base

Files:

• doc/port.1 (modified) (1 diff)
• doc/port.1.txt (modified) (1 diff)
• doc/prefix.mtree.in (modified) (1 diff)
• portmgr/packaging/SETUP.chroot.sh (modified) (1 diff)
• portmgr/packaging/buildall.sh (modified) (3 diffs)
• portmgr/packaging/dpkgall.tcl (deleted)
• portmgr/packaging/rpmall.tcl (deleted)
• src/macports1.0/macports.tcl (modified) (2 diffs)
• src/package1.0/Makefile.in (modified) (1 diff)
• src/package1.0/package.tcl (modified) (1 diff)
• src/package1.0/portdpkg.tcl (deleted)
• src/package1.0/portrpm.tcl (deleted)
• src/package1.0/portsrpm.tcl (deleted)
• src/package1.0/tests/portdpkg.test (deleted)
• src/port/port.tcl (modified) (1 diff)
• src/port1.0/portsandbox.tcl (modified) (2 diffs)
• src/port1.0/portutil.tcl (modified) (1 diff)

trunk/base/doc/port.1

@@ -1244 +1244 @@
 and its dependencies\&.
 .RE
-.PP
-rpm
-.RS 4
-Creates an RPM binary package of
-\fIportname\fR, similar to a tgz \(lqarchive\(rq\&.
-.RE
-.PP
-srpm
-.RS 4
-Creates a SRPM source package of
-\fIportname\fR, similar to a xar \(lqportpkg\(rq\&.
-.RE
-.PP
-dpkg
-.RS 4
-Creates a DEB binary package of
-\fIportname\fR\&.
-.RE
 .SH "EXAMPLES"
 .sp

trunk/base/doc/port.1.txt

@@ -639 +639 @@
     'portname' and its dependencies.
 
-rpm::
-    Creates an RPM binary package of 'portname', similar to a tgz ``archive''.
-
-srpm::
-    Creates a SRPM source package of 'portname', similar to a xar ``portpkg''.
-
-dpkg::
-    Creates a DEB binary package of 'portname'.
-
 
 EXAMPLES

trunk/base/doc/prefix.mtree.in

@@ -238 +238 @@
         ..
     ..
-    src
-    ..
     var
     ..

trunk/base/portmgr/packaging/SETUP.chroot.sh

@@ -32 +32 @@
 mkdir -p /darwinports/pkgs
 mkdir -p /darwinports/mpkgs
-mkdir -p /darwinports/rpms
 
 cd $HOME/darwinports

trunk/base/portmgr/packaging/buildall.sh

@@ -98 +98 @@
 echo "BatchMode yes" >> /etc/ssh_config
 EOF
-        if [ "$PKGTYPE" = "dpkg" ]; then
-            echo "/opt/local/bin/port install dpkg" >> $dir/bootstrap.sh
-        fi
         chmod 755 $dir/bootstrap.sh
         echo "Bootstrapping darwinports in chroot"
@@ -138 +135 @@
 # main:  This is where we start the show.
 TGTPORTS=""
-PKGTYPE=rpmpackage
+PKGTYPE=mpkg
 
 if [ $# -lt 1 ]; then
@@ -208 +205 @@
                 if [ "$PKGTYPE" = "mpkg" ]; then
                     mv $DIR/Package/*.mpkg outputdir/Packages/
-                elif [ "$PKGTYPE" = "rpmpackage" ]; then
-                    mv $DIR/Package/RPMS/${ARCH}/*.rpm outputdir/Packages/
-                elif [ "$PKGTYPE" = "dpkg" ]; then
-                    mv $DIR/Package/*.deb outputdir/Packages/
                 fi
                 type="succeeded"

trunk/base/src/macports1.0/macports.tcl

@@ -3362 +3362 @@
         mdmg -
         pkg -
-        mpkg -
-        rpm -
-        dpkg -
-        srpm {return 1}
+        mpkg {return 1}
         default {return 0}
     }
@@ -3380 +3377 @@
         build       {return "depends_fetch depends_extract depends_build depends_lib"}
         test        -
-        srpm        -
         destroot    {return "depends_fetch depends_extract depends_build depends_lib depends_run"}
         dmg         -
         pkg         -
         mdmg        -
-        mpkg        -
-        rpm         -
-        dpkg        {
+        mpkg        {
             if {[global_option_isset ports_binary_only] ||
                 (![global_option_isset ports_source_only] && [$workername eval _archive_available])} {

trunk/base/src/package1.0/Makefile.in

@@ -7 +7 @@
 
 SRCS=   package.tcl portdmg.tcl portmdmg.tcl portmpkg.tcl portpkg.tcl \
-        portrpm.tcl portsrpm.tcl portdpkg.tcl portunarchive.tcl \
+        portunarchive.tcl \
         portarchivefetch.tcl
 

trunk/base/src/package1.0/package.tcl

@@ -34 +34 @@
 package provide mp_package 1.0
 
-package require portrpm 1.0
-package require portsrpm 1.0
 package require portpkg 1.0
 package require portmpkg 1.0
 package require portdmg 1.0
 package require portmdmg 1.0
-package require portdpkg 1.0
 package require portarchivefetch 1.0
 package require portunarchive 1.0

trunk/base/src/port/port.tcl

@@ -4258 +4258 @@
     dmg         [list action_target         [ACTION_ARGS_PORTS]] \
     mdmg        [list action_target         [ACTION_ARGS_PORTS]] \
-    dpkg        [list action_target         [ACTION_ARGS_PORTS]] \
     mpkg        [list action_target         [ACTION_ARGS_PORTS]] \
     pkg         [list action_target         [ACTION_ARGS_PORTS]] \
     portpkg     [list action_target         [ACTION_ARGS_PORTS]] \
-    rpm         [list action_target         [ACTION_ARGS_PORTS]] \
-    srpm        [list action_target         [ACTION_ARGS_PORTS]] \
     \
     quit        [list action_exit           [ACTION_ARGS_NONE]] \

trunk/base/src/port1.0/portsandbox.tcl

@@ -44 +44 @@
 proc portsandbox::set_profile {target} {
     global os.major portsandbox_profile workpath distpath altprefix \
-        package.destpath configure.ccache ccache_dir rpm.srcdir rpm.tmpdir
+        package.destpath configure.ccache ccache_dir
 
     switch $target {
@@ -74 +74 @@
             }
         }
-        rpm -
-        srpm {
-            set allow_dirs [list ${rpm.srcdir} ${rpm.tmpdir}]
-        }
     }
 

trunk/base/src/port1.0/portutil.tcl

@@ -1458 +1458 @@
                         portpkg     -
                         mpkg        -
-                        rpm         -
-                        srpm        -
-                        dpkg        -
                         mdmg        -
                         ""          { set deptypes "depends_fetch depends_extract depends_lib depends_build depends_run" }