CVS commit: pkgsrc/devel/halfempty

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 12 13:22:29 UTC 2020

Modified Files:
        pkgsrc/devel/halfempty: Makefile PLIST distinfo
        pkgsrc/devel/halfempty/patches: patch-Makefile

Log Message:
halfempty: fix installation

While here, honor LDFLAGS and CFLAGS.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/halfempty/Makefile \
    pkgsrc/devel/halfempty/PLIST pkgsrc/devel/halfempty/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/halfempty/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/devel/halfempty/Makefile
diff -u pkgsrc/devel/halfempty/Makefile:1.1 pkgsrc/devel/halfempty/Makefile:1.2
--- pkgsrc/devel/halfempty/Makefile:1.1 Thu Jan  9 12:12:17 2020
+++ pkgsrc/devel/halfempty/Makefile     Sun Jan 12 13:22:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/01/09 12:12:17 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2020/01/12 13:22:29 wiz Exp $
 
 DISTNAME=      halfempty-0.30
 CATEGORIES=    devel
@@ -11,6 +11,17 @@ COMMENT=     Fast, parallel test case minimi
 LICENSE=       apache-2.0
 
 USE_TOOLS+=    gmake pkg-config
+#TEST_TARGET=  test
+
+INSTALLATION_DIRS=     bin share/doc/halfempty
+
+#TEST_DEPENDS+=        coreutils-[0-9]*:../../sysutils/coreutils
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/halfempty ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/halfempty
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
+# for putting shuf from coreutils in path
+#PATH:=${PATH}:${PREFIX}/gnu/bin
Index: pkgsrc/devel/halfempty/PLIST
diff -u pkgsrc/devel/halfempty/PLIST:1.1 pkgsrc/devel/halfempty/PLIST:1.2
--- pkgsrc/devel/halfempty/PLIST:1.1    Thu Jan  9 12:12:17 2020
+++ pkgsrc/devel/halfempty/PLIST        Sun Jan 12 13:22:29 2020
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2020/01/09 12:12:17 wiz Exp $
-@comment TODO: to fill this file with the file listing:
-@comment TODO: 1. run "/usr/bin/make package"
-@comment TODO: 2. run "/usr/bin/make print-PLIST"
+@comment $NetBSD: PLIST,v 1.2 2020/01/12 13:22:29 wiz Exp $
+bin/halfempty
+share/doc/halfempty/README.md
Index: pkgsrc/devel/halfempty/distinfo
diff -u pkgsrc/devel/halfempty/distinfo:1.1 pkgsrc/devel/halfempty/distinfo:1.2
--- pkgsrc/devel/halfempty/distinfo:1.1 Thu Jan  9 12:12:17 2020
+++ pkgsrc/devel/halfempty/distinfo     Sun Jan 12 13:22:29 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1 2020/01/09 12:12:17 wiz Exp $
+$NetBSD: distinfo,v 1.2 2020/01/12 13:22:29 wiz Exp $
 
 SHA1 (halfempty-0.30.tar.gz) = 488244faa408bb33331a30a0e482ad46d0968c85
 RMD160 (halfempty-0.30.tar.gz) = e4f3b6840c973a116dc066b6bdc7040d848ff39e
 SHA512 (halfempty-0.30.tar.gz) = 99a78723fd70f06f6059379062cb700e4f571ef476e48b5fa61a3afa2d2290536ad287cee8a62441d4528cb4849755daa36aef9989239bdb59510e562dc0bedd
 Size (halfempty-0.30.tar.gz) = 1097760 bytes
-SHA1 (patch-Makefile) = 7a49f55b08b8e4bb583f21c10c42bc5d49202c36
+SHA1 (patch-Makefile) = 604dcd52ffd6769ea3b6658126436267a48b7e0b
 SHA1 (patch-bisect.c) = e78d35cb18ec1d59eff66ee31afac3f42753cdd5
 SHA1 (patch-limits.c) = 3999440235ddff9b2d48b5f639d1fd22cb37f698
 SHA1 (patch-proc.c) = 638b8b9b7c0f74b004cf19a40ef7acea1ca9be66

Index: pkgsrc/devel/halfempty/patches/patch-Makefile
diff -u pkgsrc/devel/halfempty/patches/patch-Makefile:1.1 pkgsrc/devel/halfempty/patches/patch-Makefile:1.2
--- pkgsrc/devel/halfempty/patches/patch-Makefile:1.1   Thu Jan  9 12:12:17 2020
+++ pkgsrc/devel/halfempty/patches/patch-Makefile       Sun Jan 12 13:22:29 2020
@@ -1,10 +1,21 @@
-$NetBSD: patch-Makefile,v 1.1 2020/01/09 12:12:17 wiz Exp $
+$NetBSD: patch-Makefile,v 1.2 2020/01/12 13:22:29 wiz Exp $
 
 Use generic replacement functions for missing symbols on NetBSD.
 https://github.com/googleprojectzero/halfempty/pull/11
 
 --- Makefile.orig      2019-03-16 17:55:00.000000000 +0000
 +++ Makefile
+@@ -1,7 +1,7 @@
+ CC          = gcc
+-CFLAGS      = -Wall -std=gnu99 -O2 -ggdb3 -march=native -fPIC -Wno-format-zero-length -Wno-unused-parameter
+-LDFLAGS     = -pie
+-CPPFLAGS    = -UNDEBUG -UG_DISABLE_ASSERT `getconf LFS_CFLAGS` `pkg-config --cflags glib-2.0` -D_GNU_SOURCE
++CFLAGS      += -Wall -std=gnu99 -O2 -ggdb3 -march=native -fPIC -Wno-format-zero-length -Wno-unused-parameter
++LDFLAGS     += -pie
++CPPFLAGS    += -UNDEBUG -UG_DISABLE_ASSERT `getconf LFS_CFLAGS` `pkg-config --cflags glib-2.0` -D_GNU_SOURCE
+ LDLIBS      = `pkg-config --libs glib-2.0`
+ EXTRA       =
+ 
 @@ -23,6 +23,10 @@ ifeq ($(findstring Microsoft,$(shell una
      EXTRA = splice_generic.o sendfile_generic.o
  endif