[Glibc-bsd-commits] r1451 - in trunk/freebsd-libs: . debian debian/patches

Robert Millan rmh at costa.debian.org
Tue Apr 18 18:06:12 UTC 2006 

Author: rmh
Date: 2006-04-18 18:06:11 +0000 (Tue, 18 Apr 2006)
New Revision: 1451

Added:
   trunk/freebsd-libs/debian/libgeom-dev.install
   trunk/freebsd-libs/debian/libgeom0.install
   trunk/freebsd-libs/debian/patches/06_libgeom.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/rules
   trunk/freebsd-libs/fetch
Log:
Add libgeom in all missing places.  Add libexpat-dev to Build-Depends, 06_libgeom.diff to port it, control entries, *.install files, etc.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2006-04-18 17:06:16 UTC (rev 1450)
+++ trunk/freebsd-libs/debian/changelog	2006-04-18 18:06:11 UTC (rev 1451)
@@ -1,4 +1,4 @@
-freebsd-libs (5.4-9) UNRELEASED; urgency=low
+freebsd-libs (5.4+1-1) UNRELEASED; urgency=low
 
   * Add libgeom.
 

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2006-04-18 17:06:16 UTC (rev 1450)
+++ trunk/freebsd-libs/debian/control	2006-04-18 18:06:11 UTC (rev 1451)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>
-Build-Depends: debhelper (>= 4.1.0), kfreebsd-source-5.4, freebsd5-buildutils, libbsd-dev, libfreebsd-dev, libgdbm-dev, kfreebsd-kernel-headers (>= 0.17) [kfreebsd-amd64]
+Build-Depends: debhelper (>= 4.1.0), kfreebsd-source-5.4, freebsd5-buildutils, libbsd-dev, libfreebsd-dev, libgdbm-dev, kfreebsd-kernel-headers (>= 0.17) [kfreebsd-amd64], libexpat-dev
 Standards-Version: 3.6.2
 
 Package: libsbuf0
@@ -37,6 +37,21 @@
  This package contains the header files and static library needed to
  compile applications that use libcam.
 
+Package: libgeom0
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}
+Description: FreeBSD GEOM library
+ This library provides an interface to GEOM, a modular disk I/O request
+ transformation framework provided by the kernel of FreeBSD.
+
+Package: libgeom-dev
+Section: libdevel
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}, libgeom0 (>= ${Source-Version}), libc0.1-dev | libc-dev, libbsd-dev
+Description: Development files for libgeom
+ This package contains the header files and static library needed to
+ compile applications that use libcam.
+
 Package: libusbhid1
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}

Added: trunk/freebsd-libs/debian/libgeom-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libgeom-dev.install	2006-04-18 17:06:16 UTC (rev 1450)
+++ trunk/freebsd-libs/debian/libgeom-dev.install	2006-04-18 18:06:11 UTC (rev 1451)
@@ -0,0 +1,18 @@
+usr/lib/libgeom*.so
+usr/lib/libgeom*.a
+usr/include/libgeom.h
+usr/share/man/man3/libgeom.3.gz
+usr/share/man/man3/geom_stats_open.3.gz
+usr/share/man/man3/geom_stats_close.3.gz
+usr/share/man/man3/geom_stats_resync.3.gz
+usr/share/man/man3/geom_stats_snapshot_get.3.gz
+usr/share/man/man3/geom_stats_snapshot_free.3.gz
+usr/share/man/man3/geom_stats_snapshot_timestamp.3.gz
+usr/share/man/man3/geom_stats_snapshot_reset.3.gz
+usr/share/man/man3/geom_stats_snapshot_next.3.gz
+usr/share/man/man3/gctl_get_handle.3.gz
+usr/share/man/man3/gctl_ro_param.3.gz
+usr/share/man/man3/gctl_rw_param.3.gz
+usr/share/man/man3/gctl_issue.3.gz
+usr/share/man/man3/gctl_free.3.gz
+usr/share/man/man3/gctl_dump.3.gz

Added: trunk/freebsd-libs/debian/libgeom0.install
===================================================================
--- trunk/freebsd-libs/debian/libgeom0.install	2006-04-18 17:06:16 UTC (rev 1450)
+++ trunk/freebsd-libs/debian/libgeom0.install	2006-04-18 18:06:11 UTC (rev 1451)
@@ -0,0 +1 @@
+usr/lib/libgeom*.so.*

