head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.8 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.6 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.4 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.2 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.3.0.12 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.10 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.8 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.6 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.4 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.2 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.1.0.4 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.2 pkgsrc-2023Q2-base:1.1; locks; strict; comment @# @; 1.4 date 2025.05.23.09.28.50; author jperkin; state Exp; branches; next 1.3; commitid d7IBn3OjEIbKQ0WF; 1.3 date 2023.12.08.00.03.44; author tnn; state Exp; branches; next 1.2; commitid UQWS8PTBuqAWOAPE; 1.2 date 2023.12.07.23.57.25; author tnn; state Exp; branches; next 1.1; commitid eQW3bqXt2lCQMAPE; 1.1 date 2023.04.25.21.53.01; author nikita; state Exp; branches; next ; commitid cajNc2NB9ZokmxmE; desc @@ 1.4 log @mg: Various portability fixes. @ text @$NetBSD: patch-GNUmakefile,v 1.3 2023/12/08 00:03:44 tnn Exp $ Support PKGMANDIR. Support more operating systems. --- GNUmakefile.orig 2024-07-09 15:39:50.000000000 +0000 +++ GNUmakefile @@@@ -11,16 +11,26 @@@@ prefix= /usr/local bindir= $(prefix)/bin libdir= $(prefix)/lib includedir= $(prefix)/include -mandir= $(prefix)/man +mandir= $(prefix)/$(PKGMANDIR) -PKG_CONFIG= /usr/bin/pkg-config --silence-errors -INSTALL= /usr/bin/install -STRIP= /usr/bin/strip +PKG_CONFIG?= /usr/bin/pkg-config --silence-errors +INSTALL?= /usr/bin/install +STRIP?= /usr/bin/strip UNAME:= $(shell uname) ifeq ($(UNAME),FreeBSD) BSD_CPPFLAGS:= -DHAVE_UTIL_H BSD_LIBS:= -lutil +else ifeq ($(UNAME),NetBSD) + BSD_CPPFLAGS:= -DHAVE_UTIL_H + BSD_LIBS:= -lutil +else ifeq ($(UNAME),Darwin) + BSD_CPPFLAGS:= -DHAVE_UTIL_H + BSD_LIBS:= -lutil +else ifeq ($(UNAME),SunOS) + BSD_CPPFLAGS:= $(shell $(PKG_CONFIG) --cflags libbsd-overlay) + BSD_LIBS:= $(shell $(PKG_CONFIG) --libs libbsd-overlay) -lsocket + OBJS:= openpty.o else BSD_CPPFLAGS:= $(shell $(PKG_CONFIG) --cflags libbsd-overlay) -DHAVE_PTY_H BSD_LIBS:= $(shell $(PKG_CONFIG) --libs libbsd-overlay) -lutil @@@@ -51,7 +61,7 @@@@ CPPFLAGS+= $(BSD_CPPFLAGS) LIBS= $(CURSES_LIBS) $(BSD_LIBS) -OBJS= autoexec.o basic.o bell.o buffer.o cinfo.o dir.o display.o \ +OBJS+= autoexec.o basic.o bell.o buffer.o cinfo.o dir.o display.o \ echo.o extend.o file.o fileio.o funmap.o interpreter.o help.o \ kbd.o keymap.o line.o macro.o main.o match.o modes.o paragraph.o \ re_search.o region.o search.o spawn.o tty.o ttyio.o ttykbd.o \ @ 1.3 log @mg: g/c unnecessary pkg-config stuff from previous @ text @d1 1 a1 1 $NetBSD: patch-GNUmakefile,v 1.2 2023/12/07 23:57:25 tnn Exp $ d3 2 d6 1 a6 1 --- GNUmakefile.orig 2023-05-01 15:27:50.000000000 +0000 d8 3 a10 1 @@@@ -13,14 +13,20 @@@@ libdir= $(prefix)/lib d12 2 a13 1 mandir= $(prefix)/man d32 4 d39 9 @ 1.2 log @mg: fix build on macOS @ text @d1 1 a1 1 $NetBSD: patch-GNUmakefile,v 1.1 2023/04/25 21:53:01 nikita Exp $ d25 2 a26 2 + BSD_CPPFLAGS:= $(shell $(PKG_CONFIG) --cflags libbsd-overlay) + BSD_LIBS:= $(shell $(PKG_CONFIG) --libs libbsd-overlay) -lutil @ 1.1 log @mg: update to version 20230406 upstream URL changed. @ text @d1 1 a1 1 $NetBSD$ d4 3 a6 3 --- GNUmakefile.orig 2023-04-06 05:06:27.000000000 +0200 +++ GNUmakefile 2023-04-25 23:05:43.954953743 +0200 @@@@ -13,14 +13,18 @@@@ d21 1 a21 2 +endif +ifeq ($(UNAME),NetBSD) d24 3 @