DESTDIR support and build fix for SunOS > 5.6 and !sparc.

4 files changed, 83 insertions, 8 deletions

diff --git a/sysutils/sysinfo/Makefile b/sysutils/sysinfo/Makefile
index e7dd68e9003..56454ee4b3f 100644
--- a/sysutils/sysinfo/Makefile
+++ b/sysutils/sysinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2012/05/13 15:59:33 hans Exp $
 #
 
 DISTNAME=		sysinfo-3.5.1
@@ -16,10 +16,12 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 ONLY_FOR_PLATFORM=	SunOS-*-*      # only for Solaris, at the moment
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_TARGET=		default
 INSTALL_TARGET=		install install.man
 TEST_TARGET=		test
-MAKE_ENV+=		CPPFLAGS="" CC=${CC:Q}
+MAKE_ENV+=		CPPFLAGS="" CC=${CC:Q} KISA=${MACHINE_ARCH}
 
 post-build:
 	${CHMOD} -R o+rx ${WRKDIR}
diff --git a/sysutils/sysinfo/PLIST b/sysutils/sysinfo/PLIST
index 9a7ea03e519..765996133c5 100644
--- a/sysutils/sysinfo/PLIST
+++ b/sysutils/sysinfo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/05/13 15:59:33 hans Exp $
 bin/sysinfo
 man/man1/sysinfo.1
 man/man5/sysinfo.cf.5
@@ -19,4 +19,4 @@ libdata/sysinfo/conf/sunos.cf
 libdata/sysinfo/conf/sunos_4.cf
 libdata/sysinfo/conf/sunos_5.cf
 libdata/sysinfo/conf/sunos_5.ddb
-sysinfo/libexec/sparc-sunos-5.6/sysinfo
+sysinfo/libexec/${MACHINE_ARCH}-sunos-${OS_VERSION}/sysinfo
diff --git a/sysutils/sysinfo/distinfo b/sysutils/sysinfo/distinfo
index 1494b434253..9e4944fd476 100644
--- a/sysutils/sysinfo/distinfo
+++ b/sysutils/sysinfo/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/05/25 13:39:45 wiz Exp $
+$NetBSD: distinfo,v 1.4 2012/05/13 15:59:33 hans Exp $
 
 SHA1 (sysinfo-3.5.1.tar.gz) = 720d687aa7c65c41792c415a355962e9ca76fbd5
 RMD160 (sysinfo-3.5.1.tar.gz) = 140bd34d017d7ffc5c5d49e52271b4308539bba6
 Size (sysinfo-3.5.1.tar.gz) = 259920 bytes
-SHA1 (patch-aa) = 029b5d9431bb36da83225c22ad0a22584dbb6dcf
+SHA1 (patch-aa) = 8620270f8c27bd3cc6e0f8fac228624ce41e5f61
diff --git a/sysutils/sysinfo/patches/patch-aa b/sysutils/sysinfo/patches/patch-aa
index 8516201c6df..00fddf750fc 100644
--- a/sysutils/sysinfo/patches/patch-aa
+++ b/sysutils/sysinfo/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/06/21 11:18:04 agc Exp $
+$NetBSD: patch-aa,v 1.2 2012/05/13 15:59:33 hans Exp $
 
 Don't override PREFIX in the main Makefile, and place the
 configuration files, and the executable binary, in the correct
@@ -15,7 +15,7 @@ directory, according to hier(7).
  
  #
  # The bin directory that user's will run the program from.
-@@ -36,13 +36,13 @@
+@@ -36,13 +36,13 @@ BIN 		= ${PREFIX}/bin
  # Directory containing sysinfo.cf configuration files
  #
  #CONFDIR		= /usr/local/lib/${PROG}
@@ -31,3 +31,76 @@ directory, according to hier(7).
  
  #
  # Man sections and directories