Added: trunk/freebsd-libs/debian/patches/06_libgeom.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/06_libgeom.diff	2006-04-18 17:06:16 UTC (rev 1450)
+++ trunk/freebsd-libs/debian/patches/06_libgeom.diff	2006-04-18 18:06:11 UTC (rev 1451)
@@ -0,0 +1,53 @@
+diff -ur lib.old/libgeom/Makefile lib/libgeom/Makefile
+--- lib.old/libgeom/Makefile	2006-04-18 19:56:50.000000000 +0200
++++ lib/libgeom/Makefile	2006-04-18 19:57:22.000000000 +0200
+@@ -13,7 +13,7 @@
+ WARNS?=	3
+ 
+ DPADD=	${LIBBSDXML} ${LIBSBUF}
+-LDADD+=	-lbsdxml -lsbuf
++LDADD+=	-lexpat -lsbuf
+ 
+ MAN=	libgeom.3
+ 
+diff -ur lib.old/libgeom/geom_ctl.c lib/libgeom/geom_ctl.c
+--- lib.old/libgeom/geom_ctl.c	2006-04-18 19:56:50.000000000 +0200
++++ lib/libgeom/geom_ctl.c	2006-04-18 19:57:22.000000000 +0200
+@@ -158,6 +158,9 @@
+ 	ap->name = strdup(name);
+ 	gctl_check_alloc(req, ap->name);
+ 	ap->nlen = strlen(ap->name) + 1;
++#ifndef __DECONST
++#define __DECONST(type, var)	((type)(uintptr_t)(const void *)(var))
++#endif
+ 	ap->value = __DECONST(void *, value);
+ 	ap->flag = GCTL_PARAM_RD;
+ 	if (len >= 0)
+diff -ur lib.old/libgeom/geom_stats.c lib/libgeom/geom_stats.c
+--- lib.old/libgeom/geom_stats.c	2006-04-18 19:56:50.000000000 +0200
++++ lib/libgeom/geom_stats.c	2006-04-18 19:57:22.000000000 +0200
+@@ -34,11 +34,11 @@
+ #include <fcntl.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ #include <unistd.h>
+ #include <libgeom.h>
+ 
+ #include <sys/mman.h>
+-#include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/devicestat.h>
+ 
+diff -ur lib.old/libgeom/geom_xml2tree.c lib/libgeom/geom_xml2tree.c
+--- lib.old/libgeom/geom_xml2tree.c	2006-04-18 19:56:50.000000000 +0200
++++ lib/libgeom/geom_xml2tree.c	2006-04-18 19:57:22.000000000 +0200
+@@ -43,7 +43,7 @@
+ #include <sys/sbuf.h>
+ #include <sys/sysctl.h>
+ #include <err.h>
+-#include <bsdxml.h>
++#include <expat.h>
+ #include <libgeom.h>
+ 
+ struct mystate {

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2006-04-18 17:06:16 UTC (rev 1450)
+++ trunk/freebsd-libs/debian/rules	2006-04-18 18:06:11 UTC (rev 1451)
@@ -17,7 +17,7 @@
 	CFLAGS += -O2
 endif
 
-SRC_DIR=lib
+SRC_DIR=src
 PATH:=/usr/lib/freebsd:$(PATH)
 DESTDIR=$(CURDIR)/debian/tmp
 PMAKE=make COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR)
@@ -25,8 +25,8 @@
 
 $(SRC_DIR):
 	tar -xzf $(CURDIR)/src.tar.gz
