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

[Robert Millan]

Author: rmh
Date: 2006-05-04 15:14:44 +0000 (Thu, 04 May 2006)
New Revision: 1554

Added:
   trunk/freebsd-libs/debian/libkiconv-dev.install
   trunk/freebsd-libs/debian/libkiconv1.install
   trunk/freebsd-libs/debian/patches/07_libkiconv.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/rules
   trunk/freebsd-libs/fetch
Log:
Add libkiconv (patch from Andraz).

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2006-05-04 15:11:11 UTC (rev 1553)
+++ trunk/freebsd-libs/debian/changelog	2006-05-04 15:14:44 UTC (rev 1554)
@@ -1,3 +1,9 @@
+freebsd-libs (5.4+1-3) UNRELEASED; urgency=low
+
+  * Add libkiconv (patch from Andraz).
+
+ -- Robert Millan <rmh at aybabtu.com>  Thu,  4 May 2006 17:14:34 +0200
+
 freebsd-libs (5.4+1-2) unreleased; urgency=low
 
   * Link libgeom with librt (to get clock_gettime).

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2006-05-04 15:11:11 UTC (rev 1553)
+++ trunk/freebsd-libs/debian/control	2006-05-04 15:14:44 UTC (rev 1554)
@@ -102,3 +102,17 @@
  This package contains the header files and static library needed to
  compile applications that use libipx.
 
+Package: libkiconv1
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}
+Description: FreeBSD kernel side iconv library
+ The kiconv library provides multi-byte character conversion tables for kernel
+ side iconv service.
+
+Package: libkiconv-dev
+Section: libdevel
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}, libkiconv1 (>= ${Source-Version}), libc0.1-dev | libc-dev
+Description: Development files for libkiconv
+ This package contains the header files and static library needed to
+ compile applications that use libkiconv.

Added: trunk/freebsd-libs/debian/libkiconv-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libkiconv-dev.install	2006-05-04 15:11:11 UTC (rev 1553)
+++ trunk/freebsd-libs/debian/libkiconv-dev.install	2006-05-04 15:14:44 UTC (rev 1554)
@@ -0,0 +1,3 @@
+usr/lib/libkiconv*.so
+usr/lib/libkiconv*.a
+usr/share/man/man*/kiconv*.gz

Added: trunk/freebsd-libs/debian/libkiconv1.install
===================================================================
--- trunk/freebsd-libs/debian/libkiconv1.install	2006-05-04 15:11:11 UTC (rev 1553)
+++ trunk/freebsd-libs/debian/libkiconv1.install	2006-05-04 15:14:44 UTC (rev 1554)
@@ -0,0 +1 @@
+usr/lib/libkiconv*.so.*

Added: trunk/freebsd-libs/debian/patches/07_libkiconv.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/07_libkiconv.diff	2006-05-04 15:11:11 UTC (rev 1553)
+++ trunk/freebsd-libs/debian/patches/07_libkiconv.diff	2006-05-04 15:14:44 UTC (rev 1554)
@@ -0,0 +1,10 @@
+--- lib.old/libkiconv/quirks.h	2006-05-03 22:13:59.000000000 +0200
++++ lib/libkiconv/quirks.h	2006-05-03 22:15:09.000000000 +0200
+@@ -25,6 +25,7 @@
+  *
+  * $FreeBSD: src/lib/libkiconv/quirks.h,v 1.1 2003/09/26 20:26:20 fjoe Exp $
+  */
++#include <stdint.h>
+ 
+ #ifndef _KICONV_QUIRKS_H_
+ #define _KICONV_QUIRKS_H_

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2006-05-04 15:11:11 UTC (rev 1553)
+++ trunk/freebsd-libs/debian/rules	2006-05-04 15:14:44 UTC (rev 1554)
@@ -34,7 +34,6 @@
 		-e "/^__FBSDID/d" \
 		-e "s/[ \t]*__\(dead2\|unused\|result\\)[ \t]*//g" \
 		-e "s,<sys/queue\.h>,<bsd/queue.h>,g" \
-		-e "s,<sys/iconv\.h>,<iconv.h>,g" \
 		-e "s/^LDADD=/LDADD+=/g" \
 		-e "s/getline/bsd_&/g" \
 	; done)
@@ -47,7 +46,7 @@
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
-build-arch-stamp: build-cam build-geom build-sbuf build-ipx build-kvm build-usbhid
+build-arch-stamp: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid
 	touch build-arch-stamp
 
 build-cam: build-sbuf $(SRC_DIR)
@@ -59,6 +58,9 @@
 build-ipx: $(SRC_DIR)
 	cd $(SRC_DIR)/lib/libipx && $(PMAKE)
 
+build-kiconv: $(SRC_DIR)
+	cd $(SRC_DIR)/lib/libkiconv && $(PMAKE)
+
 build-kvm: $(SRC_DIR)
 	cd $(SRC_DIR)/lib/libkvm && $(PMAKE)
 
@@ -96,6 +98,7 @@
 	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/libkiconv && $(PMAKE) install
 	cd $(SRC_DIR)/lib/libkvm && $(PMAKE) install
 	cd $(SRC_DIR)/lib/libusbhid && $(PMAKE) install
 

Modified: trunk/freebsd-libs/fetch
===================================================================
--- trunk/freebsd-libs/fetch	2006-05-04 15:11:11 UTC (rev 1553)
+++ trunk/freebsd-libs/fetch	2006-05-04 15:14:44 UTC (rev 1554)
@@ -13,7 +13,7 @@
 fi
 
 for i in \
-    src/lib/lib{cam,geom,ipx,kvm,sbuf,usbhid} \
+    src/lib/lib{cam,geom,ipx,kiconv,kvm,sbuf,usbhid} \
   ; do
   cvs ${action} -r RELENG_5_4_0_RELEASE $i
   test -e $i