$NetBSD: patch-aa,v 1.8 2026/05/17 08:06:58 vins Exp $

--- Makefile.orig	2017-10-25 14:17:42.000000000 +0000
+++ Makefile
@@ -8,19 +8,19 @@
 # after "=", this is parsed and rewritten by the configure script.
 #
 #				# user-callable executable (plan)
-DIR=/usr/local/bin
+DIR=$(PREFIX)/bin
 #				# auxiliary programs (pland, notifier, PS)
-LIB=/usr/local/lib
+LIB=$(PREFIX)/libexec/plan
 #				# help file (plan.help)
-SBIN=/usr/local/bin
+SBIN=$(LIB)
 #				# system programs (netplan)
-HELP=/usr/local/lib
+HELP=$(PREFIX)/share/plan
 #				# netplan expects netplan.dir/ here
-NETPLANDIR=/usr/local/lib
+NETPLANDIR=$(LIB)
 #				# unformatted nroff manpage (plan.[14])
-MAN=/usr/local/man/man
+MAN=$(PREFIX)/$(PKGMANDIR)/man
 #				# formatted manpage (plan.[14])
-CATMAN=/usr/catman/local/cat
+CATMAN=$(PREFIX)/$(PKGMANDIR)/cat
 #				# subdirectory in home dir, or empty
 PLANRULE=
 #				# lockfile for plan, %d is uid
@@ -34,12 +34,12 @@ LEX=lex
 #				# standard Unix compiler generator
 YACC=yacc
 #				# numerical user ID of <nobody> account
-NOB_UID=60001
+NOB_UID=32767
 #				# default numerical group ID of <nobody>
-NOB_GID=60001
+NOB_GID=39
 # 				# used by plan to pre-process holiday files,
 #				# plan will check if this file really exists
-CPP_PATH='/lib/cpp -P -I$(HELP)'
+CPP_PATH='$(CPP) -P -I$(HELP)'
 #				# by default, fork on startup? TRUE or FALSE
 DOFORK=TRUE
 #				# switching to ISO8859-1
@@ -57,7 +57,7 @@ HOLIDAY=german
 DEBUG=-g
 DEBUG=-O2
 #				# what to do without make arguments
-DEFTARGET=linux
+DEFTARGET=pkgsrc
 #------------------------- end of configuration section ----------------------
 
 OPT=$(DEBUG) $(PLANRULE) -DPLANLOCK=\"$(PLANLOCK)\" -DPLANDLOCK=\"$(PLANDLOCK)\"
