From 9f479626e5b2f5f97c684eeac8fe051d3b014af1 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Fri, 13 Jul 2018 02:13:08 +0200
Subject: [PATCH] Clean patch.

---
 sys-cluster/ganglia/Manifest                  |  2 +-
 ...01-3.7.2-use-tirpc-instead-of-sunrpc.patch | 55 ++++++-------------
 2 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index b3f5281..b48219c 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,4 +1,4 @@
-AUX 01-3.7.2-use-tirpc-instead-of-sunrpc.patch 7023 BLAKE2B 387e16825ca1cacbf2ff12c9169b0b57ef50257aaa450d37a5a2478de24b84aef71f276f07566e19b555ad2b0fc00d2915f9534c1c97c33ccc6e35fb27fec511 SHA512 c13c48b1e6c637b2bebd1982d32bee9c89d132df4ddc33d248a77ea3fa0aaf905e82c8dc4638669d24d43cec08b5ac5e509ff182c7753c9c89cd29cee0df55f7
+AUX 01-3.7.2-use-tirpc-instead-of-sunrpc.patch 6217 BLAKE2B 76c63d93c077673dc5de60787b39ee7a8326073ba12364d8be7efb206bb93a7d215676745b5ca37165118f739a1ec03fa39654c14545d32e6dc0cf7d387b8d2c SHA512 22bde7bb27322203ad2dbce919fc29a57fc1edfb62ae2babc34900f342af42a5c8ad977ff2bcb404e85f34a96d446765b1487be7407846236d835f39dc95d989
 AUX gmetad-python.rc 618 BLAKE2B 476915bff06395d3451d256f4fef3d4a2aa96c866b9cae5227d19f60ecbffce0dc2e7f4513726564bff808ea3b2bd109ee8daff10975e9b1043f97733accc608 SHA512 1b23e84c453b0cd0aca8b340c9764adb79bccbc0b4a9574a1e5c7299bc8d497d30a2a56e9b855d3cda2664a856b404f4f6941b3feddbec889e45a59c92c05389
 AUX gmetad.rc 352 BLAKE2B 68629711870d52a198ae474b77ab7828987c2ac19551243063272ec50c61c3e0b2d32a08633ff878e3319a80f9bbc111ac5e7507c88164ea4ddb8244a0b9e41f SHA512 865e1f8622ebcf1103f0cb72ebc2d675af01e9ea0861fd43107ac2bca10d9e86f875741ae4cc1dabf0eb231fd3f907066974d82b245f2746acbad0f7eafb46af
 AUX gmetad.rc-2 480 BLAKE2B 9ebf71eca6c80aa5f5c776e292cc0ceee58103a30a7aad29e7430f766a58e6c58222113bc12bc7ddc74c4c3f6f5aaccc95ff7470321bbd3ccb87af1e704be7ae SHA512 37678fe9b52ce7c6ef38bcc764189ed26e10410567ac9a8608460ac3eab380c70ac91453ed425ffef8d6e86ff6ef609e0167f5bb04a2aa9318725527d31391fa
diff --git a/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch b/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
index 10f8fef..54d2c6a 100644
--- a/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
+++ b/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
@@ -7,7 +7,7 @@ index 95d0807..105222b 100644
  
  EXTRA_SUBDIRS = "gmetad-python contrib solaris"
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
  
  AUTOMAKE_OPTIONS = dist-bzip2 dist-tarZ dist-zip
  ACLOCAL_AMFLAGS = -I m4
@@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
 index fe7983b..597f0ca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -606,13 +606,20 @@ AC_CHECK_HEADER([sys/mount.h], [], [],
+@@ -606,13 +606,12 @@ AC_CHECK_HEADER([sys/mount.h], [], [],
  #endif
  ])
  
@@ -29,17 +29,9 @@ index fe7983b..597f0ca 100644
 +dnl ##################################################################
 +dnl Checks for TIRPC
 +PKG_CHECK_MODULES([TIRPC],[libtirpc])
-+dnl LDFLAGS="$LDFLAGS $LIBS $APR_LIBS"
 +LDFLAGS="$LDFLAGS $TIRPC_LIBS"