-	tar -C $(SRC_DIR) -xjf /usr/src/kfreebsd-source-5.4.tar.bz2 kfreebsd-source-5.4/sys/kern/subr_sbuf.c kfreebsd-source-5.4/sys/cam
-	mv $(SRC_DIR)/kfreebsd-source-5.4 $(SRC_DIR)/kernel
+	tar -C $(SRC_DIR)/lib -xjf /usr/src/kfreebsd-source-5.4.tar.bz2 kfreebsd-source-5.4/sys/kern/subr_sbuf.c kfreebsd-source-5.4/sys/cam
+	mv $(SRC_DIR)/lib/kfreebsd-source-5.4 $(SRC_DIR)/lib/kernel
 
 	find $(SRC_DIR) -type f | (set -e ; while read i ; do sed -i $$i \
 		-e "/^__FBSDID/d" \
@@ -39,29 +39,32 @@
 	
 	set -e ; for i in $(CURDIR)/debian/patches/*.diff ; do \
 		echo "--- Patch $$i ---" ; \
-		patch -p1 -d $(SRC_DIR) < $$i ; \
+		patch -p1 -d $(SRC_DIR)/lib < $$i ; \
 	done
 
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
-build-arch-stamp: build-cam build-sbuf build-ipx build-kvm build-usbhid
+build-arch-stamp: build-cam build-geom build-sbuf build-ipx build-kvm build-usbhid
 	touch build-arch-stamp
 
 build-cam: build-sbuf $(SRC_DIR)
-	cd $(SRC_DIR)/libcam && $(PMAKE)
+	cd $(SRC_DIR)/lib/libcam && $(PMAKE)
 
+build-geom: build-sbuf $(SRC_DIR)
+	cd $(SRC_DIR)/lib/libgeom && $(PMAKE)
+
 build-ipx: $(SRC_DIR)
-	cd $(SRC_DIR)/libipx && $(PMAKE)
+	cd $(SRC_DIR)/lib/libipx && $(PMAKE)
 
 build-kvm: $(SRC_DIR)
-	cd $(SRC_DIR)/libkvm && $(PMAKE)
+	cd $(SRC_DIR)/lib/libkvm && $(PMAKE)
 
 build-sbuf: $(SRC_DIR)
-	cd $(SRC_DIR)/libsbuf && $(PMAKE)
+	cd $(SRC_DIR)/lib/libsbuf && $(PMAKE)
 
 build-usbhid: $(SRC_DIR)
-	cd $(SRC_DIR)/libusbhid && $(PMAKE)
+	cd $(SRC_DIR)/lib/libusbhid && $(PMAKE)
 
 build-indep: build-indep-stamp
 build-indep-stamp:
@@ -87,13 +90,14 @@
 	dh_installdirs -s
 
 	mkdir -p $(DESTDIR)/usr/{lib,include,share/man/man3}
-	cd $(SRC_DIR)/libsbuf && $(PMAKE) install
-	cd $(SRC_DIR)/libcam && $(PMAKE) install
-	cd $(SRC_DIR)/libipx && $(PMAKE) install
-	cd $(SRC_DIR)/libkvm && $(PMAKE) install
+	cd $(SRC_DIR)/lib/libsbuf && $(PMAKE) install
+	cd $(SRC_DIR)/lib/libcam && $(PMAKE) install
+	cd $(SRC_DIR)/lib/libgeom && $(PMAKE) install
+	cd $(SRC_DIR)/lib/libipx && $(PMAKE) install
+	cd $(SRC_DIR)/lib/libkvm && $(PMAKE) install
 	# move libkvm.so to /lib
 	ln -sf /lib/libkvm.so.0 $(DESTDIR)/usr/lib/libkvm.so
-	cd $(SRC_DIR)/libusbhid && $(PMAKE) install
+	cd $(SRC_DIR)/lib/libusbhid && $(PMAKE) install
 
 	dh_install -s --list-missing --sourcedir=debian/tmp
 

Modified: trunk/freebsd-libs/fetch
===================================================================
--- trunk/freebsd-libs/fetch	2006-04-18 17:06:16 UTC (rev 1450)
+++ trunk/freebsd-libs/fetch	2006-04-18 18:06:11 UTC (rev 1451)
@@ -13,9 +13,9 @@
 fi
 
 for i in \
-    libcam libgeom libipx libkvm libsbuf libusbhid \
+    src/lib/lib{cam,geom,ipx,kvm,sbuf,usbhid} \
   ; do
-  cvs ${action} -r RELENG_5_4_0_RELEASE src/lib/$i
+  cvs ${action} -r RELENG_5_4_0_RELEASE $i
   test -e $i
 done

More information about the Glibc-bsd-commits mailing list