commit 7b4d21f4e3fe016a411da3f8b1081f32b1894a77 Author: Florent Thoumie Date: Thu Apr 17 01:18:03 2008 +0100 Remove support for FreeBSD 5.x. Remove support for FreeBSD. Default compression used to be gzip. Get rid of this special case when FreeBSD_version < 500039. Signed-off-by: Florent Thoumie diff --git a/add/main.c b/add/main.c index fb917c4..bf77f4f 100644 --- a/add/main.c +++ b/add/main.c @@ -223,12 +223,7 @@ main(int argc, char **argv) if (!((ptr = strrchr(remotepkg, '.')) && ptr[1] == 't' && (ptr[2] == 'b' || ptr[2] == 'g') && ptr[3] == 'z' && !ptr[4])) - if (strlcat(remotepkg, -#if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 - ".tbz", -#else - ".tgz", -#endif + if (strlcat(remotepkg, ".tbz", sizeof(temppackageroot)) >= sizeof(temppackageroot)) errx(1, "package name too long"); } diff --git a/add/perform.c b/add/perform.c index b99ce2c..ece3e95 100644 --- a/add/perform.c +++ b/add/perform.c @@ -308,11 +308,7 @@ pkg_do(char *pkg) ext = strrchr(pkg_fullname, '.'); if (ext == NULL) -#if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 ext = ".tbz"; -#else - ext = ".tgz"; -#endif snprintf(path, FILENAME_MAX, "%s/%s%s", getenv("_TOP"), p->name, ext); if (fexists(path)) cp = path; diff --git a/create/main.c b/create/main.c index ac93c2a..926048d 100644 --- a/create/main.c +++ b/create/main.c @@ -43,11 +43,7 @@ int PlistOnly = FALSE; int Recursive = FALSE; int Regenerate = TRUE; int Help = FALSE; -#if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 enum zipper Zipper = BZIP2; -#else -enum zipper Zipper = GZIP; -#endif static void usage(void); diff --git a/lib/file.c b/lib/file.c index 4c5a2d1..2442400 100644 --- a/lib/file.c +++ b/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/lib/url.c b/lib/url.c index 6ec780f..aed5ff4 100644 --- a/lib/url.c +++ b/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); }