changeset 425:ddb1d95b4cfc

7067338 migrate libconfuse to userland 6854568 libconfuse in the pkginfo NAME field is not helpful.
author Kevin Crowe <Kevin.Crowe@oracle.com>
date Tue, 19 Jul 2011 13:59:56 -0700
parents 56ddb5c9151d
children dae315b57438
files components/libconfuse/Makefile components/libconfuse/libconfuse.copyright components/libconfuse/libconfuse.p5m components/libconfuse/patches/confuse.h.patch components/libconfuse/patches/test-Makefile.am.patch components/libconfuse/patches/test-Makefile.in.patch components/meta-packages/history/SUNWlibconfuse.p5m
diffstat 7 files changed, 305 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libconfuse/Makefile	Tue Jul 19 13:59:56 2011 -0700
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		confuse
+COMPONENT_VERSION=	2.6
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_PROJECT_URL=	http://www.nongnu.org/confuse/
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:e9e5510abf1eb3159a6439fd52aa5cec94811aff
+COMPONENT_ARCHIVE_URL=	http://bzero.se/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+CONFIGURE_OPTIONS +=	--disable-static
+CONFIGURE_OPTIONS +=	--enable-shared
+CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
+
+# This is really only needed to get the test target to pass.
+COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D)) 
+
+# common targets
+build:		$(BUILD_32_and_64)
+
+install:	$(INSTALL_32_and_64)
+
+test:	$(TEST_32_and_64)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libconfuse/libconfuse.copyright	Tue Jul 19 13:59:56 2011 -0700
@@ -0,0 +1,15 @@
+Copyright (c) 2002,2003,2007 Martin Hedenfalk <martin@bzero.se>
+
+ISC License (ISCL)
+
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libconfuse/libconfuse.p5m	Tue Jul 19 13:59:56 2011 -0700
@@ -0,0 +1,153 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+
+# libconfuse doesn't install many files we choose to deliver so we use transforms:
+# Files delivered to usr/share/doc/confuse/doc will be found
+# under build/$(MACH32)/doc. 
+<transform file path=usr/share/doc/confuse/doc/(.+)$ -> \
+    set action.hash build/$(MACH32)/doc/%<1> >
+# Files delivered to usr/share/man/man3 will be found under
+# doc/man/man3 in the expanded source archive.
+<transform file path=usr/share/man/man3/(.+)$ -> \
+    set action.hash doc/man/man3/%<1> >
+
+set name=pkg.fmri \
+    value=pkg:/library/libconfuse@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Configuration file parser library"
+set name=pkg.description \
+    value="libConfuse is a configuration file parser library written in C. It supports sections and lists of values. It makes it very easy to add configuration file capability to a program using a simple API."
+set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2009/151
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license libconfuse.copyright license='ISC'
+
+dir path=usr
+dir path=usr/include
+dir path=usr/lib
+dir path=usr/lib/$(MACH64)
+dir path=usr/lib/pkgconfig
+dir path=usr/share
+dir path=usr/share/doc
+dir path=usr/share/doc/confuse
+dir path=usr/share/doc/confuse/doc 
+dir path=usr/share/doc/confuse/doc/html
+dir path=usr/share/doc/confuse/doc/tutorial-html
+dir path=usr/share/doc/confuse/examples
+dir path=usr/share/locale 
+dir path=usr/share/locale/fr
+dir path=usr/share/locale/fr/LC_MESSAGES
+dir path=usr/share/locale/sv
+dir path=usr/share/locale/sv/LC_MESSAGES
+dir path=usr/share/man
+dir path=usr/share/man/man3
+
+file path=usr/include/confuse.h
+file path=usr/lib/$(MACH64)/libconfuse.so.0.0.0
+file path=usr/lib/libconfuse.so.0.0.0
+file path=usr/lib/pkgconfig/libconfuse.pc
+file path=usr/share/doc/confuse/doc/css.xsl
+file path=usr/share/doc/confuse/doc/Doxyfile
+file path=usr/share/doc/confuse/doc/Doxyfile.in
+file path=usr/share/doc/confuse/doc/doxygen-footer.html
+file path=usr/share/doc/confuse/doc/doxygen-header.html
+file path=usr/share/doc/confuse/doc/doxygen.css
+file path=usr/share/doc/confuse/doc/html/annotated.html
+file path=usr/share/doc/confuse/doc/html/confuse_8h-source.html
+file path=usr/share/doc/confuse/doc/html/confuse_8h.html
+file path=usr/share/doc/confuse/doc/html/doxygen.png
+file path=usr/share/doc/confuse/doc/html/examples.html
+file path=usr/share/doc/confuse/doc/html/files.html
+file path=usr/share/doc/confuse/doc/html/ftpconf_8c-example.html
+file path=usr/share/doc/confuse/doc/html/functions_vars.html
+file path=usr/share/doc/confuse/doc/html/functions.html
+file path=usr/share/doc/confuse/doc/html/globals_eval.html
+file path=usr/share/doc/confuse/doc/html/globals_func.html
+file path=usr/share/doc/confuse/doc/html/globals_type.html
+file path=usr/share/doc/confuse/doc/html/globals.html
+file path=usr/share/doc/confuse/doc/html/index.html
+file path=usr/share/doc/confuse/doc/html/reread_8c-example.html
+file path=usr/share/doc/confuse/doc/html/simple_8c-example.html
+file path=usr/share/doc/confuse/doc/html/structcfg__defvalue__t.html
+file path=usr/share/doc/confuse/doc/html/structcfg__opt__t.html
+file path=usr/share/doc/confuse/doc/html/structcfg__t.html
+file path=usr/share/doc/confuse/doc/html/tab_b.gif
+file path=usr/share/doc/confuse/doc/html/tab_l.gif
+file path=usr/share/doc/confuse/doc/html/tab_r.gif
+file path=usr/share/doc/confuse/doc/html/tabs.css
+file path=usr/share/doc/confuse/doc/html/tutorial.css
+file path=usr/share/doc/confuse/doc/html/unioncfg__value__t.html
+file path=usr/share/doc/confuse/doc/listing1.c
+file path=usr/share/doc/confuse/doc/listing2.c
+file path=usr/share/doc/confuse/doc/listing3.c
+file path=usr/share/doc/confuse/doc/listing4.c
+file path=usr/share/doc/confuse/doc/listing5.c
+file path=usr/share/doc/confuse/doc/listing6.c
+file path=usr/share/doc/confuse/doc/listing7.c
+file path=usr/share/doc/confuse/doc/listing8.c
+file path=usr/share/doc/confuse/doc/tutorial-html/ar01s02.html
+file path=usr/share/doc/confuse/doc/tutorial-html/ar01s03.html
+file path=usr/share/doc/confuse/doc/tutorial-html/ar01s04.html
+file path=usr/share/doc/confuse/doc/tutorial-html/ar01s05.html
+file path=usr/share/doc/confuse/doc/tutorial-html/ar01s06.html
+file path=usr/share/doc/confuse/doc/tutorial-html/ar01s07.html
+file path=usr/share/doc/confuse/doc/tutorial-html/ar01s08.html
+file path=usr/share/doc/confuse/doc/tutorial-html/ar01s09.html
+file path=usr/share/doc/confuse/doc/tutorial-html/index.html
+file path=usr/share/doc/confuse/doc/tutorial-html/tutorial.css
+file path=usr/share/doc/confuse/doc/tutorial.css
+file path=usr/share/doc/confuse/doc/tutorial.xml
+file $(MACH32)/examples/.libs/ftpconf path=usr/share/doc/confuse/examples/ftpconf mode=0555
+file $(MACH32)/examples/.libs/reread path=usr/share/doc/confuse/examples/reread mode=0555
+file $(MACH32)/examples/.libs/simple path=usr/share/doc/confuse/examples/simple mode=0555
+file examples/ftp.conf path=usr/share/doc/confuse/examples/ftp.conf
+file examples/ftpconf.c path=usr/share/doc/confuse/examples/ftpconf.c
+file examples/reread.c path=usr/share/doc/confuse/examples/reread.c
+file examples/reread.conf path=usr/share/doc/confuse/examples/reread.conf
+file examples/simple.c path=usr/share/doc/confuse/examples/simple.c
+file examples/simple.conf path=usr/share/doc/confuse/examples/simple.conf
+file libconfuse.spec path=usr/share/doc/confuse/libconfuse.spec
+file po/fr.gmo path=usr/share/locale/fr/LC_MESSAGES/confuse.mo
+file po/sv.gmo path=usr/share/locale/sv/LC_MESSAGES/confuse.mo
+file path=usr/share/man/man3/cfg_defvalue_t.3
+file path=usr/share/man/man3/cfg_opt_t.3
+file path=usr/share/man/man3/cfg_t.3
+file path=usr/share/man/man3/cfg_value_t.3
+file path=usr/share/man/man3/confuse.h.3
+
+link path=usr/lib/$(MACH64)/libconfuse.so target=./libconfuse.so.0.0.0
+link path=usr/lib/$(MACH64)/libconfuse.so.0 target=./libconfuse.so.0.0.0
+link path=usr/lib/libconfuse.so target=./libconfuse.so.0.0.0
+link path=usr/lib/libconfuse.so.0 target=./libconfuse.so.0.0.0
+
+legacy pkg=SUNWlibconfuse \
+    desc="libconfuse - configuration file parser library (2.6)" \
+    name="libconfuse"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libconfuse/patches/confuse.h.patch	Tue Jul 19 13:59:56 2011 -0700
@@ -0,0 +1,10 @@
+--- confuse-2.6/src/confuse.h	Sat Oct 13 08:11:54 2007
++++ confuse-2.6/src/confuse.h.new	Tue Jul 19 08:12:27 2011
+@@ -42,6 +42,7 @@
+ 
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <locale.h>
+ 
+ #if defined(_WIN32) && !defined(__GNUC__)
+ # ifdef HAVE__FILENO
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libconfuse/patches/test-Makefile.am.patch	Tue Jul 19 13:59:56 2011 -0700
@@ -0,0 +1,10 @@
+--- confuse-2.6/tests/Makefile.am	Sat Oct 13 06:29:34 2007
++++ confuse-2.6/tests/Makefile.am.new	Wed Jun 29 07:36:01 2011
+@@ -4,6 +4,7 @@
+ check_PROGRAMS=$(TESTS)
+ 
+ LDADD=-L../src ../src/libconfuse.la $(LTLIBINTL)
++LIBADD=-lsocket -lnsl
+ 
+ EXTRA_DIST=a.conf b.conf check_confuse.h
+ CLEANFILES=*~
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libconfuse/patches/test-Makefile.in.patch	Tue Jul 19 13:59:56 2011 -0700
@@ -0,0 +1,36 @@
+--- confuse-2.6/tests/Makefile.in	Sat Dec 29 02:56:13 2007
++++ confuse-2.6/tests/Makefile.in.new	Tue Jul 12 10:27:06 2011
+@@ -91,10 +91,12 @@
+ suite_single_SOURCES = suite_single.c
+ suite_single_OBJECTS = suite_single.$(OBJEXT)
+ suite_single_LDADD = $(LDADD)
++suite_single_LIBADD = $(LIBADD)
+ suite_single_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
+ suite_validate_SOURCES = suite_validate.c
+ suite_validate_OBJECTS = suite_validate.$(OBJEXT)
+ suite_validate_LDADD = $(LDADD)
++suite_validate_LIBADD = $(LIBADD)
+ suite_validate_DEPENDENCIES = ../src/libconfuse.la \
+ 	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -242,6 +244,7 @@
+ 	single_title_sections quote_before_print
+ 
+ LDADD = -L../src ../src/libconfuse.la $(LTLIBINTL)
++LIBADD = -lsocket -lnsl
+ EXTRA_DIST = a.conf b.conf check_confuse.h
+ CLEANFILES = *~
+ @cc_is_gcc_TRUE@AM_CFLAGS = -Wall -Werror
+@@ -308,10 +311,10 @@
+ 	$(LINK) $(suite_list_LDFLAGS) $(suite_list_OBJECTS) $(suite_list_LDADD) $(LIBS)
+ suite_single$(EXEEXT): $(suite_single_OBJECTS) $(suite_single_DEPENDENCIES) 
+ 	@rm -f suite_single$(EXEEXT)
+-	$(LINK) $(suite_single_LDFLAGS) $(suite_single_OBJECTS) $(suite_single_LDADD) $(LIBS)
++	$(LINK) $(suite_single_LDFLAGS) $(suite_single_OBJECTS) $(suite_single_LIBADD) $(suite_single_LDADD) $(LIBS)
+ suite_validate$(EXEEXT): $(suite_validate_OBJECTS) $(suite_validate_DEPENDENCIES) 
+ 	@rm -f suite_validate$(EXEEXT)
+-	$(LINK) $(suite_validate_LDFLAGS) $(suite_validate_OBJECTS) $(suite_validate_LDADD) $(LIBS)
++	$(LINK) $(suite_validate_LDFLAGS) $(suite_validate_OBJECTS) $(suite_validate_LIBADD) $(suite_validate_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWlibconfuse.p5m	Tue Jul 19 13:59:56 2011 -0700
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri value=pkg:/SUNWlibconfuse@2.6,5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/libconfuse@2.6-0.133 type=require