+@@ -82,7 +82,7 @@ INSTALLOPTS 	= $(INSTALLMODE) $(INSTALLO
+ # The install.sh script from the sysinfo distribution should work fine 
+ # on most systems.
+ #
+-INSTALLPROG	= sh ./install.sh
++INSTALLPROG	= install
+ 
+ ###########################################################################
+ #
+@@ -251,15 +251,15 @@ install: $(LIBDIR) $(BIN) metasysinfo
+ 	@if [ ! -z "$(LIBDIR)" ]; then \
+ 		RTPLATFORM=`${BUILDINFO} -rtplatform`; \
+ 		build/mkdirhier $(LIBDIR)/$${RTPLATFORM}; \
+-		echo "$(INSTALLPROG) -c -m 555 $(INSTALLOWN) metasysinfo $(BIN)/$(PROG)"; \
+-		$(INSTALLPROG) -c -m 555 $(INSTALLOWN) metasysinfo $(BIN)/$(PROG); \
+-		echo "$(INSTALLPROG) -c ${INSTALLOPTS} ${PROG} $(LIBDIR)/$${RTPLATFORM}/${PROG}"; \
+-		$(INSTALLPROG) -c ${INSTALLOPTS} ${PROG} $(LIBDIR)/$${RTPLATFORM}/${PROG}; \
+-		strip $(LIBDIR)/$${RTPLATFORM}/${PROG}; \
++		echo "$(INSTALLPROG) -c -m 555 $(INSTALLOWN) metasysinfo $(DESTDIR)/$(BIN)/$(PROG)"; \
++		$(INSTALLPROG) -c -m 555 $(INSTALLOWN) metasysinfo $(DESTDIR)/$(BIN)/$(PROG); \
++		echo "$(INSTALLPROG) -c ${INSTALLOPTS} ${PROG} $(DESTDIR)/$(LIBDIR)/$${RTPLATFORM}/${PROG}"; \
++		$(INSTALLPROG) -c ${INSTALLOPTS} ${PROG} $(DESTDIR)/$(LIBDIR)/$${RTPLATFORM}/${PROG}; \
++		strip $(DESTDIR)/$(LIBDIR)/$${RTPLATFORM}/${PROG}; \
+ 	else \
+-		echo $(INSTALLPROG) -c ${INSTALLOPTS} ${PROG} ${BIN}/${PROG}; \
+-		$(INSTALLPROG) -c ${INSTALLOPTS} ${PROG} ${BIN}/${PROG}; \
+-		strip ${BIN}/${PROG}; \
++		echo $(INSTALLPROG) -c ${INSTALLOPTS} ${PROG} $(DESTDIR)/${BIN}/${PROG}; \
++		$(INSTALLPROG) -c ${INSTALLOPTS} ${PROG} $(DESTDIR)/${BIN}/${PROG}; \
++		strip $(DESTDIR)/${BIN}/${PROG}; \
+ 	fi
+ 
+ metasysinfo: metasysinfo.sh
+@@ -269,30 +269,30 @@ metasysinfo: metasysinfo.sh
+ 
+ install.man: $(MANFILES) $(ManDir1) $(ManDir5)
+ 	$(INSTALLPROG) -c -m 444 -o bin -g bin sysinfo.man \
+-		${ManDir1}/${PROG}.${ManSect1}
++		$(DESTDIR)/${ManDir1}/${PROG}.${ManSect1}
+ 	$(INSTALLPROG) -c -m 444 -o bin -g bin sysinfo.cf.man \
+-		${ManDir5}/${PROG}.cf.${ManSect5}
++		$(DESTDIR)/${ManDir5}/${PROG}.cf.${ManSect5}
+ 
+ $(BIN):
+-	build/mkdirhier ${BIN}
++	build/mkdirhier $(DESTDIR)/${BIN}
+ 
+ $(LIBDIR):
+-	build/mkdirhier ${LIBDIR}
++	build/mkdirhier $(DESTDIR)/${LIBDIR}
+ 
+ $(CONFDIR):
+-	build/mkdirhier ${CONFDIR}
++	build/mkdirhier $(DESTDIR)/${CONFDIR}
+ 
+ $(ManDir1):
+-	build/mkdirhier ${ManDir1}
++	build/mkdirhier $(DESTDIR)/${ManDir1}
+ 
+ $(ManDir5):
+-	build/mkdirhier ${ManDir5}
++	build/mkdirhier $(DESTDIR)/${ManDir5}
+ 
+ install.cf: $(CONFDIR)
+ 	@for file in config/*.cf config/*.ddb ; do \
+ 		cf=`echo $$file | sed -e 's;.*/;;'`; \
+-		echo $(INSTALLPROG) -c -m 444 $(INSTALLOWN) $$file $(CONFDIR)/$$cf; \
+-		$(INSTALLPROG) -c -m 444 $(INSTALLOWN) $$file $(CONFDIR)/$$cf; \
++		echo $(INSTALLPROG) -c -m 444 $(INSTALLOWN) $$file $(DESTDIR)/$(CONFDIR)/$$cf; \
++		$(INSTALLPROG) -c -m 444 $(INSTALLOWN) $$file $(DESTDIR)/$(CONFDIR)/$$cf; \
+ 	done
+ 
+ clean: