pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

kore: use MAKE_FLAGS to override MAN_DIR, there is no need to patch MAN_DIR in upstream Makefile.



Module Name:	pkgsrc-wip
Committed By:	Frederic Cambus <fred%statdns.com@localhost>
Pushed By:	fcambus
Date:		Thu Aug 22 12:29:58 2019 +0200
Changeset:	6e7d687301c2ed44ac27d7804fe3ff03346f333d

Modified Files:
	kore/Makefile
	kore/distinfo
	kore/patches/patch-Makefile

Log Message:
kore: use MAKE_FLAGS to override MAN_DIR, there is no need to patch MAN_DIR in upstream Makefile.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6e7d687301c2ed44ac27d7804fe3ff03346f333d

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

diffstat:
 kore/Makefile               |  2 +-
 kore/distinfo               |  2 +-
 kore/patches/patch-Makefile | 10 +---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diffs:
diff --git a/kore/Makefile b/kore/Makefile
index 0a0f6f7c24..2c5eec0230 100644
--- a/kore/Makefile
+++ b/kore/Makefile
@@ -12,7 +12,7 @@ LICENSE=	isc
 USE_LANGUAGES=	c99
 USE_TOOLS+=	gmake
 
-MAKE_ENV+=	MAN_DIR="${PREFIX}/${PKGMANDIR}"
+MAKE_FLAGS+=	MAN_DIR="${PREFIX}/${PKGMANDIR}"
 MAKE_FLAGS+=	TASKS=1
 
 .include "options.mk"
diff --git a/kore/distinfo b/kore/distinfo
index 800c355adf..1d36316040 100644
--- a/kore/distinfo
+++ b/kore/distinfo
@@ -4,5 +4,5 @@ SHA1 (kore-3.3.1.tar.gz) = 6f1caa21cbedda8b9757bc3d363bf8389ecb47fc
 RMD160 (kore-3.3.1.tar.gz) = 706efbac47e047427ed50d6e55f709c52626850b
 SHA512 (kore-3.3.1.tar.gz) = a6641632fdd125948379884920e5804f428650644b25c757adaace86a286b69ff62947ba85601f9851abbacd697e6fd9385c37c1b2571e55a3f23b15e33a4750
 Size (kore-3.3.1.tar.gz) = 1009866 bytes
-SHA1 (patch-Makefile) = 7aadbcbf01d003406ac5d3319a897b7d7bee49f7
+SHA1 (patch-Makefile) = 585cf7936d69b486391a44c88e10b6db1d8ec0ca
 SHA1 (patch-kodev_Makefile) = a5366d2879f59f27302b08d33f50620698ff5654
diff --git a/kore/patches/patch-Makefile b/kore/patches/patch-Makefile
index 3dd5d28671..741d4179db 100644
--- a/kore/patches/patch-Makefile
+++ b/kore/patches/patch-Makefile
@@ -4,7 +4,7 @@ Adapt install target for pkgsrc.
 
 --- Makefile.orig	2019-06-03 13:29:24.000000000 +0000
 +++ Makefile
-@@ -1,13 +1,14 @@
+@@ -1,6 +1,7 @@
  # Kore Makefile
  
  CC?=cc
@@ -12,14 +12,6 @@ Adapt install target for pkgsrc.
  PREFIX?=/usr/local
  OBJDIR?=obj
  KORE=kore
- KODEV=kodev/kodev
- KORE_CRYPTO?=crypto
- INSTALL_DIR=$(PREFIX)/bin
--MAN_DIR=$(PREFIX)/share/man
-+MAN_DIR?=$(PREFIX)/share/man
- SHARE_DIR=$(PREFIX)/share/kore
- INCLUDE_DIR=$(PREFIX)/include/kore
- 
 @@ -46,8 +47,6 @@ endif
  
  ifneq ("$(NOOPT)", "")


Home | Main Index | Thread Index | Old Index