The final version of the makeplus patch, which should be integrated into the

upstream on the next version. (I've been helping the author with make issues).
Bump portrev on that one.

c2lib: just autogen'd the plist and manpage list because the make+ patch
let me do it and test it. Nothing materially different. Just cosmetic, really.

4 files changed, 248 insertions, 208 deletions

diff --git a/devel/c2lib/files/manpages.mk b/devel/c2lib/files/manpages.mk
index 295ea66f8a6e..03b115d166cb 100644
--- a/devel/c2lib/files/manpages.mk
+++ b/devel/c2lib/files/manpages.mk
@@ -1,200 +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
+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 7d2e9514bb12..91639bdeafd3 100644
--- a/devel/c2lib/pkg-plist
+++ b/devel/c2lib/pkg-plist
@@ -10,5 +10,6 @@ lib/libc2lib.so
 lib/libc2lib.so.1
 lib/libc2lib.so.1.4.1
 share/rws/symtabs/libc2lib.syms
+@dirrm share/rws/symtabs
+@dirrm share/rws
 @dirrm include/c2lib
-@unexec /bin/rmdir %D/share/rws/symtabs 2>/dev/null || true
diff --git a/devel/makeplus/Makefile b/devel/makeplus/Makefile
index aa777ffee986..889bc9c4bd5d 100644
--- a/devel/makeplus/Makefile
+++ b/devel/makeplus/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	makeplus
 PORTVERSION=	0.1.2
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.annexia.org/freeware/${PORTNAME}/
diff --git a/devel/makeplus/files/patch-configure_start.sh b/devel/makeplus/files/patch-configure_start.sh
index 26c74a891be0..f39da75c305e 100644
--- a/devel/makeplus/files/patch-configure_start.sh
+++ b/devel/makeplus/files/patch-configure_start.sh
@@ -1,9 +1,33 @@
 --- configure_start.sh.orig	Sat Feb  8 05:00:52 2003
-+++ configure_start.sh	Sun Feb  9 22:49:19 2003
-@@ -45,16 +45,17 @@
- pkgetcdir	= $pkgetcdir
- pkglibdir	= $pkglibdir
- pkgincludedir	= $pkgincludedir
++++ configure_start.sh	Mon Feb 10 18:30:53 2003
+@@ -28,33 +28,41 @@
+ #define VERSION "$VERSION"
+ EOF
+ 
++case `uname` in 
++    *BSD) 
++	manprefix="\$(prefix)";;
++    *)	
++	manprefix="\$(datadir)";;
++esac
++
+ cat > config.mk <<EOF
+ prefix		= $prefix
+-bindir		= $bindir
+-sbindir		= $sbindir
+-libexecdir	= $libexecdir
+-datadir		= $datadir
+-sysconfdir	= $sysconfdir
+-sharedstatedir	= $sharedstatedir
+-localstatedir	= $localstatedir
+-libdir		= $libdir
+-infodir		= $infodir
+-includedir	= $includedir
+-pkgdatadir	= $pkgdatadir
+-docdir		= $docdir
+-pkgetcdir	= $pkgetcdir
+-pkglibdir	= $pkglibdir
+-pkgincludedir	= $pkgincludedir
 -manprefix	= $datadir
 -mandir		= $mandir
 -man1dir		= $man1dir
@@ -18,7 +42,22 @@
 -manldir		= $manldir
 -EOF
 \ No newline at end of file
-+manprefix	= \$(prefix)
++bindir		= \$(prefix)/bin
++sbindir		= \$(prefix)/sbin
++libexecdir	= \$(prefix)/libexec
++datadir		= \$(prefix)/share
++sysconfdir	= \$(prefix)/etc
++sharedstatedir	= \$(prefix)/com
++localstatedir	= \$(prefix)/var
++libdir		= \$(prefix)/lib
++infodir		= \$(prefix)/info
++includedir	= \$(prefix)/include
++pkgdatadir	= \$(datadir)/$PACKAGE
++docdir		= \$(datadir)/doc/$PACKAGE
++pkgetcdir	= \$(sysconfdir)/$PACKAGE
++pkglibdir	= \$(libdir)/$PACKAGE
++pkgincludedir	= \$(includedir)/$PACKAGE
++manprefix	= $manprefix
 +mandir		= \$(manprefix)/man
 +man1dir		= \$(mandir)/man1
 +man2dir		= \$(mandir)/man2