From 142c11b7b2df05e034485bff75beae443eb2e64d Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 23 Apr 2017 16:55:15 +0200
Subject: [PATCH] glog, remove old bep file, bump version to a working recipe

---
 dev-cpp/glog/glog-0.3.3.recipe           | 30 ------------
 dev-cpp/glog/glog-0.3.4.recipe           | 60 ++++++++++++++++++++++++
 dev-cpp/glog/patches/glog-0.3.4.patchset | 22 +++++++++
 3 files changed, 82 insertions(+), 30 deletions(-)
 delete mode 100644 dev-cpp/glog/glog-0.3.3.recipe
 create mode 100644 dev-cpp/glog/glog-0.3.4.recipe
 create mode 100644 dev-cpp/glog/patches/glog-0.3.4.patchset

diff --git a/dev-cpp/glog/glog-0.3.3.recipe b/dev-cpp/glog/glog-0.3.3.recipe
deleted file mode 100644
index c64866ee0..000000000
--- a/dev-cpp/glog/glog-0.3.3.recipe
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION="Google's C++ logging library"
-HOMEPAGE="http://code.google.com/p/google-glog/"
-SOURCE_URI="http://google-glog.googlecode.com/files/glog-0.3.3.tar.gz"
-CHECKSUM_MD5="a6fd2c22f8996846e34c763422717c18"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-
-BUILD()
-{
-	cd glog-0.3.3
-	sed -i 's/docdir = $(prefix)\/share/docdir = \/boot\/common\/documentation/g' Makefile.am
-	libtoolize --force --copy --install
-	aclocal -I m4
-	autoconf
-	DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--docdir=${DOCDIR}
-	make
-}
-
-INSTALL()
-{
-	cd glog-0.3.3
-	make install
-}
-
-LICENSE="BSD (3-clause)"
-COPYRIGHT="1999-2013 Google Inc."
diff --git a/dev-cpp/glog/glog-0.3.4.recipe b/dev-cpp/glog/glog-0.3.4.recipe
new file mode 100644
index 000000000..f4e9e44bb
--- /dev/null
+++ b/dev-cpp/glog/glog-0.3.4.recipe
@@ -0,0 +1,60 @@
+SUMMARY="A C++ logging library"
+DESCRIPTION="Google's C++ logging library"
+HOMEPAGE="http://code.google.com/p/google-glog/"
+COPYRIGHT="1999-2015 Google Inc."
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="https://github.com/google/glog/archive/v0.3.4.tar.gz"
+CHECKSUM_SHA256="ce99d58dce74458f7656a68935d7a0c048fa7b4626566a71b7f4e545920ceb10"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+PATCHES="glog-$portVersion.patchset"
+
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	glog$secondaryArchSuffix = $portVersion
+	lib:libglog$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	glog${secondaryArchSuffix}_devel = $portVersion
+	devel:libglog$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	glog$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:awk
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	autoreconf -vfi
+	runConfigure ./configure #--datarootdir=$dataRootDir \
+		#--datadir=$dataDir --docdir=$dataRootDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm $libDir/libglog.la
+
+	prepareInstalledDevelLib libglog
+
+	# devel package
+	packageEntries devel $developDir
+}
diff --git a/dev-cpp/glog/patches/glog-0.3.4.patchset b/dev-cpp/glog/patches/glog-0.3.4.patchset
new file mode 100644
index 000000000..f388c4dc5
--- /dev/null
+++ b/dev-cpp/glog/patches/glog-0.3.4.patchset
@@ -0,0 +1,22 @@
+From 1c1b8f8071ff6d877a2b34b6287c6c90c93b683b Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 23 Apr 2017 16:01:56 +0200
+Subject: fix top-level entry share
+
+
+diff --git a/Makefile.am b/Makefile.am
+index 3756465..dd17806 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -40,7 +40,7 @@ gloginclude_HEADERS = src/glog/log_severity.h
+ nodist_gloginclude_HEADERS = src/glog/logging.h src/glog/raw_logging.h src/glog/vlog_is_on.h src/glog/stl_logging.h
+ noinst_HEADERS = src/glog/logging.h.in src/glog/raw_logging.h.in src/glog/vlog_is_on.h.in src/glog/stl_logging.h.in
+ 
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@/$(PACKAGE)-$(VERSION)
+ ## This is for HTML and other documentation you want to install.
+ ## Add your documentation files (in doc/) in addition to these
+ ## top-level boilerplate files.  Also add a TODO file if you have one.
+-- 
+2.7.0
+