Attachment 130034 Details for Bug 174106 – file.diff

[patch] file.diff

file.diff (text/plain), 5.18 KB, created by Eijiro Shibusawa on 2012-12-04 14:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eijiro Shibusawa

Created: 2012-12-04 14:40:00 UTC

Size: 5.18 KB

patch

obsolete

>diff -uNr /usr/ports/devel/hwloc/./Makefile ./Makefile
>--- /usr/ports/devel/hwloc/./Makefile	2012-11-17 14:55:50.000000000 +0900
>+++ ./Makefile	2012-12-04 00:18:02.000000000 +0900
>@@ -1,10 +1,10 @@
> # $FreeBSD: ports/devel/hwloc/Makefile,v 1.6 2012/11/17 05:55:50 svnexp Exp $
> 
> PORTNAME=	hwloc
>-PORTVERSION=	1.5.1
>+PORTVERSION=	1.6
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.open-mpi.org/software/hwloc/v1.5/downloads/ \
>-		http://icl.cs.utk.edu/open-mpi/software/hwloc/v1.5/downloads/
>+MASTER_SITES=	http://www.open-mpi.org/software/hwloc/v1.6/downloads/ \
>+		http://icl.cs.utk.edu/open-mpi/software/hwloc/v1.6/downloads/
> 
> MAINTAINER=	phd_kimberlite@yahoo.co.jp
> COMMENT=	The Portable Hardware Locality software package
>diff -uNr /usr/ports/devel/hwloc/./Makefile.man ./Makefile.man
>--- /usr/ports/devel/hwloc/./Makefile.man	2012-11-17 14:55:50.000000000 +0900
>+++ ./Makefile.man	2012-12-04 00:37:24.000000000 +0900
>@@ -1,6 +1,7 @@
> # $FreeBSD: ports/devel/hwloc/Makefile.man,v 1.2 2012/11/17 05:55:50 svnexp Exp $
> 
>-MAN1=		hwloc-assembler-remote.1 \
>+MAN1=		hwloc-annotate.1 \
>+		hwloc-assembler-remote.1 \
> 		hwloc-assembler.1 \
> 		hwloc-bind.1 \
> 		hwloc-calc.1 \
>@@ -146,6 +147,8 @@
> 		hwloc_distances_s.3 \
> 		hwloc_distribute.3 \
> 		hwloc_distributev.3 \
>+		hwloc_export_obj_userdata.3 \
>+		hwloc_export_obj_userdata_base64.3 \
> 		hwloc_free.3 \
> 		hwloc_free_xmlbuffer.3 \
> 		hwloc_get_ancestor_obj_by_depth.3 \
>@@ -290,6 +293,8 @@
> 		hwloc_topology_set_fsroot.3 \
> 		hwloc_topology_set_pid.3 \
> 		hwloc_topology_set_synthetic.3 \
>+		hwloc_topology_set_userdata_export_callback.3 \
>+		hwloc_topology_set_userdata_import_callback.3 \
> 		hwloc_topology_set_xml.3 \
> 		hwloc_topology_set_xmlbuffer.3 \
> 		hwloc_topology_support.3 \
>@@ -329,7 +334,8 @@
> 		hwlocality_tinker.3 \
> 		hwlocality_topology.3 \
> 		hwlocality_traversal.3 \
>-		hwlocality_types.3
>+		hwlocality_types.3 \
>+		hwlocality_xmlexport.3
> 
> MAN7=		hwloc.7
> 
>diff -uNr /usr/ports/devel/hwloc/./distinfo ./distinfo
>--- /usr/ports/devel/hwloc/./distinfo	2012-10-22 22:00:47.000000000 +0900
>+++ ./distinfo	2012-12-04 00:18:35.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (hwloc-1.5.1.tar.bz2) = d255bf369d8922bb3e1330b84e3bc5dd9a8ce6cb3c8cbb3af0f4288840087711
>-SIZE (hwloc-1.5.1.tar.bz2) = 2888571
>+SHA256 (hwloc-1.6.tar.bz2) = bc08c84cb37d6aa3f889ba142ec3e57d24ce9a18a4d2e25471e1e2e8f30aa678
>+SIZE (hwloc-1.6.tar.bz2) = 3067679
>diff -uNr /usr/ports/devel/hwloc/./files/patch-utils+Makefile.in ./files/patch-utils+Makefile.in
>--- /usr/ports/devel/hwloc/./files/patch-utils+Makefile.in	2012-08-02 04:22:27.000000000 +0900
>+++ ./files/patch-utils+Makefile.in	2012-12-04 00:27:32.000000000 +0900
>@@ -1,12 +1,12 @@
>---- utils/Makefile.in.orig	2012-07-30 17:36:52.000000000 +0900
>-+++ utils/Makefile.in	2012-08-01 16:17:49.000000000 +0900
>-@@ -1477,9 +1477,7 @@
>- @HWLOC_BUILD_UTILS_TRUE@@HWLOC_HAVE_CAIRO_FALSE@@HWLOC_HAVE_WINDOWS_FALSE@	rm -f $(DESTDIR)$(bindir)/lstopo
>- @HWLOC_BUILD_UTILS_TRUE@@HWLOC_HAVE_CAIRO_FALSE@@HWLOC_HAVE_WINDOWS_FALSE@	cd $(DESTDIR)$(bindir) && $(LN_S) lstopo-no-graphics$(EXEEXT) lstopo$(EXEEXT) || true
>- @HWLOC_BUILD_UTILS_TRUE@	rm -f $(DESTDIR)$(man1dir)/hwloc-ls.1 $(DESTDIR)$(man1dir)/hwloc-info.1
>--@HWLOC_BUILD_UTILS_TRUE@	cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 hwloc-ls.1 && $(LN_S) lstopo.1 hwloc-info.1
>- @HWLOC_BUILD_UTILS_TRUE@	rm -f $(DESTDIR)$(man1dir)/lstopo-no-graphics.1
>--@HWLOC_BUILD_UTILS_TRUE@	cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 lstopo-no-graphics.1
>- @HWLOC_BUILD_UTILS_TRUE@	$(SED) -e 's/abs_top_builddir\/utils/bindir/' -e '/abs_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-assembler-remote > $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp $(DESTDIR)$(bindir)/hwloc-assembler-remote
>- @HWLOC_BUILD_UTILS_TRUE@	chmod +x $(DESTDIR)$(bindir)/hwloc-assembler-remote
>+--- utils/Makefile.in.orig	2012-12-04 00:27:15.000000000 +0900
>++++ utils/Makefile.in	2012-12-04 00:27:30.000000000 +0900
>+@@ -1505,9 +1505,7 @@
>+ @HWLOC_HAVE_CAIRO_FALSE@@HWLOC_HAVE_WINDOWS_FALSE@	rm -f $(DESTDIR)$(bindir)/lstopo
>+ @HWLOC_HAVE_CAIRO_FALSE@@HWLOC_HAVE_WINDOWS_FALSE@	cd $(DESTDIR)$(bindir) && $(LN_S) lstopo-no-graphics$(EXEEXT) lstopo$(EXEEXT) || true
>+ 	rm -f $(DESTDIR)$(man1dir)/hwloc-ls.1 $(DESTDIR)$(man1dir)/hwloc-info.1
>+-	cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 hwloc-ls.1 && $(LN_S) lstopo.1 hwloc-info.1
>+ 	rm -f $(DESTDIR)$(man1dir)/lstopo-no-graphics.1
>+-	cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 lstopo-no-graphics.1
>+ 	$(SED) -e 's/abs_top_builddir\/utils/bindir/' -e '/abs_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-assembler-remote > $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp $(DESTDIR)$(bindir)/hwloc-assembler-remote
>+ 	chmod +x $(DESTDIR)$(bindir)/hwloc-assembler-remote
>  
>diff -uNr /usr/ports/devel/hwloc/./pkg-plist ./pkg-plist
>--- /usr/ports/devel/hwloc/./pkg-plist	2012-10-22 22:00:47.000000000 +0900
>+++ ./pkg-plist	2012-12-04 00:35:17.000000000 +0900
>@@ -1,3 +1,4 @@
>+bin/hwloc-annotate
> bin/hwloc-assembler
> bin/hwloc-assembler-remote
> bin/hwloc-bind
>@@ -21,7 +22,7 @@
> lib/libhwloc.a
> lib/libhwloc.la
> lib/libhwloc.so
>-lib/libhwloc.so.6
>+lib/libhwloc.so.7
> libdata/pkgconfig/hwloc.pc
> share/hwloc/hwloc-valgrind.supp
> share/hwloc/hwloc.dtd

Actions: View | Diff

Attachments on bug 174106: 130034