@@ -168,7 +168,7 @@ OS2_C	= -Zmt -Wimplicit -Wno-unused -I$(
 	  -DNOLOCK
 LYNX_C  = -DNOREGEX -D__NO_INCLUDE_WARN__ -DBSD -mthreads
 MACOSX_C= -W -Wall -I/usr/X11R6/include -I/usr/OpenMotif/include -DNOLOCK -DMACOSX -DNOREGEX
-
+PKGSRC_C  = $(CFLAGS) -I$(X11BASE)/include -DSTDLIBMALLOC -DLOCKF
 
 #
 # loader flags. Requires X11, Xt, and Motif libraries. PW is for regcmp/regex.
@@ -258,7 +258,8 @@ LYNX_L1	= -mthreads -lXm_s -lXt_s -lSM -
 LYNX_L2	= -mthreads -lbsd
 MACOSX_L1= -L/usr/X11R6/lib -L/usr/OpenMotif/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11
 MACOSX_L2= -lc
-
+PKGSRC_L1 = $(LDFLAGS) -L$(X11BASE)/lib $(LIBS) -lXm -lXt -lX11 -lXpm -lSM -lXext -lICE -lX11              
+PKGSRC_L2 = $(LDFLAGS) -lc -lm
 
 start: $(DEFTARGET)
 
@@ -313,6 +314,7 @@ help:
 	@echo "  make os2       OS/2, XFree86"
 	@echo "  make lynx      LynxOS mag 2.5.1 092297-D i386"
 	@echo "  make macosx    MacOS X with OpenMotif 2.1 (www.ist-inc.com)"
+	@echo "  make pkgsrc    pkgsrc bootstrap
 	@echo ""
 	@echo "  make install   install compiled programs in"
 	@echo "                 $(DIR), $(SBIN), and $(LIB)."
@@ -478,6 +480,9 @@ lynx:
 macosx:
 	env CF="$(MACOSX_C)" L1F="$(MACOSX_L1)" L2F="$(MACOSX_L2)" MYCC=gcc make all
 
+pkgsrc:
+	env CF="$(PKGSRC_C)" L1F="$(PKGSRC_L1)" L2F="$(PKGSRC_L2)" MYCC=$(CC) $(MAKE) all
+
 #------------------------------ don't change anything below ------------------
 
 INC	= bm_blank.h bm_except.h bm_icon.h bm_iconsub.h bm_checker.h\
@@ -583,34 +588,19 @@ g_dbase.o g_dbfile.o g_formfile.o g_form
 
 #---------------------------------------------------------------
 install:
-	-rm -f $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(LIB)/netplan
-	mkdir -p $(DESTDIR)$(DIR)
-	cp plan $(DESTDIR)$(DIR)
-	mkdir -p $(DESTDIR)$(LIB)
-	cp pland notifier ../misc/plan_cal.ps ../language/plan* $(DESTDIR)$(LIB)
-	mkdir -p $(DESTDIR)$(SBIN)
-	cp netplan $(DESTDIR)$(SBIN)
-	-(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(LIB)) || exit 0
-	mkdir -p $(DESTDIR)$(HELP)
-	cp ../language/plan.help $(DESTDIR)$(HELP)
-#	-strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan
-	-chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(LIB)/netplan
-	-chmod 644 $(DESTDIR)$(HELP)/plan.help $(DESTDIR)$(LIB)/plan_cal.ps $(DESTDIR)$(LIB)/plan.lang.*
-	-(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(LIB)/plan_calSJ.ps) || exit 0
+	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(DIR)
+	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(LIB)
+	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(HELP)
+	${BSD_INSTALL_PROGRAM} plan $(DESTDIR)$(DIR)
+	${BSD_INSTALL_PROGRAM} pland notifier netplan $(DESTDIR)$(LIB)
+	${BSD_INSTALL_DATA} ../misc/plan_cal.ps $(DESTDIR)$(LIB)
+	${BSD_INSTALL_DATA} ../language/plan.* $(DESTDIR)$(HELP)
 	mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir
-	-chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir || exit 0
-	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
-	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
-	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
-	-(test x'$(MAN)'    != xNONE -a -d $(DESTDIR)$(MAN)1 && cp ../misc/plan.1 $(DESTDIR)$(MAN)1/plan.1) || exit 0
-	-(test x'$(MAN)'    != xNONE -a -d $(DESTDIR)$(MAN)4 && cp ../misc/plan.4 $(DESTDIR)$(MAN)4/plan.4) || exit 0
-	-(test x'$(MAN)'    != xNONE -a -d $(DESTDIR)$(MAN)1 && cp ../misc/netplan.1 $(DESTDIR)$(MAN)1/netplan.1) || exit 0
-	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan.1) || exit 0
-	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan.4) || exit 0
-	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan.1) || exit 0
-	-(test -f ${HOME}/.holiday || cp ../holiday/holiday_$(HOLIDAY) ${HOME}/.holiday) || exit 0
-	-(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0
-	-(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0
+	chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir
+	${BSD_INSTALL_MAN} ../misc/plan.1 $(DESTDIR)$(MAN)1/plan.1
+	${BSD_INSTALL_MAN} ../misc/plan.4 $(DESTDIR)$(MAN)4/plan.4
+	${BSD_INSTALL_MAN} ../misc/netplan.1 $(DESTDIR)$(MAN)1/netplan.1
+
 	@echo ""
 	@echo "use ../holiday/* as templates for your ~/.holiday file"
 
