diff options
author | flz <flz@FreeBSD.org> | 2008-06-16 23:41:11 +0000 |
---|---|---|
committer | flz <flz@FreeBSD.org> | 2008-06-16 23:41:11 +0000 |
commit | ffdd95144d91bbe70b7085db0ac76bac74571854 (patch) | |
tree | 80025785a72ffe15367413befe15285f7296a16b /usr.sbin/pkg_install/lib | |
parent | c4c883e016f0453aa584a7763e605740ff247840 (diff) | |
download | FreeBSD-src-ffdd95144d91bbe70b7085db0ac76bac74571854.zip FreeBSD-src-ffdd95144d91bbe70b7085db0ac76bac74571854.tar.gz |
Remove support for RELENG_4 (__FreeBSD_version < 500039).
MFC after: 1 day
Diffstat (limited to 'usr.sbin/pkg_install/lib')
-rw-r--r-- | usr.sbin/pkg_install/lib/file.c | 4 | ||||
-rw-r--r-- | usr.sbin/pkg_install/lib/url.c | 12 |
2 files changed, 0 insertions, 16 deletions
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c index e406caa..0b74ddf 100644 --- a/usr.sbin/pkg_install/lib/file.c +++ b/usr.sbin/pkg_install/lib/file.c @@ -350,11 +350,7 @@ unpack(const char *pkg, const char *flist) } } else -#if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 comp = "-j"; -#else - comp = "-z"; -#endif if (vsystem("/usr/bin/tar -xp %s -f '%s' %s", comp, pkg, flist ? flist : "")) { warnx("tar extract of %s failed!", pkg); return 1; diff --git a/usr.sbin/pkg_install/lib/url.c b/usr.sbin/pkg_install/lib/url.c index 29e9beb..1cf5d31 100644 --- a/usr.sbin/pkg_install/lib/url.c +++ b/usr.sbin/pkg_install/lib/url.c @@ -72,11 +72,7 @@ fileGetURL(const char *base, const char *spec, int keep_package) *(cp + 1) = '\0'; strcat(cp, "All/"); strcat(cp, spec); -#if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 strcat(cp, ".tbz"); -#else - strcat(cp, ".tgz"); -#endif } else return NULL; @@ -88,11 +84,7 @@ fileGetURL(const char *base, const char *spec, int keep_package) */ strcpy(fname, hint); strcat(fname, spec); -#if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 strcat(fname, ".tbz"); -#else - strcat(fname, ".tgz"); -#endif } } else @@ -141,11 +133,7 @@ fileGetURL(const char *base, const char *spec, int keep_package) for (fd = getdtablesize() - 1; fd >= 3; --fd) close(fd); execl("/usr/bin/tar", "tar", -#if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 Verbose ? "-xpjvf" : "-xpjf", -#else - Verbose ? "-xpzvf" : "-xpzf", -#endif "-", (char *)0); _exit(2); } |