Re: Packages

[Oliver Eikemeier <eikemeier@xxxxxxxxxxxxxxxxx>]

David Rhodus wrote:
> There is a new set of packages uploaded to gobsd.com. Some of the
> larger packages are now complete which there have been some demand for
> in past emails. So things like
>
> pkg_add -r kde # this will install the full version of KDE-3
> pkg_add -r gnome2
>
> now will work just fine.
>
> A listing of the packages that pkg_add -r uses can be found at
> http://gobsd.com/packages/Latest/
> and a complete listing of every package available for download can be
> viewed at http://gobsd.com/packages/All/

How about moving to bzip2 compression?

Index: add/main.c
===================================================================
RCS file: /home/dcvs/src/usr.sbin/pkg_install/add/main.c,v
retrieving revision 1.8
diff -u -u -r1.8 main.c
--- add/main.c	1 Aug 2004 04:22:49 -0000	1.8
+++ add/main.c	19 Aug 2004 08:07:43 -0000
@@ -178,11 +178,7 @@
			(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
			sizeof(temppackageroot)) >= sizeof(temppackageroot))
			errx(1, "package name too long");
    	    }
Index: add/perform.c
===================================================================
RCS file: /home/dcvs/src/usr.sbin/pkg_install/add/perform.c,v
retrieving revision 1.4
diff -u -u -r1.4 perform.c
--- add/perform.c	30 Jul 2004 04:46:12 -0000	1.4
+++ add/perform.c	19 Aug 2004 08:07:43 -0000
@@ -301,11 +301,7 @@

		    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;
Index: lib/file.c
===================================================================
RCS file: /home/dcvs/src/usr.sbin/pkg_install/lib/file.c,v
retrieving revision 1.3
diff -u -u -r1.3 file.c
--- lib/file.c	30 Jul 2004 04:46:13 -0000	1.3
+++ lib/file.c	19 Aug 2004 08:07:43 -0000
@@ -349,11 +349,7 @@
	}
    }
    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;
Index: lib/lib.h
===================================================================
RCS file: /home/dcvs/src/usr.sbin/pkg_install/lib/lib.h,v
retrieving revision 1.4
diff -u -u -r1.4 lib.h
--- lib/lib.h	30 Jul 2004 04:46:13 -0000	1.4
+++ lib/lib.h	19 Aug 2004 08:07:43 -0000
@@ -77,11 +77,7 @@
#define DISPLAY_FNAME		"+DISPLAY"
#define MTREE_FNAME		"+MTREE_DIRS"

-#if defined(__FreeBSD_version) && __FreeBSD_version >= 500036
-#define INDEX_FNAME		"INDEX-5"
-#else
#define INDEX_FNAME		"INDEX"
-#endif

#define CMD_CHAR		'@'	/* prefix for extended PLIST cmd */

Index: lib/url.c
===================================================================
RCS file: /home/dcvs/src/usr.sbin/pkg_install/lib/url.c,v
retrieving revision 1.1
diff -u -u -r1.1 url.c
--- lib/url.c	30 Jul 2004 04:46:13 -0000	1.1
+++ lib/url.c	19 Aug 2004 08:07:43 -0000
@@ -68,11 +68,7 @@
		*(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;
@@ -84,11 +80,7 @@
	     */
	    strcpy(fname, hint);
	    strcat(fname, spec);
-#if defined(__FreeBSD_version) && __FreeBSD_version >= 500039
	    strcat(fname, ".tbz");
-#else
-	    strcat(fname, ".tgz");
-#endif
	}
    }
    else
@@ -123,11 +115,7 @@
	for (fd = getdtablesize() - 1; fd >= 3; --fd)
	    close(fd);
	execl("/usr/bin/tar", "tar",
-#if defined(__FreeBSD_version) && __FreeBSD_version >= 500039
	    Verbose ? "-xjvf" : "-xjf",
-#else
-	    Verbose ? "-xzvf" : "-xzf",
-#endif
	    "-", (char *)0);
	_exit(2);
    }