<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/070fecfbdb6c77bba6641555c26cea1cb4eead7d">https://github.com/macports/macports-ports/commit/070fecfbdb6c77bba6641555c26cea1cb4eead7d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 070fecf disktype: correct patch and build settings
</span>070fecf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 070fecfbdb6c77bba6641555c26cea1cb4eead7d
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Sun Mar 12 15:09:44 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> disktype: correct patch and build settings
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This may or may not fix the issues in the bug report. It builds fine
</span><span style='display:block; white-space:pre;color:#404040;'> for me using clang or gcc.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see https://trac.macports.org/ticket/53781
</span>---
sysutils/disktype/Portfile | 28 ++++++-------------
sysutils/disktype/files/patch-Makefile.diff | 43 ++++++++++++++++-------------
2 files changed, 33 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/disktype/Portfile b/sysutils/disktype/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d614df..56fb94e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/disktype/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/disktype/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ PortSystem 1.0
</span>
name disktype
version 9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories sysutils
license MIT
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,31 +15,21 @@ long_description \
</span> homepage http://disktype.sourceforge.net/
master_sites sourceforge:project/disktype/disktype/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 5ccc55d1c47f9a37becce7336c4aa3a7a43cc89c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d4bc6c2a00225a444fc0707cf5fbd311423509f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b6701254d88412bc5d2db869037745f65f94b900b59184157d072f35832c1111
</span>
patchfiles patch-Makefile.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@UNIVERSAL_CPPFLAGS@@|${configure.universal_cppflags}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@UNIVERSAL_CFLAGS@@|${configure.universal_cflags}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@UNIVERSAL_LDFLAGS@@|${configure.universal_ldflags}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@UNIVERSAL_CPPFLAGS@@||" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@UNIVERSAL_CFLAGS@@||" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@UNIVERSAL_LDFLAGS@@||" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant universal {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
xinstall -m 755 -s ${worksrcpath}/disktype ${destroot}${prefix}/sbin
xinstall -m 644 ${worksrcpath}/disktype.1 \
${destroot}${prefix}/share/man/man1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/disktype/files/patch-Makefile.diff b/sysutils/disktype/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a016242..2824136 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/disktype/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/disktype/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2006-01-12 10:55:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2008-11-15 15:43:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,13 +28,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #CPPFLAGS += -DUSE_IOCTL_FREEBSD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(system),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CPPFLAGS += -DUSE_MACOS_TYPE -DUSE_IOCTL_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPPFLAGS += -DUSE_MACOS_TYPE -DUSE_IOCTL_DARWIN @@UNIVERSAL_CPPFLAGS@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFLAGS += @@UNIVERSAL_CFLAGS@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDFLAGS += @@UNIVERSAL_LDFLAGS@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS += -framework CoreServices
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ifeq (/Developer/SDKs/MacOSX10.4u.sdk,$(wildcard /Developer/SDKs/MacOSX10.4u.sdk))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CPPFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS += -arch i386 -arch ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS += -arch i386 -arch ppc -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(system),AmigaOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC += -noixemul
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile 2017-03-12 14:42:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2017-03-12 14:43:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ###
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RM = rm -f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC = gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJS = main.o lib.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buffer.o file.o cdaccess.o cdimage.o vpc.o compressed.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,10 +12,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET = disktype
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CPPFLAGS = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS = -Wall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -Wall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS +=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(NOSYS),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system = $(shell uname)
</span></pre><pre style='margin:0'>
</pre>