Hello Ports,

The following diff updates devel/check from v0.10.0 to 0.12.0, as well as
updating the master site from SourceForge to GitHub. This change was
required for a personal project which utilizes the ck_assert_ldouble_*
macros, which were introduced in 0.11.0.

I was unsure whether modifying the existing patches or creating new patches
was the correct way to go. This diff modifies the existing patches, but I
could re-do this with fresh patches if that is more appropriate.

This has update been tested successfully against my own code on amd64. Any
testing or feedback would be greatly appreciated.

- Peter

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/check/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 11 Mar 2016 19:59:12 -0000 1.14
+++ Makefile 15 May 2019 16:28:42 -0000
@@ -2,19 +2,20 @@

 COMMENT = unit test framework for C programs

-DISTNAME = check-0.10.0
+V =             0.12.0
+DISTNAME = check-$V
 SHARED_LIBS +=  check                3.0      # unknown

 CATEGORIES = devel

-HOMEPAGE = http://check.sf.net/
+HOMEPAGE = https://libcheck.github.io/check/

 # LGPLv2.1
 PERMIT_PACKAGE_CDROM = Yes

 WANTLIB += m pthread

-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=check/}
+MASTER_SITES = https://github.com/libcheck/check/releases/download/$V/

 CONFIGURE_STYLE = gnu

Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/check/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 26 Aug 2015 15:12:24 -0000 1.9
+++ distinfo 15 May 2019 16:28:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (check-0.10.0.tar.gz) = 9fUHZqpvj+Wi33UmZsoBqVCt1FB5qgZBa4N2Wxz3EFI=
-SIZE (check-0.10.0.tar.gz) = 769119
+SHA256 (check-0.12.0.tar.gz) = RkIBCYvuAOkPXEvfqUpdPq2NZB+QJbVgondVqDuCQjQ=
+SIZE (check-0.12.0.tar.gz) = 764043
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/check/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in 26 Aug 2015 15:12:24 -0000 1.5
+++ patches/patch-Makefile_in 15 May 2019 16:28:42 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_in,v 1.5 2015/08/26 15:12:24 jasper Exp $
 --- Makefile.in.orig Sun Aug  2 21:31:55 2015
 +++ Makefile.in Mon Aug 24 08:23:07 2015
-@@ -293,7 +293,7 @@ top_build_prefix = @top_build_prefix@
+@@ -386,7 +386,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = lib src doc . checkmk tests
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2015/0
  CLEANFILES = *~\
  $(PACKAGE)-$(VERSION).tar.gz\
  ChangeLog.bak
-@@ -840,7 +840,7 @@ info: info-recursive
+@@ -913,7 +913,7 @@ info: info-recursive

  info-am:

Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/check/patches/patch-doc_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 26 Aug 2015 15:12:24 -0000 1.7
+++ patches/patch-doc_Makefile_in 15 May 2019 16:28:42 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-doc_Makefile_in,v 1.7 2015/08/26 15:12:24 jasper Exp $
 --- doc/Makefile.in.orig Sun Aug  2 21:31:55 2015
 +++ doc/Makefile.in Mon Aug 24 08:23:07 2015
-@@ -211,7 +211,7 @@ build_vendor = @build_vendor@
+@@ -309,7 +309,7 @@ build_vendor = @build_vendor@
  builddir = @builddir@
  datadir = @datadir@
  datarootdir = @datarootdir@
@@ -10,60 +10,60 @@ $OpenBSD: patch-doc_Makefile_in,v 1.7 20
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -826,47 +826,47 @@ $(srcdir)/check.texi: money.1-2.h.diff \
+@@ -946,47 +946,47 @@ $(srcdir)/check.texi: money.1-2.h.diff \
  # diff returns 1 if there is a difference, but we don't want make to
  # think that means there is an error
  money.1-2.h.diff: $(eg_src)/money.1.h $(eg_src)/money.2.h
 - cd $(eg_root); \
 + -cd $(eg_root); \
