update to version 1.4.1

6 files changed, 213 insertions, 228 deletions

diff --git a/devel/c2lib/Makefile b/devel/c2lib/Makefile
index ee4070f8ab4d..eb5ed1255534 100644
--- a/devel/c2lib/Makefile
+++ b/devel/c2lib/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	c2lib
-PORTVERSION=	1.3.0
+PORTVERSION=	1.4.1
 PORTREVISION=	0
 PORTEPOCH=	0
 CATEGORIES=	devel
@@ -25,14 +25,17 @@ PREFIX?=	${LOCALBASE}
 MAKE_ENV+=	CC="${CC}"
 .include <bsd.port.pre.mk>
 
+do-configure:
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} make+ configure
+
 do-build:
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} make+ 
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} make+
 
 do-install:
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV}\
 		make+ install prefix=${PREFIX} manprefix=${PREFIX}
 
-.include "${.CURDIR}/manpages.mk"
+.include "${FILESDIR}/manpages.mk"
 .include <bsd.port.post.mk>
 
 #EOF
diff --git a/devel/c2lib/distinfo b/devel/c2lib/distinfo
index 36a85b1fdbbf..93c71444ad6c 100644
--- a/devel/c2lib/distinfo
+++ b/devel/c2lib/distinfo
@@ -1 +1 @@
-MD5 (c2lib-1.3.0.tar.gz) = 7a1bc849168fd81c64685c7ad13bb708
+MD5 (c2lib-1.4.1.tar.gz) = 72e1e9ba877b6530b7603f14ff777d42
diff --git a/devel/c2lib/files/manpages.mk b/devel/c2lib/files/manpages.mk
new file mode 100644
index 000000000000..295ea66f8a6e
--- /dev/null
+++ b/devel/c2lib/files/manpages.mk
@@ -0,0 +1,200 @@
+MAN3+= _hash_erase.3
+MAN3+= _hash_get.3
+MAN3+= _hash_get_ptr.3
+MAN3+= _hash_insert.3
+MAN3+= _hash_new.3
+MAN3+= _sash_get.3
+MAN3+= _shash_get.3
+MAN3+= _shash_get_ptr.3
+MAN3+= _shash_insert.3
+MAN3+= _tree_get_data.3
+MAN3+= _tree_new.3
+MAN3+= _tree_set_data.3
+MAN3+= _vector_compare.3
+MAN3+= _vector_fill.3
+MAN3+= _vector_get.3
+MAN3+= _vector_get_ptr.3
+MAN3+= _vector_insert.3
+MAN3+= _vector_map.3
+MAN3+= _vector_map_pool.3
+MAN3+= _vector_new.3
+MAN3+= _vector_pop_back.3
+MAN3+= _vector_pop_front.3
+MAN3+= _vector_push_back.3
+MAN3+= _vector_push_front.3
+MAN3+= _vector_replace.3
+MAN3+= _vector_sort.3
+MAN3+= collision_moving_sphere_and_face.3
+MAN3+= copy_hash.3
+MAN3+= copy_sash.3
+MAN3+= copy_shash.3
+MAN3+= copy_tree.3
+MAN3+= copy_vector.3
+MAN3+= delete_pool.3
+MAN3+= face_translate_along_normal.3
+MAN3+= global_pool.3
+MAN3+= hash_erase.3
+MAN3+= hash_exists.3
+MAN3+= hash_get.3
+MAN3+= hash_get_buckets_allocated.3
+MAN3+= hash_get_buckets_used.3
+MAN3+= hash_get_ptr.3
+MAN3+= hash_insert.3
+MAN3+= hash_keys.3
+MAN3+= hash_keys_in_pool.3
+MAN3+= hash_set_buckets_allocated.3
+MAN3+= hash_size.3
+MAN3+= hash_values.3
+MAN3+= hash_values_in_pool.3
+MAN3+= identity_matrix.3
+MAN3+= make_identity_matrix.3
+MAN3+= make_zero_vec.3
+MAN3+= new_hash.3
+MAN3+= new_identity_matrix.3
+MAN3+= new_matrix.3
+MAN3+= new_pool.3
+MAN3+= new_sash.3
+MAN3+= new_shash.3
+MAN3+= new_subpool.3
+MAN3+= new_subvector.3
+MAN3+= new_tree.3
+MAN3+= new_vec.3
+MAN3+= new_vector.3
+MAN3+= new_zero_vec.3
+MAN3+= pcalloc.3
+MAN3+= pchomp.3
+MAN3+= pchrs.3
+MAN3+= pconcat.3
+MAN3+= pdtoa.3
+MAN3+= pgetline.3
+MAN3+= pgetlinec.3
+MAN3+= pgetlinex.3
+MAN3+= pgrep.3
+MAN3+= pitoa.3
+MAN3+= pjoin.3
+MAN3+= plane_coefficients.3
+MAN3+= plane_translate_along_normal.3
+MAN3+= pmalloc.3
+MAN3+= pmap.3
+MAN3+= pmemdup.3
+MAN3+= point_distance_to_face.3
+MAN3+= point_distance_to_line.3
+MAN3+= point_distance_to_line_segment.3
+MAN3+= point_distance_to_plane.3
+MAN3+= point_face_angle_sum.3
+MAN3+= point_is_inside_plane.3
+MAN3+= point_lies_in_face.3
+MAN3+= pool_get_stats.3
+MAN3+= pool_register_cleanup_fn.3
+MAN3+= pool_register_fd.3
+MAN3+= pool_register_malloc.3
+MAN3+= pool_set_bad_malloc_handler.3
+MAN3+= prealloc.3
+MAN3+= precomp.3
+MAN3+= prematch.3
+MAN3+= presubst.3
+MAN3+= psort.3
+MAN3+= psprintf.3
+MAN3+= pstrcat.3
+MAN3+= pstrcsplit.3
+MAN3+= pstrcsplit2.3
+MAN3+= pstrdup.3
+MAN3+= pstrlwr.3
+MAN3+= pstrncat.3
+MAN3+= pstrndup.3
+MAN3+= pstrresplit.3
+MAN3+= pstrresplit2.3
+MAN3+= pstrs.3
+MAN3+= pstrsplit.3
+MAN3+= pstrsplit2.3
+MAN3+= pstrupr.3
+MAN3+= psubstr.3
+MAN3+= ptrim.3
+MAN3+= ptrimback.3
+MAN3+= ptrimfront.3
+MAN3+= pvdtostr.3
+MAN3+= pvector.3
+MAN3+= pvectora.3
+MAN3+= pvitostr.3
+MAN3+= pvsprintf.3
+MAN3+= pvxtostr.3
+MAN3+= pxtoa.3
+MAN3+= sash_erase.3
+MAN3+= sash_exists.3
+MAN3+= sash_get.3
+MAN3+= sash_get_buckets_allocated.3
+MAN3+= sash_get_buckets_used.3
+MAN3+= sash_insert.3
+MAN3+= sash_keys.3
+MAN3+= sash_keys_in_pool.3
+MAN3+= sash_set_buckets_allocated.3
+MAN3+= sash_size.3
+MAN3+= sash_values.3
+MAN3+= sash_values_in_pool.3
+MAN3+= shash_erase.3
+MAN3+= shash_exists.3
+MAN3+= shash_get.3
+MAN3+= shash_get_buckets_allocated.3
+MAN3+= shash_get_buckets_used.3
+MAN3+= shash_get_ptr.3
+MAN3+= shash_insert.3
+MAN3+= shash_keys.3
+MAN3+= shash_keys_in_pool.3
+MAN3+= shash_set_buckets_allocated.3
+MAN3+= shash_size.3
+MAN3+= shash_values.3
+MAN3+= shash_values_in_pool.3
+MAN3+= tree_clear.3
+MAN3+= tree_erase.3
+MAN3+= tree_erase_range.3
+MAN3+= tree_get.3
+MAN3+= tree_get_data.3
+MAN3+= tree_get_subnode.3
+MAN3+= tree_insert.3
+MAN3+= tree_insert_array.3
+MAN3+= tree_nr_subnodes.3
+MAN3+= tree_pop_back.3
+MAN3+= tree_pop_front.3
+MAN3+= tree_push_back.3
+MAN3+= tree_push_front.3
+MAN3+= tree_replace.3
+MAN3+= tree_replace_array.3
+MAN3+= tree_set_data.3
+MAN3+= tree_size.3
+MAN3+= tree_swap.3
+MAN3+= vec_angle_between.3
+MAN3+= vec_dot_product.3
+MAN3+= vec_magnitude.3
+MAN3+= vec_magnitude2d.3
+MAN3+= vec_magnitude_in_direction.3
+MAN3+= vec_normalize.3
+MAN3+= vec_normalize2d.3
+MAN3+= vector_allocated.3
+MAN3+= vector_clear.3
+MAN3+= vector_compare.3
+MAN3+= vector_element_size.3
+MAN3+= vector_erase.3
+MAN3+= vector_erase_range.3
+MAN3+= vector_fill.3
+MAN3+= vector_get.3
+MAN3+= vector_get_ptr.3
+MAN3+= vector_grep.3
+MAN3+= vector_grep_pool.3
+MAN3+= vector_insert.3
+MAN3+= vector_insert_array.3
+MAN3+= vector_map.3
+MAN3+= vector_map_pool.3
+MAN3+= vector_pop_back.3
+MAN3+= vector_pop_front.3
+MAN3+= vector_push_back.3
+MAN3+= vector_push_back_vector.3
+MAN3+= vector_push_front.3
+MAN3+= vector_push_front_vector.3
+MAN3+= vector_reallocate.3
+MAN3+= vector_replace.3
+MAN3+= vector_replace_array.3
+MAN3+= vector_reverse.3
+MAN3+= vector_size.3
+MAN3+= vector_sort.3
+MAN3+= vector_swap.3
+MAN3+= zero_vec.3
diff --git a/devel/c2lib/files/patch-Makefile+ b/devel/c2lib/files/patch-Makefile+
deleted file mode 100644
index ef7cd3827647..000000000000
--- a/devel/c2lib/files/patch-Makefile+
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile+~	Sun Dec  8 12:45:43 2002
-+++ Makefile+	Fri Dec 27 01:34:48 2002
-@@ -103,13 +103,13 @@
- 
- install:
- 	install -d $(DESTDIR)$(libdir)
--	install -d $(DESTDIR)$(includedir)
-+	install -d $(DESTDIR)$(pkgincludedir)
- 	install -d $(DESTDIR)$(man3dir)
- 	install -d $(DESTDIR)$(datadir)/rws/symtabs/
- 
- 	$(MP_INSTALL_STATIC_LIB) libc2.a
- 	$(MP_INSTALL_DYNAMIC_LIB) libc2.so
--	install -m 0644 $(HEADERS) $(DESTDIR)$(includedir)
-+	install -m 0644 $(HEADERS) $(DESTDIR)$(pkgincludedir)
- 	install -m 0644 *.3        $(DESTDIR)$(man3dir)
- 	install -m 0644 *.syms     $(DESTDIR)$(datadir)/rws/symtabs/
- 
diff --git a/devel/c2lib/manpages.mk b/devel/c2lib/manpages.mk
deleted file mode 100644
index 03b115d166cb..000000000000
--- a/devel/c2lib/manpages.mk
+++ /dev/null
@@ -1,200 +0,0 @@
-MAN3+=		_hash_erase.3
-MAN3+=		_hash_get.3
-MAN3+=		_hash_get_ptr.3
-MAN3+=		_hash_insert.3
-MAN3+=		_hash_new.3
-MAN3+=		_sash_get.3
-MAN3+=		_shash_get.3
-MAN3+=		_shash_get_ptr.3
-MAN3+=		_shash_insert.3
-MAN3+=		_tree_get_data.3
-MAN3+=		_tree_new.3
-MAN3+=		_tree_set_data.3
-MAN3+=		_vector_compare.3
-MAN3+=		_vector_fill.3
-MAN3+=		_vector_get.3
-MAN3+=		_vector_get_ptr.3
-MAN3+=		_vector_insert.3
-MAN3+=		_vector_map.3
-MAN3+=		_vector_map_pool.3
-MAN3+=		copy_hash.3
-MAN3+=		_vector_new.3
-MAN3+=		_vector_pop_back.3
-MAN3+=		_vector_pop_front.3
-MAN3+=		_vector_push_back.3
-MAN3+=		_vector_push_front.3
-MAN3+=		_vector_replace.3
-MAN3+=		_vector_sort.3
-MAN3+=		collision_moving_sphere_and_face.3
-MAN3+=		copy_sash.3
-MAN3+=		copy_shash.3
-MAN3+=		copy_tree.3
-MAN3+=		copy_vector.3
-MAN3+=		delete_pool.3
-MAN3+=		face_translate_along_normal.3
-MAN3+=		global_pool.3
-MAN3+=		hash_erase.3
-MAN3+=		hash_exists.3
-MAN3+=		hash_get.3
-MAN3+=		hash_get_buckets_used.3
-MAN3+=		hash_get_buckets_allocated.3
-MAN3+=		hash_get_ptr.3
-MAN3+=		hash_insert.3
-MAN3+=		hash_keys.3
-MAN3+=		hash_keys_in_pool.3
-MAN3+=		hash_set_buckets_allocated.3
-MAN3+=		hash_size.3
-MAN3+=		hash_values.3
-MAN3+=		hash_values_in_pool.3
-MAN3+=		identity_matrix.3
-MAN3+=		make_identity_matrix.3
-MAN3+=		make_zero_vec.3
-MAN3+=		new_hash.3
-MAN3+=		new_identity_matrix.3
-MAN3+=		new_matrix.3
-MAN3+=		new_pool.3
-MAN3+=		new_sash.3
-MAN3+=		new_shash.3
-MAN3+=		new_subpool.3
-MAN3+=		pchrs.3
-MAN3+=		new_subvector.3
-MAN3+=		new_tree.3
-MAN3+=		new_vec.3
-MAN3+=		new_vector.3
-MAN3+=		new_zero_vec.3
-MAN3+=		pcalloc.3
-MAN3+=		pchomp.3
-MAN3+=		pconcat.3
-MAN3+=		pdtoa.3
-MAN3+=		pgetline.3
-MAN3+=		pgetlinec.3
-MAN3+=		pgetlinex.3
-MAN3+=		pgrep.3
-MAN3+=		pitoa.3
-MAN3+=		pjoin.3
-MAN3+=		plane_coefficients.3
-MAN3+=		plane_translate_along_normal.3
-MAN3+=		pmalloc.3
-MAN3+=		pmap.3
-MAN3+=		pmemdup.3
-MAN3+=		point_distance_to_face.3
-MAN3+=		point_distance_to_line.3
-MAN3+=		psort.3
-MAN3+=		point_distance_to_line_segment.3
-MAN3+=		point_distance_to_plane.3
-MAN3+=		point_face_angle_sum.3
-MAN3+=		point_is_inside_plane.3
-MAN3+=		point_lies_in_face.3
-MAN3+=		pool_get_stats.3
-MAN3+=		pool_register_cleanup_fn.3
-MAN3+=		pool_register_fd.3
-MAN3+=		pool_register_malloc.3
-MAN3+=		pool_set_bad_malloc_handler.3
-MAN3+=		prealloc.3
-MAN3+=		precomp.3
-MAN3+=		prematch.3
-MAN3+=		presubst.3
-MAN3+=		psprintf.3
-MAN3+=		pstrcat.3
-MAN3+=		pstrcsplit.3
-MAN3+=		pstrcsplit2.3
-MAN3+=		pstrdup.3
-MAN3+=		pstrlwr.3
-MAN3+=		pstrncat.3
-MAN3+=		pstrndup.3
-MAN3+=		pstrresplit.3
-MAN3+=		pstrresplit2.3
-MAN3+=		pstrs.3
-MAN3+=		pstrsplit.3
-MAN3+=		pstrsplit2.3
-MAN3+=		pstrupr.3
-MAN3+=		psubstr.3
-MAN3+=		ptrim.3
-MAN3+=		ptrimback.3
-MAN3+=		ptrimfront.3
-MAN3+=		pvdtostr.3
-MAN3+=		pvector.3
-MAN3+=		pvectora.3
-MAN3+=		pvitostr.3
-MAN3+=		pvsprintf.3
-MAN3+=		pvxtostr.3
-MAN3+=		pxtoa.3
-MAN3+=		sash_erase.3
-MAN3+=		sash_exists.3
-MAN3+=		sash_get.3
-MAN3+=		sash_keys.3
-MAN3+=		sash_get_buckets_allocated.3
-MAN3+=		sash_get_buckets_used.3
-MAN3+=		sash_insert.3
-MAN3+=		sash_keys_in_pool.3
-MAN3+=		sash_set_buckets_allocated.3
-MAN3+=		sash_size.3
-MAN3+=		sash_values.3
-MAN3+=		sash_values_in_pool.3
-MAN3+=		shash_erase.3
-MAN3+=		shash_exists.3
-MAN3+=		shash_get.3
-MAN3+=		shash_get_buckets_allocated.3
-MAN3+=		shash_get_buckets_used.3
-MAN3+=		shash_get_ptr.3
-MAN3+=		shash_insert.3
-MAN3+=		shash_keys.3
-MAN3+=		shash_keys_in_pool.3
-MAN3+=		shash_size.3
-MAN3+=		shash_set_buckets_allocated.3
-MAN3+=		shash_values.3
-MAN3+=		shash_values_in_pool.3
-MAN3+=		tree_clear.3
-MAN3+=		tree_erase.3
-MAN3+=		tree_erase_range.3
-MAN3+=		tree_get.3
-MAN3+=		tree_get_data.3
-MAN3+=		tree_get_subnode.3
-MAN3+=		tree_insert.3
-MAN3+=		tree_insert_array.3
-MAN3+=		tree_nr_subnodes.3
-MAN3+=		tree_pop_back.3
-MAN3+=		tree_pop_front.3
-MAN3+=		tree_push_back.3
-MAN3+=		tree_push_front.3
-MAN3+=		tree_replace.3
-MAN3+=		tree_replace_array.3
-MAN3+=		tree_set_data.3
-MAN3+=		tree_size.3
-MAN3+=		tree_swap.3
-MAN3+=		vec_angle_between.3
-MAN3+=		vec_dot_product.3
-MAN3+=		vec_magnitude.3
-MAN3+=		vec_magnitude2d.3
-MAN3+=		vec_magnitude_in_direction.3
-MAN3+=		vec_normalize.3
-MAN3+=		vec_normalize2d.3
-MAN3+=		vector_allocated.3
-MAN3+=		vector_clear.3
-MAN3+=		vector_compare.3
-MAN3+=		vector_element_size.3
-MAN3+=		vector_erase.3
-MAN3+=		vector_erase_range.3
-MAN3+=		vector_fill.3
-MAN3+=		vector_get.3
-MAN3+=		vector_get_ptr.3
-MAN3+=		vector_grep.3
-MAN3+=		vector_grep_pool.3
-MAN3+=		vector_insert.3
-MAN3+=		vector_insert_array.3
-MAN3+=		vector_map.3
-MAN3+=		vector_map_pool.3
-MAN3+=		vector_pop_back.3
-MAN3+=		vector_pop_front.3
-MAN3+=		vector_push_back.3
-MAN3+=		vector_push_back_vector.3
-MAN3+=		vector_push_front.3
-MAN3+=		vector_push_front_vector.3
-MAN3+=		vector_reallocate.3
-MAN3+=		vector_replace.3
-MAN3+=		vector_replace_array.3
-MAN3+=		vector_reverse.3
-MAN3+=		vector_size.3
-MAN3+=		vector_sort.3
-MAN3+=		vector_swap.3
-MAN3+=		zero_vec.3
diff --git a/devel/c2lib/pkg-plist b/devel/c2lib/pkg-plist
index 53d77643a549..7d2e9514bb12 100644
--- a/devel/c2lib/pkg-plist
+++ b/devel/c2lib/pkg-plist
@@ -5,10 +5,10 @@ include/c2lib/pre.h
 include/c2lib/pstring.h
 include/c2lib/tree.h
 include/c2lib/vector.h
-lib/libc2.a
-lib/libc2.so
-lib/libc2.so.1
-lib/libc2.so.1.3.0
-share/rws/symtabs/libc2.syms
+lib/libc2lib.a
+lib/libc2lib.so
+lib/libc2lib.so.1
+lib/libc2lib.so.1.4.1
+share/rws/symtabs/libc2lib.syms
+@dirrm include/c2lib
 @unexec /bin/rmdir %D/share/rws/symtabs 2>/dev/null || true
-@unexec /bin/rmdir %D/share/rws 2>/dev/null || true