bye bye src url. Never amounted to much, we went another road a while ago

diff --git a/usr.sbin/pkg_add/Makefile b/usr.sbin/pkg_add/Makefile
index 90ecff5..8a11794 100644 (file)
--- a/usr.sbin/pkg_add/Makefile
+++ b/usr.sbin/pkg_add/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.81 2014/07/13 15:58:40 espie Exp $
+# $OpenBSD: Makefile,v 1.82 2014/07/13 17:24:06 espie Exp $
 
 .include <bsd.own.mk>
 
@@ -37,7 +37,6 @@ PACKAGES= \
     OpenBSD/PackageRepository/Installed.pm \
     OpenBSD/PackageRepository/Persistant.pm \
     OpenBSD/PackageRepository/SCP.pm \
-    OpenBSD/PackageRepository/Source.pm \
     OpenBSD/PackageRepositoryList.pm \
     OpenBSD/PackingElement.pm \
     OpenBSD/PackingList.pm \

diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
index f841801..d47dfe2 100644 (file)
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageRepository.pm,v 1.110 2014/03/18 18:53:29 espie Exp $
+# $OpenBSD: PackageRepository.pm,v 1.111 2014/07/13 17:24:06 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -114,10 +114,6 @@ sub parse
                require OpenBSD::PackageRepository::SCP;
 
                return $class->scp->parse_fullurl($r, $state);
-       } elsif ($u =~ m/^src\:/io) {
-               require OpenBSD::PackageRepository::Source;
-
-               return $class->source->parse_fullurl($r, $state);
        } elsif ($u =~ m/^file\:/io) {
                return $class->file->parse_fullurl($r, $state);
        } elsif ($u =~ m/^inst\:$/io) {

diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm
deleted file mode 100644 (file)
index a1ef273..0000000
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm
+++ /dev/null
@@ -1,79 +0,0 @@
-# ex:ts=8 sw=4:
-# $OpenBSD: Source.pm,v 1.13 2010/06/30 10:51:04 espie Exp $
-#
-# Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-use strict;
-use warnings;
-
-package OpenBSD::PackageRepository::Source;
-our @ISA=(qw(OpenBSD::PackageRepository));
-use OpenBSD::PackageInfo;
-use OpenBSD::Paths;
-
-sub urlscheme
-{
-       return 'src';
-}
-
-sub build_package
-{
-       my ($self, $pkgpath) = @_;
-
-       my $dir;
-       my $make;
-       if (defined $ENV{'MAKE'}) {
-               $make = $ENV{'MAKE'};
-       } else {
-               $make = OpenBSD::Paths->make;
-       }
-       if (defined $self->{baseurl} && $self->{baseurl} ne '') {
-               $dir = $self->{baseurl}
-       } elsif (defined $ENV{PORTSDIR}) {
-               $dir = $ENV{PORTSDIR};
-       } else {
-               $dir = OpenBSD::Paths->portsdir;
-       }
-       # figure out the repository name and the pkgname
-       my $pkgfile = `cd $dir && SUBDIR=$pkgpath ECHO_MSG=: $make show=PKGFILE`;
-       chomp $pkgfile;
-       if (! -f $pkgfile) {
-               system "cd $dir && SUBDIR=$pkgpath $make package BULK=Yes PKGDB_LOCK='-F nolock' FETCH_PACKAGES=No";
-       }
-       if (! -f $pkgfile) {
-               return undef;
-       }
-       $pkgfile =~ m|(.*/)([^/]*)|o;
-       my ($base, $fname) = ($1, $2);
-
-       my $repo = OpenBSD::PackageRepository::Local->_new($base);
-       return $repo;
-}
-
-sub match_locations
-{
-       my ($self, $search, @filters) = @_;
-       my $built;
-
-       if (defined $search->{pkgpath}) {
-               $built = $self->build_package($search->{pkgpath});
-       }
-       if ($built) {
-               return $built->match_locations($search, @filters);
-       }
-       return ();
-}
-
-1;