rename cfg+ directory to libcfg+ so it matches the PKGNAME.

7 files changed, 247 insertions, 0 deletions

diff --git a/devel/libcfg+/DESCR b/devel/libcfg+/DESCR
new file mode 100644
index 00000000000..cd1e7e906ff
--- /dev/null
+++ b/devel/libcfg+/DESCR
@@ -0,0 +1,7 @@
+libcfg+ is a C library that features multi- command line and
+configuration file parsing. It is possible to set up various special
+properties such as quoting characters, deliminator strings, file comment
+prefixes, multi-line postfixes, and more. It supports many data types
+such as booleans, integers, decimal numbers, strings with many
+additional data type flags (such as multiple values for a single
+option).
diff --git a/devel/libcfg+/Makefile b/devel/libcfg+/Makefile
new file mode 100644
index 00000000000..d22c67682fa
--- /dev/null
+++ b/devel/libcfg+/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2004/10/06 10:17:06 grant Exp $
+#
+
+DISTNAME=		libcfg+-0.6.2
+PKGREVISION=		2
+CATEGORIES=		devel
+MASTER_SITES=		http://platon.sk/upload/_projects/00003/
+
+MAINTAINER=		tech-pkg@NetBSD.org
+HOMEPAGE=		http://platon.sk/projects/libcfg+/
+COMMENT=		Command line and configuration file parsing library
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		yes
+GNU_CONFIGURE=		yes
+USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		yes
+MANCOMPRESSED=		yes
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libcfg+/PLIST b/devel/libcfg+/PLIST
new file mode 100644
index 00000000000..6dae1359422
--- /dev/null
+++ b/devel/libcfg+/PLIST
@@ -0,0 +1,80 @@
+@comment $NetBSD: PLIST,v 1.1 2004/10/06 10:17:06 grant Exp $
+include/cfg+.h
+include/cfg.h
+include/platon/cfg+.h
+include/platon/cfg.h
+lib/libcfg+.la
+man/man3/cfg+.h.3
+man/man3/cfg_add_property.3
+man/man3/cfg_clear_context_flag.3
+man/man3/cfg_clear_property.3
+man/man3/cfg_context.3
+man/man3/cfg_fprint_error.3
+man/man3/cfg_free_context.3
+man/man3/cfg_get_cfgfile_context.3
+man/man3/cfg_get_cmdline_context.3
+man/man3/cfg_get_context.3
+man/man3/cfg_get_context_flag.3
+man/man3/cfg_get_context_flags.3
+man/man3/cfg_get_cur_arg.3
+man/man3/cfg_get_cur_idx.3
+man/man3/cfg_get_cur_opt.3
+man/man3/cfg_get_error_str.3
+man/man3/cfg_get_next_opt.3
+man/man3/cfg_option.3
+man/man3/cfg_parse.3
+man/man3/cfg_print_error.3
+man/man3/cfg_remove_property.3
+man/man3/cfg_reset_context.3
+man/man3/cfg_set_cfgfile_context.3
+man/man3/cfg_set_cmdline_context.3
+man/man3/cfg_set_context_flag.3
+man/man3/cfg_set_context_flags.3
+man/man3/libcfg+.3
+share/doc/libcfg+-${PKGVERSION}/doxygen/annotated.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/cfg+_8h-source.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/cfg+_8h.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/cfgfile_8h-source.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/cfgfile_8h.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/cmdline_8h-source.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/cmdline_8h.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/doxygen.css
+share/doc/libcfg+-${PKGVERSION}/doxygen/doxygen.png
+share/doc/libcfg+-${PKGVERSION}/doxygen/files.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/functions.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/functions_vars.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/globals.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/globals_defs.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/globals_enum.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/globals_eval.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/globals_func.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/globals_type.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/index.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/pages.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/shared_8h-source.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/shared_8h.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/structcfg__context.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/structcfg__option.html
+share/doc/libcfg+-${PKGVERSION}/doxygen/todo.html
+share/doc/libcfg+-${PKGVERSION}/examples/example.c
+share/doc/libcfg+-${PKGVERSION}/examples/example.cfg
+share/doc/libcfg+-${PKGVERSION}/html/changelog.html
+share/doc/libcfg+-${PKGVERSION}/html/index.html
+share/doc/libcfg+-${PKGVERSION}/html/introduction.html
+share/doc/libcfg+-${PKGVERSION}/html/introduction.installation.html
+share/doc/libcfg+-${PKGVERSION}/html/other-information.cvs-access.html
+share/doc/libcfg+-${PKGVERSION}/html/other-information.html
+share/doc/libcfg+-${PKGVERSION}/html/other-information.license.html
+share/doc/libcfg+-${PKGVERSION}/html/other-information.support-and-feedback.html
+share/doc/libcfg+-${PKGVERSION}/html/preface.html
+share/doc/libcfg+-${PKGVERSION}/html/usage.context-flags.html
+share/doc/libcfg+-${PKGVERSION}/html/usage.context-manipulation.html
+share/doc/libcfg+-${PKGVERSION}/html/usage.error-codes.html
+share/doc/libcfg+-${PKGVERSION}/html/usage.html
+share/doc/libcfg+-${PKGVERSION}/html/usage.parsing.html
+share/doc/libcfg+-${PKGVERSION}/html/usage.properties.html
+@dirrm share/doc/libcfg+-${PKGVERSION}/html
+@dirrm share/doc/libcfg+-${PKGVERSION}/examples
+@dirrm share/doc/libcfg+-${PKGVERSION}/doxygen
+@dirrm share/doc/libcfg+-${PKGVERSION}
+@dirrm include/platon
diff --git a/devel/libcfg+/buildlink3.mk b/devel/libcfg+/buildlink3.mk
new file mode 100644
index 00000000000..5c426f0acd8
--- /dev/null
+++ b/devel/libcfg+/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/10/06 10:17:06 grant Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBCFG_BUILDLINK3_MK:=	${LIBCFG_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libcfg
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcfg}
+BUILDLINK_PACKAGES+=	libcfg
+
+.if !empty(LIBCFG_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libcfg+=	libcfg+>=0.6.2nb1
+BUILDLINK_RECOMMENDED.libcfg++=	libcfg+>=0.6.2nb2
+BUILDLINK_PKGSRCDIR.libcfg?=	../../devel/libcfg+
+.endif	# LIBCFG_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libcfg+/distinfo b/devel/libcfg+/distinfo
new file mode 100644
index 00000000000..e0d01209f6f
--- /dev/null
+++ b/devel/libcfg+/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2004/10/06 10:17:06 grant Exp $
+
+SHA1 (libcfg+-0.6.2.tar.gz) = 856d647bb06e37d3c6e48d356a3e11796ebed35b
+Size (libcfg+-0.6.2.tar.gz) = 169482 bytes
+SHA1 (patch-aa) = ba63ccc5c031a893b111caac1ba9ddf13c18b4fc
+SHA1 (patch-ab) = 6de1bbf8c5eefcfb07bc6bfa087c3c89d42d3a06
diff --git a/devel/libcfg+/patches/patch-aa b/devel/libcfg+/patches/patch-aa
new file mode 100644
index 00000000000..5ee3d3b79da
--- /dev/null
+++ b/devel/libcfg+/patches/patch-aa
@@ -0,0 +1,38 @@
+$NetBSD: patch-aa,v 1.1 2004/10/06 10:17:06 grant Exp $
+
+--- Rules.make.in.orig	Tue Feb 17 11:37:47 2004
++++ Rules.make.in
+@@ -24,8 +24,7 @@ OBJECTS           +=
+ DISTFILES         +=
+ 
+ LIBSTATIC          = $(PACKAGE).a
+-LIBDYNAMIC         = $(PACKAGE).so
+-LIBDYNAMICV        = $(PACKAGE).so.$(VERSION)
++LIBDYNAMICV        = $(PACKAGE).la
+ 
+ install_LIB        = $(LIBSTATIC) $(LIBDYNAMICV)
+ SCRIPTS            =
+@@ -157,19 +156,14 @@ static:		$(LIBSTATIC)
+ dynamic:	$(LIBDYNAMICV)
+ 
+ $(LIBSTATIC):	$(OBJECTS)
+-	$(AR) r $@ $(OBJECTS)
++	:
+ 
+ $(LIBDYNAMICV):	$(OBJECTS)
+-	$(LD) $(LDFLAGS) -shared -o $@ $(OBJECTS)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) -rpath $(libdir) -version-info `echo $(VERSION) | sed -e 's/0\.\([^.]*\)\.\([^.]*\)/\1\2/'`
+ 
+-%.o: %.c $(CONFIG_HEADER)
++%.lo: %.c $(CONFIG_HEADER)
+ 	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -o $@ -c $<
+-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+-	tr ' ' '\012' < .deps/$(*F).pp \
+-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+-	    >> .deps/$(*F).P; \
+-	rm .deps/$(*F).pp
++	$(LIBTOOL) --mode=compile $(COMPILE) -o $@ -c $<
+ 
+ %.o: %.cpp $(CONFIG_HEADER)
+ 	@echo '$(COMPILE_CXX) -c $<'; \
diff --git a/devel/libcfg+/patches/patch-ab b/devel/libcfg+/patches/patch-ab
new file mode 100644
index 00000000000..be550ac5849
--- /dev/null
+++ b/devel/libcfg+/patches/patch-ab
@@ -0,0 +1,76 @@
+$NetBSD: patch-ab,v 1.1 2004/10/06 10:17:06 grant Exp $
+
+--- src/Makefile.in.orig	2004-02-18 01:37:47.000000000 +0900
++++ src/Makefile.in	2004-09-29 00:32:45.000000000 +0900
+@@ -60,16 +60,16 @@
+ 		  $(srcdir)/platon/str/strdyn.c \
+ 		  $(srcdir)/platon/str/dynfgets.c
+ 
+-OBJECTS = $(top_builddir)/src/cfg+.o \
+-		  $(top_builddir)/src/parse.o \
+-		  $(top_builddir)/src/props.o \
+-		  $(top_builddir)/src/cmdline.o \
+-		  $(top_builddir)/src/cfgfile.o \
+-		  $(top_builddir)/src/shared.o \
+-		  $(top_builddir)/src/platon/str/strplus.o \
+-		  $(top_builddir)/src/platon/str/strctype.o \
+-		  $(top_builddir)/src/platon/str/strdyn.o \
+-		  $(top_builddir)/src/platon/str/dynfgets.o
++OBJECTS = $(top_builddir)/src/cfg+.lo \
++		  $(top_builddir)/src/parse.lo \
++		  $(top_builddir)/src/props.lo \
++		  $(top_builddir)/src/cmdline.lo \
++		  $(top_builddir)/src/cfgfile.lo \
++		  $(top_builddir)/src/shared.lo \
++		  $(top_builddir)/src/platon/str/strplus.lo \
++		  $(top_builddir)/src/platon/str/strctype.lo \
++		  $(top_builddir)/src/platon/str/strdyn.lo \
++		  $(top_builddir)/src/platon/str/dynfgets.lo
+ 
+ # SunOS 4 make does not allow multiple makefiles to be specified in one ­include directive.
+ DEP_FILES = $(top_builddir)/src/.deps/cfg+.P \
+@@ -97,8 +97,7 @@
+ 				  platon/str/strplus.h
+ 
+ LIBSTATIC   = $(PACKAGE).a
+-LIBDYNAMIC  = $(PACKAGE).so
+-LIBDYNAMICV = $(PACKAGE).so.$(VERSION)
++LIBDYNAMICV  = $(PACKAGE).la
+ 
+ install_LIB     = $(LIBSTATIC) $(LIBDYNAMICV)
+ 
+@@ -166,7 +165,7 @@
+ 	@list='$(install_LIB)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+ 	  echo "	Installing file $(DESTDIR)$(libdir)/$$p"; \
+-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libdir)/$$p; \
++	  $(LIBTOOL) --mode=install $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ uninstall-lib:
+ 	@$(NORMAL_UNINSTALL)
+@@ -217,11 +216,7 @@
+ 		cd platon && $(LN_S) $$p $(include_SYMLINK); \
+ 	  ); \
+ 	  cd $$here; \
+-	done; \
+-	cd $(DESTDIR)$(libdir) && ( \
+-		echo "	Creating symlink $(DESTDIR)$(libdir)/$(LIBDYNAMIC)"; \
+-		$(LN_S) $(LIBDYNAMICV) $(LIBDYNAMIC); \
+-	 );
++	done;
+ uninstall-symlinks:
+ 	@$(NORMAL_UNINSTALL)
+ 	-@list='$(include_SYMLINK)'; for p in $$list; do \
+@@ -229,11 +224,7 @@
+ 	  rm -f $(DESTDIR)$(includedir)/$$p; \
+ 	  echo "	rm -f $(DESTDIR)$(includedir_platon)/$$p"; \
+ 	  rm -f $(DESTDIR)$(includedir_platon)/$$p; \
+-	done; \
+-	cd $(DESTDIR)$(libdir) && ( \
+-		echo "	rm -f $(DESTDIR)$(libdir)/$(LIBDYNAMIC)"; \
+-		rm -f $(LIBDYNAMIC); \
+-	 );
++	done;
+ 
+ uninstall-dirs:
+ 	@$(NORMAL_UNINSTALL)