Attachment 183648 Details for Bug 220156 – Update patch

[patch] Update patch

miller-5.2.1.patch (text/plain), 3.69 KB, created by Jimmy Olgeni on 2017-06-20 10:41:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jimmy Olgeni

Created: 2017-06-20 10:41:05 UTC

Size: 3.69 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 443945)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	miller
>-PORTVERSION=	3.3.2
>+PORTVERSION=	5.2.1
> DISTVERSIONPREFIX=v
> CATEGORIES=	textproc
> 
>@@ -20,8 +20,4 @@
> 
> BROKEN_aarch64=		Fails to compile: undefined reference to .mcount
> 
>-post-configure:
>-	${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-c_Makefile
>-	${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-libtool
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 443945)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (johnkerl-miller-v3.3.2_GH0.tar.gz) = 77cbec3f41b60361ce1c7b6dd7fa4d253c7ba169db270565862f523ca965eb96
>-SIZE (johnkerl-miller-v3.3.2_GH0.tar.gz) = 3205282
>+TIMESTAMP = 1497938440
>+SHA256 (johnkerl-miller-v5.2.1_GH0.tar.gz) = 0160e5fbbff7c3606037b616b5e30a714d16bb160a950d51fde112fca9d6a763
>+SIZE (johnkerl-miller-v5.2.1_GH0.tar.gz) = 5020833
>Index: files/extra-patch-c_Makefile
>===================================================================
>--- files/extra-patch-c_Makefile	(revision 443945)
>+++ files/extra-patch-c_Makefile	(nonexistent)
>@@ -1,30 +0,0 @@
>---- c/Makefile.orig	2016-01-31 11:19:35 UTC
>-+++ c/Makefile
>-@@ -370,7 +370,7 @@ mlr_LDADD = \
>- 			lib/libmlr.la \
>- 			dsls/libfdsl.la \
>- 			dsls/libpdsl.la \
>--			-lm
>-+			-lm -lc
>- 
>- 
>- # Other executable variants
>-@@ -483,15 +483,15 @@ clean-noinstPROGRAMS:
>- 
>- mlr$(EXEEXT): $(mlr_OBJECTS) $(mlr_DEPENDENCIES) $(EXTRA_mlr_DEPENDENCIES) 
>- 	@rm -f mlr$(EXEEXT)
>--	$(AM_V_CCLD)$(LINK) $(mlr_OBJECTS) $(mlr_LDADD) $(LIBS)
>-+	$(AM_V_CCLD)$(LINK) $(mlr_OBJECTS) $(mlr_LDADD) $(LIBS) -lc
>- 
>- mlrg$(EXEEXT): $(mlrg_OBJECTS) $(mlrg_DEPENDENCIES) $(EXTRA_mlrg_DEPENDENCIES) 
>- 	@rm -f mlrg$(EXEEXT)
>--	$(AM_V_CCLD)$(mlrg_LINK) $(mlrg_OBJECTS) $(mlrg_LDADD) $(LIBS)
>-+	$(AM_V_CCLD)$(mlrg_LINK) $(mlrg_OBJECTS) $(mlrg_LDADD) $(LIBS) -lc
>- 
>- mlrp$(EXEEXT): $(mlrp_OBJECTS) $(mlrp_DEPENDENCIES) $(EXTRA_mlrp_DEPENDENCIES) 
>- 	@rm -f mlrp$(EXEEXT)
>--	$(AM_V_CCLD)$(mlrp_LINK) $(mlrp_OBJECTS) $(mlrp_LDADD) $(LIBS)
>-+	$(AM_V_CCLD)$(mlrp_LINK) $(mlrp_OBJECTS) $(mlrp_LDADD) $(LIBS) -lc
>- 
>- mostlyclean-compile:
>- 	-rm -f *.$(OBJEXT)
>
>Property changes on: files/extra-patch-c_Makefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/extra-patch-libtool
>===================================================================
>--- files/extra-patch-libtool	(revision 443945)
>+++ files/extra-patch-libtool	(nonexistent)
>@@ -1,13 +0,0 @@
>---- libtool.orig	2016-01-31 11:54:21 UTC
>-+++ libtool
>-@@ -7514,10 +7514,6 @@ func_mode_link ()
>- 	    # These systems don't actually have a C library (as such)
>- 	    test X-lc = "X$arg" && continue
>- 	    ;;
>--	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
>--	    # Do not include libc due to us having libc/libc_r.
>--	    test X-lc = "X$arg" && continue
>--	    ;;
>- 	  *-*-rhapsody* | *-*-darwin1.[012])
>- 	    # Rhapsody C and math libraries are in the System framework
>- 	    func_append deplibs " System.ltframework"
>
>Property changes on: files/extra-patch-libtool
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

olgeni: maintainer-approval? (Jungleboogie0)

Actions: View | Diff

Attachments on bug 220156: 183648