pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mdds: simplify and misc cosmetic fixes



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed Dec 2 20:52:14 2015 +0100
Changeset:	c7eac8b6c5b7a6ea4aa1341dd278131833ac0804

Modified Files:
	mdds/Makefile
	mdds/PLIST
	mdds/buildlink3.mk

Log Message:
mdds: simplify and misc cosmetic fixes

o Simplify the package: get rid of our do-install and use the upstream target
instead (needed "gmake") and update PLIST accordingly
o Update the HOMEPAGE
o Get rid of various comments in buildlink3.mk and uncomment boost-libs bl3.
o Minor cosmetic fixes thanks to pkglint -Wall.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c7eac8b6c5b7a6ea4aa1341dd278131833ac0804

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mdds/Makefile      | 20 ++++---------------
 mdds/PLIST         | 56 ++++++++++++++++++++++++++++++------------------------
 mdds/buildlink3.mk | 10 ++--------
 3 files changed, 37 insertions(+), 49 deletions(-)

diffs:
diff --git a/mdds/Makefile b/mdds/Makefile
index aa3f949..ee8a5a8 100644
--- a/mdds/Makefile
+++ b/mdds/Makefile
@@ -3,31 +3,19 @@
 DISTNAME=	mdds_1.0.0
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	devel
-MASTER_SITES= http://kohei.us/files/mdds/src/
+MASTER_SITES=	http://kohei.us/files/mdds/src/
 EXTRACT_SUFX=	.tar.bz2
-EXTRACT_USING=	gtar
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://code.google.com/p/multidimalgorithm/
+HOMEPAGE=	https://gitlab.com/mdds/mdds
 COMMENT=	Collection of multi-dimensional data structure and indexing algorithms
 LICENSE=	mit
 
-USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
-#NO_BUILD=		yes
-#INSTALLATION_DIRS=		share/pkgconfig
-INSTALLATION_DIRS=include/mdds
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake
 PKGCONFIG_OVERRIDE+=	misc/mdds.pc.in
 
-do-install:
-	for i in ${WRKSRC}/include/mdds/*.hpp; do \
-		${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/include/mdds; \
-	done
-	for i in ${WRKSRC}/include/mdds/*.inl; do \
-		${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/include/mdds; \
-	done
-#	${INSTALL_DATA} ${WRKSRC}/misc/mdds.pc ${DESTDIR}${PREFIX}/share/pkgconfig
-
 BUILDLINK_DEPMETHOD.boost-headers?=	build
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/mdds/PLIST b/mdds/PLIST
index 587a6ef..845f859 100644
--- a/mdds/PLIST
+++ b/mdds/PLIST
@@ -1,26 +1,32 @@
 @comment $NetBSD$
-include/mdds/default_deleter.hpp
-include/mdds/flat_segment_tree.hpp
-include/mdds/flat_segment_tree_def.inl
-include/mdds/flat_segment_tree_itr.hpp
-include/mdds/global.hpp
-include/mdds/multi_type_matrix.hpp
-include/mdds/multi_type_matrix_def.inl
-include/mdds/multi_type_vector.hpp
-include/mdds/multi_type_vector_custom_func1.hpp
-include/mdds/multi_type_vector_custom_func2.hpp
-include/mdds/multi_type_vector_custom_func3.hpp
-include/mdds/multi_type_vector_def.inl
-include/mdds/multi_type_vector_itr.hpp
-include/mdds/multi_type_vector_macro.hpp
-include/mdds/multi_type_vector_trait.hpp
-include/mdds/multi_type_vector_types.hpp
-include/mdds/node.hpp
-include/mdds/point_quad_tree.hpp
-include/mdds/quad_node.hpp
-include/mdds/rectangle_set.hpp
-include/mdds/rectangle_set_def.inl
-include/mdds/segment_tree.hpp
-include/mdds/segment_tree_def.inl
-include/mdds/sorted_string_map.hpp
-include/mdds/sorted_string_map_def.inl
+include/mdds-1.0/mdds/default_deleter.hpp
+include/mdds-1.0/mdds/flat_segment_tree.hpp
+include/mdds-1.0/mdds/flat_segment_tree_def.inl
+include/mdds-1.0/mdds/flat_segment_tree_itr.hpp
+include/mdds-1.0/mdds/global.hpp
+include/mdds-1.0/mdds/multi_type_matrix.hpp
+include/mdds-1.0/mdds/multi_type_matrix_def.inl
+include/mdds-1.0/mdds/multi_type_vector.hpp
+include/mdds-1.0/mdds/multi_type_vector_custom_func1.hpp
+include/mdds-1.0/mdds/multi_type_vector_custom_func2.hpp
+include/mdds-1.0/mdds/multi_type_vector_custom_func3.hpp
+include/mdds-1.0/mdds/multi_type_vector_def.inl
+include/mdds-1.0/mdds/multi_type_vector_itr.hpp
+include/mdds-1.0/mdds/multi_type_vector_macro.hpp
+include/mdds-1.0/mdds/multi_type_vector_trait.hpp
+include/mdds-1.0/mdds/multi_type_vector_types.hpp
+include/mdds-1.0/mdds/node.hpp
+include/mdds-1.0/mdds/point_quad_tree.hpp
+include/mdds-1.0/mdds/quad_node.hpp
+include/mdds-1.0/mdds/rectangle_set.hpp
+include/mdds-1.0/mdds/rectangle_set_def.inl
+include/mdds-1.0/mdds/segment_tree.hpp
+include/mdds-1.0/mdds/segment_tree_def.inl
+include/mdds-1.0/mdds/sorted_string_map.hpp
+include/mdds-1.0/mdds/sorted_string_map_def.inl
+share/doc/mdds-1.0/AUTHORS
+share/doc/mdds-1.0/COPYING
+share/doc/mdds-1.0/NEWS
+share/doc/mdds-1.0/README.md
+share/doc/mdds-1.0/VERSION
+share/pkgconfig/mdds-1.0.pc
diff --git a/mdds/buildlink3.mk b/mdds/buildlink3.mk
index 6cca455..fb9f415 100644
--- a/mdds/buildlink3.mk
+++ b/mdds/buildlink3.mk
@@ -1,4 +1,5 @@
 # $NetBSD$
+
 BUILDLINK_TREE+=	mdds
 
 .if !defined(MDDS_BUILDLINK3_MK)
@@ -7,14 +8,7 @@ MDDS_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.mdds+=	mdds>=1.0.0
 BUILDLINK_PKGSRCDIR.mdds?=	../../wip/mdds
 
-# XXX
-# XXX Uncomment and keep only the buildlink3 lines below which are directly
-# XXX needed for dependencies to compile, link, and run.  If this package
-# XXX provides a wrappered API or otherwise does not expose the APIs of the
-# XXX buildlink3 lines below to dependencies, remove them.
-# XXX
-#.include "../../devel/boost-headers/buildlink3.mk"
-#.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
 .endif	# MDDS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-mdds


Home | Main Index | Thread Index | Old Index