-+RPC_CFLAGS="$TIRPC_CFLAGS"
-+
-+dnl PKG_CHECK_MODULES([TIRPC],
-+dnl                   [libtirpc],
-+dnl                   [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
-+dnl                   [AC_MSG_ERROR([libtirpc requested, but library not found.])]
-+dnl )
-+nl AC_SUBST(RPC_CFLAGS)
-+dnl AC_SUBST(RPC_LIBS)
++TIRPC_INCLUDES="$TIRPC_CFLAGS"
++AC_SUBST(TIRPC_INCLUDES)
  
  dnl ##################################################################
  dnl Checks for typedefs.
@@ -52,7 +44,7 @@ index 0a4e360..874d448 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
  AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/gmond -I$(top_builddir)/libmetrics -I$(top_builddir)/include $(GCFLAGS) @PROTOBUF_C_CFLAGS@
  
  sbin_PROGRAMS = gmetad
@@ -65,7 +57,7 @@ index bc7807c..d9bf585 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
  
  AM_CFLAGS = -I../lib -I../include $(GCFLAGS)
  
@@ -78,7 +70,7 @@ index 256fee3..d6f5f07 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
  AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/include/ -I$(top_builddir)/libmetrics $(GCFLAGS)
  
  sbin_PROGRAMS = gmond
@@ -91,7 +83,7 @@ index fd7457e..99ddb83 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/disk/Makefile.am b/gmond/modules/disk/Makefile.am
 index 0c78689..2f5a2f0 100644
 --- a/gmond/modules/disk/Makefile.am
@@ -101,7 +93,7 @@ index 0c78689..2f5a2f0 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/example/Makefile.am b/gmond/modules/example/Makefile.am
 index e3bff6a..18b4e3b 100644
 --- a/gmond/modules/example/Makefile.am
@@ -111,7 +103,7 @@ index e3bff6a..18b4e3b 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
  
  install:
  	@echo
@@ -124,7 +116,7 @@ index 82336db..06ad430 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/network/Makefile.am b/gmond/modules/network/Makefile.am
 index 72a4faf..c370d88 100644
 --- a/gmond/modules/network/Makefile.am
@@ -134,7 +126,7 @@ index 72a4faf..c370d88 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/perl/Makefile.am b/gmond/modules/perl/Makefile.am
 index b7b095c..f1d0fb9 100644
 --- a/gmond/modules/perl/Makefile.am
@@ -144,7 +136,7 @@ index b7b095c..f1d0fb9 100644
  	  $(INSTALL_DATA) ../conf.d/modperl.conf $(DESTDIR)$(sysconfdir)/conf.d/modperl.conf
  
 -INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/python/Makefile.am b/gmond/modules/python/Makefile.am
 index f535b07..c8fcac0 100644
 --- a/gmond/modules/python/Makefile.am
@@ -154,7 +146,7 @@ index f535b07..c8fcac0 100644
  	  $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/conf.d/modpython.conf
  
 -INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/status/Makefile.am b/gmond/modules/status/Makefile.am
 index cd84069..53968fd 100644
 --- a/gmond/modules/status/Makefile.am
@@ -164,7 +156,7 @@ index cd84069..53968fd 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/gmond/modules/system/Makefile.am b/gmond/modules/system/Makefile.am
 index 5fc7fb3..566469e 100644
 --- a/gmond/modules/system/Makefile.am
@@ -174,7 +166,7 @@ index 5fc7fb3..566469e 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
 diff --git a/lib/Makefile.am b/lib/Makefile.am
 index 935c514..6e0499f 100644
 --- a/lib/Makefile.am
@@ -184,20 +176,7 @@ index 935c514..6e0499f 100644
  endif
  
 -INCLUDES = @APR_INCLUDES@
-+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
++INCLUDES = @APR_INCLUDES@ @TIRPC_INCLUDES@
  AM_CFLAGS = -I.. -I. -I$(top_builddir)/include/ $(GCFLAGS) -DSYSCONFDIR='"$(sysconfdir)"'
  
  include_HEADERS = gm_protocol.h
-diff --git a/scripts/fixconfig b/scripts/fixconfig
-index 5be7982..707f62d 100755
---- a/scripts/fixconfig
-+++ b/scripts/fixconfig
-@@ -35,7 +35,7 @@ fi
- 
- # Additional variables set by configure
- CFLAGS="`echo '-g -O2 -fno-strict-aliasing -Wall -D_REENTRANT' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
--LDFLAGS="`echo ' -lpthread  -lapr-1  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
-+LDFLAGS="`echo ' -lpthread  -lapr-1 -ltirpc  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
- LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread "
- VERSION="3.7.2"
- host_cpu="x86_64"