From 5c0c3fe6a071057cad0eea20d9efb304ae5aa557 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 16 Oct 2015 20:45:41 +0200 Subject: [PATCH] fixed patch for the makefile --- dev-vcs/gitlab-git-http-server/Manifest | 2 +- .../files/fix-Makefile-0.3.0.patch | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-vcs/gitlab-git-http-server/Manifest b/dev-vcs/gitlab-git-http-server/Manifest index ede1ae6..6430b96 100644 --- a/dev-vcs/gitlab-git-http-server/Manifest +++ b/dev-vcs/gitlab-git-http-server/Manifest @@ -1,6 +1,6 @@ AUX fix-Makefile-0.2.10.patch 386 SHA256 16a0441a38a057773859af0a50f6f21fa1220c94dfc7521d2b9f86d9931cafbf SHA512 e18e74cdfa8d540b541e0b00e8a8bc70e2691e9985bc5a4f302848be99bd9765ef5531cb6a92ad807daec85e7c5e5d1f19c6a4223460755de304a1eeb419b87c WHIRLPOOL ce23abcd31287e28a27762b2c51ab906e3eb652f1c3c23011b6257d271f59a72b34d89e9624ab1a9941c62910775c0b8651d11c414a11760417f106800d6ec1c AUX fix-Makefile-0.2.12.patch 386 SHA256 66a4b8e4f883d5147266a7db4f84ffdf7147946ae5222f43adaee04f11a40d6b SHA512 f47adb7ace8f903b8261b83cbc589ebda009e2d1f694ff6fe125cf3cbb80b55d06a61dff815d84d35aa6948976e17ebbe28cff9eb8a5bc4608ad05baa82b3f7c WHIRLPOOL 550e82c1c041fa0a899eda1a598c2d4ea6ffbaf1f8182e1ca66cf24b13a244590a2317a279b9548a47196dfb6e7f1e6ee829b6bab3178b60d183ac5c00156453 -AUX fix-Makefile-0.3.0.patch 385 SHA256 04f21f3fd79c59570e2571a183331012b8d0b9da710c1f8c4446c77c6e52d087 SHA512 4bab48bc81ebcfb174563806c47ae3de17be9124a1669884fdc65dd902d14989c7d1f9e19500f24b14ede59ac7b596e5dc3f2679547d37262f579a4199bdbbd1 WHIRLPOOL 0f3fb5853a2dcf28077f286d1d822eb9b81dadf002d07cb5455dc43b96885a297257a3f680347d283e849170297d3bbf1bf4d6b98f1adc47d4038426a9d97d4e +AUX fix-Makefile-0.3.0.patch 543 SHA256 53d8f0abd912f27dd84a180ebd59ca7e8b646e6e839493f6bf1740b0cbd86cea SHA512 badad53047c9c35481ed7e61b4d2410f3fad3de4cfb5aba107f40a549080e272144f6548b666508bb0d83529211960537abdade639825028762f5c9a87ba1a37 WHIRLPOOL 92e4de7aa6eb1bb40a1c62e183f03d683ccf5cb0e7705b628fe5b37ebccb047df38ad7093ec6d0938c8abfe08c517141999095db61bbe7c25da666d02c753700 AUX gitlab-git-http-server.conf 254 SHA256 b0c0a9a0c6db8743f46e38124ad3591f5f4e3b7d0cf1e0ff6a426504d85a1006 SHA512 9a6948e6491727737fb4faf12238e459992f95a8011726badba7202a8e3a409a4fd34d7a78b933e473bf0b6516d54c08b5905e35e304e022b5d9d2a8f7e38e62 WHIRLPOOL 1d2b11f973f7a0249a75df929c1f71f36c59bc0b7537cb7aed598dc40cb0ca581b9443eb499f2894069f3857d89c058fa3fd01418bbdab40b16a9896e83a52d2 AUX gitlab-git-http-server.init 689 SHA256 7c3ca271bfaa696fde364ca5915abe0874dfed67601680f3ab91a9560cabb810 SHA512 9d724a4a5c83d12ad817f33ba6d8a68df195e6a91ff75755c24f04678bb8e91f3708900770d87c824418406b3eca5774117e8a5b9e28210f2d8c48726007912b WHIRLPOOL 3078871755f1d425690adb30b4d096f6ed71e5da6aca7f28383ef154d958748536efef6c53e1417c36259591d165a364e1fde64bb8b490287183e02ac1b42571 DIST gitlab-git-http-server-0.2.10.tar.bz2 7150 SHA256 13a43078c2fe321c83c4af61db087ed5f1bef443a866dd05704717e197ce8f2a SHA512 faae12473e3994bfed31c7b13ad20e30f74a954db1b622ff911dce9be4dbc1a54a0ee4d0e9706f443928ad72ea810184360c590251e8012a882e8dea1538878b WHIRLPOOL c0b8ad7143bfc40b0540a5dd3466eb26b8698a3aa307a0086020d42968d23f785b4a22309b04f6923e6003efa53dc4a4412ec13fb7ec5c21f54220d04d786032 diff --git a/dev-vcs/gitlab-git-http-server/files/fix-Makefile-0.3.0.patch b/dev-vcs/gitlab-git-http-server/files/fix-Makefile-0.3.0.patch index ce40122..f8c9b57 100644 --- a/dev-vcs/gitlab-git-http-server/files/fix-Makefile-0.3.0.patch +++ b/dev-vcs/gitlab-git-http-server/files/fix-Makefile-0.3.0.patch @@ -1,12 +1,16 @@ diff --git a/Makefile b/Makefile -index f6456e1..c25e29e 100644 +index f6456e1..55af079 100644 --- a/Makefile +++ b/Makefile -@@ -1,5 +1,5 @@ +@@ -1,8 +1,8 @@ -PREFIX=/usr/local -VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S) +PREFIX=${DESTDIR}/usr +VERSION=0.3.0-$(shell date -u +%Y%m%d.%H%M%S) gitlab-git-http-server: main.go githandler.go - go build -ldflags "-X main.Version ${VERSION}" -o gitlab-git-http-server +- go build -ldflags "-X main.Version ${VERSION}" -o gitlab-git-http-server ++ go build -ldflags "-X main.Version=${VERSION}" -o gitlab-git-http-server + + install: gitlab-git-http-server + install gitlab-git-http-server ${PREFIX}/bin/