- diff -U 100 src/money.1.h src/money.2.h > @abs_builddir@/$@ || test $$?
-eq 1; \
+ diff -U 100 src/money.1.h src/money.2.h ${filter_timestapms} >
@abs_builddir@/$@ || test $$? -eq 1; \
  cd -;

  money.1-3.c.diff: $(eg_src)/money.1.c $(eg_src)/money.3.c
 - cd $(eg_root); \
 + -cd $(eg_root); \
- diff -U 100 src/money.1.c src/money.3.c > @abs_builddir@/$@ || test $$?
-eq 1; \
+ diff -U 100 src/money.1.c src/money.3.c ${filter_timestapms} >
@abs_builddir@/$@ || test $$? -eq 1; \
  cd -;

  money.3-4.c.diff: $(eg_src)/money.3.c $(eg_src)/money.4.c
 - cd $(eg_root); \
 + -cd $(eg_root); \
- diff -U 100 src/money.3.c src/money.4.c > @abs_builddir@/$@ || test $$?
-eq 1; \
+ diff -U 100 src/money.3.c src/money.4.c ${filter_timestapms} >
@abs_builddir@/$@ || test $$? -eq 1; \
  cd -;

  money.4-5.c.diff: $(eg_src)/money.4.c $(eg_src)/money.5.c
 - cd $(eg_root); \
 + -cd $(eg_root); \
- diff -U 100 src/money.4.c src/money.5.c > @abs_builddir@/$@ || test $$?
-eq 1; \
+ diff -U 100 src/money.4.c src/money.5.c ${filter_timestapms} >
@abs_builddir@/$@ || test $$? -eq 1; \
  cd -;

  money.5-6.c.diff: $(eg_src)/money.5.c $(eg_src)/money.6.c
 - cd $(eg_root); \
 + -cd $(eg_root); \
- diff -U 100 src/money.5.c src/money.6.c > @abs_builddir@/$@ || test $$?
-eq 1; \
+ diff -U 100 src/money.5.c src/money.6.c ${filter_timestapms} >
@abs_builddir@/$@ || test $$? -eq 1; \
  cd -;

  check_money.1-2.c.diff: $(eg_tests)/check_money.1.c
$(eg_tests)/check_money.2.c
 - cd $(eg_root); \
 + -cd $(eg_root); \
- diff -U 100 tests/check_money.1.c tests/check_money.2.c > @abs_builddir@/$@
|| test $$? -eq 1; \
+ diff -U 100 tests/check_money.1.c tests/check_money.2.c
${filter_timestapms} > @abs_builddir@/$@ || test $$? -eq 1; \
  cd -;

  check_money.2-3.c.diff: $(eg_tests)/check_money.2.c
$(eg_tests)/check_money.3.c
 - cd $(eg_root); \
 + -cd $(eg_root); \
- diff -U 100 tests/check_money.2.c tests/check_money.3.c > @abs_builddir@/$@
|| test $$? -eq 1; \
+ diff -U 100 tests/check_money.2.c tests/check_money.3.c
${filter_timestapms} > @abs_builddir@/$@ || test $$? -eq 1; \
  cd -;

  check_money.3-6.c.diff: $(eg_tests)/check_money.3.c
$(eg_tests)/check_money.6.c
 - cd $(eg_root); \
 + -cd $(eg_root); \
- diff -U 100 tests/check_money.3.c tests/check_money.6.c > @abs_builddir@/$@
|| test $$? -eq 1; \
+ diff -U 100 tests/check_money.3.c tests/check_money.6.c
${filter_timestapms} > @abs_builddir@/$@ || test $$? -eq 1; \
  cd -;

  check_money.6-7.c.diff: $(eg_tests)/check_money.6.c
$(eg_tests)/check_money.7.c
 - cd $(eg_root); \
 + -cd $(eg_root); \
- diff -U 100 tests/check_money.6.c tests/check_money.7.c > @abs_builddir@/$@
|| test $$? -eq 1; \
+ diff -U 100 tests/check_money.6.c tests/check_money.7.c
${filter_timestapms} > @abs_builddir@/$@ || test $$? -eq 1; \
  cd -;

Reply via email to