From 8fe50c5d3015ea41ed0fed6e330a2c37955421ad Mon Sep 17 00:00:00 2001 From: fcambus Date: Wed, 28 Aug 2019 07:11:23 +0000 Subject: coma: use MAKE_FLAGS to override MAN_DIR. There is no need to patch MAN_DIR in upstream Makefile. Pointed out by wiz@, thanks! --- wm/coma/Makefile | 4 ++-- wm/coma/distinfo | 4 ++-- wm/coma/patches/patch-Makefile | 10 +++------- 3 files changed, 7 insertions(+), 11 deletions(-) (limited to 'wm') diff --git a/wm/coma/Makefile b/wm/coma/Makefile index 3e9a55c8ba5..412fa485300 100644 --- a/wm/coma/Makefile +++ b/wm/coma/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/08/19 12:31:23 fcambus Exp $ +# $NetBSD: Makefile,v 1.3 2019/08/28 07:11:23 fcambus Exp $ DISTNAME= coma-1.0 CATEGORIES= wm @@ -11,7 +11,7 @@ LICENSE= isc USE_LANGUAGES= c99 -MAKE_ENV+= MAN_DIR="${PREFIX}/${PKGMANDIR}" +MAKE_FLAGS+= MAN_DIR="${PREFIX}/${PKGMANDIR}" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/wm/coma/distinfo b/wm/coma/distinfo index 511d7e4edb2..620bed1c234 100644 --- a/wm/coma/distinfo +++ b/wm/coma/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2019/08/19 12:31:23 fcambus Exp $ +$NetBSD: distinfo,v 1.3 2019/08/28 07:11:23 fcambus Exp $ SHA1 (coma-1.0.tar.gz) = e830786675e4f8542337363f8835e195e8f58593 RMD160 (coma-1.0.tar.gz) = 672f1202d92b0ba324f97d28c5c0185d59c1f106 SHA512 (coma-1.0.tar.gz) = 3df8fd17d269b3888fd931b5126f8e63c9aac63451be14fa8a20be09e945056cd7a45b062a6810a9bba0146fbd4b81791e8c0d9bbad1c18f26d1d3b222251e52 Size (coma-1.0.tar.gz) = 13487 bytes -SHA1 (patch-Makefile) = a77d6acfb5965ab6f83b3bc4bd2c558870c91665 +SHA1 (patch-Makefile) = eb554076a3573a63a42169507da2920ea60ee20a diff --git a/wm/coma/patches/patch-Makefile b/wm/coma/patches/patch-Makefile index 3ab9ae6bcc3..f57ab9ad83a 100644 --- a/wm/coma/patches/patch-Makefile +++ b/wm/coma/patches/patch-Makefile @@ -1,21 +1,17 @@ -$NetBSD: patch-Makefile,v 1.2 2019/08/19 12:31:23 fcambus Exp $ +$NetBSD: patch-Makefile,v 1.3 2019/08/28 07:11:23 fcambus Exp $ Adapt install target for pkgsrc. --- Makefile.orig 2019-01-17 20:01:53.000000000 +0000 +++ Makefile -@@ -2,9 +2,10 @@ +@@ -2,6 +2,7 @@ CC?=cc COMA=coma +DESTDIR?= PREFIX?=/usr/local INSTALL_DIR=$(PREFIX)/bin --MAN_DIR=$(PREFIX)/share/man -+MAN_DIR?=$(PREFIX)/share/man - - SRC= coma.c client.c config.c frame.c wm.c - OBJS= $(SRC:%.c=%.o) + MAN_DIR=$(PREFIX)/share/man @@ -27,8 +28,10 @@ LDFLAGS+=`pkg-config --libs x11 xft` all: $(COMA) -- cgit v1.2.3