$NetBSD: patch-src_common.mf,v 1.3 2025/11/30 10:15:27 vins Exp $

* Use standard CFLAGS and LDFLAGS.
* Provide a pkgsrc-compliant install target.

--- src/common.mf.orig	2025-09-05 16:43:17.000000000 +0000
+++ src/common.mf
@@ -1,6 +1,5 @@
 # Common Makefile part, included by platform specific makefiles
 
-CFLAGS += -DPREFIX='"$(PREFIX)"' -DRCDIR='"$(RCDIR)"' $(INCDIRS)
 toolbox_libs =  -lXm -lXt -lX11
 xmsm_libs = -lXm -lXt -lXss -lXrandr -lXinerama -lX11 $(SYSLIBS)
 
@@ -15,34 +14,34 @@ executables = xmsm xmtoolbox xmsession
 all: $(executables) $(app_defaults) 
 
 xmtoolbox: $(toolbox_objs) $(common_objs)
-	$(CC) -o $@ $(LDFLAGS) $(LIBDIRS) $(toolbox_objs) $(common_objs) $(toolbox_libs)
+	$(CC) -o $@ $(LDFLAGS) $(toolbox_objs) $(common_objs) $(toolbox_libs)
 
 xmsm: $(xmsm_objs) $(common_objs)
-	$(CC) -o $@ $(LDFLAGS) $(LIBDIRS) $(xmsm_objs) $(common_objs) $(xmsm_libs)
+	$(CC) -o $@ $(LDFLAGS) $(xmsm_objs) $(common_objs) $(xmsm_libs)
 
 xmsession: xmsession.src
-	sed s%PREFIX%$(PREFIX)%g xmsession.src > $@
+	$(SED) s%PREFIX%$(PREFIX)%g xmsession.src > $@
 	chmod 755 $@
 
 XmSm.ad: XmSm.ad.src
-	sed s%PREFIX%$(PREFIX)%g XmSm.ad.src > $@
+	$(SED) s%PREFIX%$(PREFIX)%g XmSm.ad.src > $@
 
 XmToolbox.ad: XmToolbox.ad.src
-	sed s%PREFIX%$(PREFIX)%g XmToolbox.ad.src > $@
+	$(SED) s%PREFIX%$(PREFIX)%g XmToolbox.ad.src > $@
 
 .PHONY: clean install common_install
 
 common_install:
-	install -m755 xmsession $(PREFIX)/bin/xmsession
-	install -m755 xmtoolbox $(PREFIX)/bin/xmtoolbox
-	install -m4755 xmsm $(PREFIX)/bin/xmsm
-	install -m755 -d $(MANDIR)/man1
-	install -m644 xmtoolbox.1 $(MANDIR)/man1/xmtoolbox.1
-	install -m644 xmsm.1 $(MANDIR)/man1/xmsm.1
-	install -m755 -d $(APPLRESDIR)
-	install -m644 XmSm.ad $(APPLRESDIR)/XmSm
-	install -m644 XmToolbox.ad $(APPLRESDIR)/XmToolbox
-	install -m644 toolboxrc $(RCDIR)/toolboxrc
+	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
+	$(BSD_INSTALL_PROGRAM) xmsm xmtoolbox $(DESTDIR)$(BINDIR)
+	$(BSD_INSTALL_SCRIPT) xmsession $(DESTDIR)$(BINDIR)
+	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man1
+	$(BSD_INSTALL_MAN) xmtoolbox.1 xmsm.1 $(DESTDIR)$(MANDIR)/man1
+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(RCDIR) $(DESTDIR)$(APPLRESDIR)
+	$(BSD_INSTALL_DATA) toolboxrc $(DESTDIR)$(RCDIR)/toolboxrc
+	$(BSD_INSTALL_DATA) XmSm.ad $(DESTDIR)$(APPLRESDIR)/XmSm
+	$(BSD_INSTALL_DATA) XmToolbox.ad $(DESTDIR)$(APPLRESDIR)/XmToolbox
+
 
 uninstall:
 	rm -f $(PREFIX)/bin/xmsm
@@ -60,4 +59,4 @@ clean:
 	-rm .depend
 
 .depend:
-	$(CC) -MM $(INCDIRS) $(toolbox_objs:.o=.c) $(xmsm_objs:.o=.c) $(common_objs:.o=.c) > $@
+	$(CC) -MM $(CFLAGS) $(DEFINES) $(toolbox_objs:.o=.c) $(xmsm_objs:.o=.c) $(common_objs:.o=.c) > $@