Don't expose STAGEDIR into installed binary nor .pc.

4 files changed, 66 insertions, 22 deletions

diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index b20bd16db7b1..d060f0867fc6 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gkrellm
 PORTVERSION=	2.3.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
@@ -75,11 +75,10 @@ PORTDOCS=	COPYRIGHT CREDITS README Themes.html
 
 ALL_TARGET=	freebsd
 
-MAKE_ENV+=	INSTALLROOT=${STAGEDIR}${PREFIX} \
-		PKGCONFIGDIR=${STAGEDIR}${PREFIX}/libdata/pkgconfig \
-		SINSTALLDIR=${STAGEDIR}${PREFIX}/sbin \
-		MANDIR=${STAGEDIR}${MAN1PREFIX}/man/man1 \
-		SMANDIR=${STAGEDIR}${MANPREFIX}/man/man8 \
+MAKE_ENV+=	INSTALLROOT=${PREFIX} INSTALL_PREFIX=$(STAGEDIR) \
+		PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
+		SINSTALLDIR=${PREFIX}/sbin \
+		MANDIR=${MAN1PREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8 \
 		VERSION=${PORTVERSION}
 
 CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${LOCALBASE}/share/gkrellm2/themes\"' \
diff --git a/sysutils/gkrellm2/files/patch-Makefile b/sysutils/gkrellm2/files/patch-Makefile
index f5c1e08e377e..0b1a3c16211f 100644
--- a/sysutils/gkrellm2/files/patch-Makefile
+++ b/sysutils/gkrellm2/files/patch-Makefile
@@ -1,7 +1,7 @@
 Index: Makefile
 diff -u Makefile.orig Makefile
---- Makefile.orig	2007-07-20 06:21:50.000000000 +0900
-+++ Makefile	2008-02-19 18:42:44.000000000 +0900
+--- Makefile.orig	2010-10-03 01:21:01.000000000 +0900
++++ Makefile	2014-06-18 01:31:33.764515607 +0900
 @@ -3,7 +3,9 @@
  #	make
  # For FreeBSD 2.X:
@@ -13,7 +13,7 @@ diff -u Makefile.orig Makefile
  #	make freebsd
  # For NetBSD 1.5 - 1.6.X
  #	make netbsd1
-@@ -116,7 +118,7 @@
+@@ -120,7 +122,7 @@
  export MANDIR SMANDIR MANDIRMODE MANMODE
  export OS_NAME OS_RELEASE
  
@@ -22,3 +22,14 @@ diff -u Makefile.orig Makefile
  debug=0
  export enable_nls
  export debug
+@@ -162,8 +164,8 @@
+ 	rm -f $(PKGCONFIGDIR)/gkrellm.pc
+ 
+ install_gkrellm.pc:
+-	$(INSTALL) -d $(PKGCONFIGDIR)
+-	$(INSTALL) -m $(INCLUDEMODE) -c gkrellm.pc $(PKGCONFIGDIR)
++	$(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
++	$(INSTALL) -m $(INCLUDEMODE) -c gkrellm.pc $(DESTDIR)$(PKGCONFIGDIR)
+ 
+ install_darwin install_darwin9 install_macosx: install_gkrellm.pc
+ 	(cd po && ${MAKE} install)
diff --git a/sysutils/gkrellm2/files/patch-server::Makefile b/sysutils/gkrellm2/files/patch-server::Makefile
index 8e95d6e8fa01..625bd2a7875a 100644
--- a/sysutils/gkrellm2/files/patch-server::Makefile
+++ b/sysutils/gkrellm2/files/patch-server::Makefile
@@ -1,7 +1,7 @@
 Index: server/Makefile
 diff -u server/Makefile.orig server/Makefile
 --- server/Makefile.orig	2010-10-03 01:21:01.000000000 +0900
-+++ server/Makefile	2010-10-06 17:37:18.470213785 +0900
++++ server/Makefile	2014-06-18 01:15:19.903510437 +0900
 @@ -26,6 +26,7 @@
  MANMODE ?= 644
  MANDIRMODE ?= 755
@@ -70,7 +70,7 @@ diff -u server/Makefile.orig server/Makefile
  # Darwin target for systems that still have libkvm
  darwin: 
  	$(MAKE) STRIP= HAVE_GETADDRINFO=1 \
-@@ -176,7 +188,7 @@
+@@ -176,27 +188,32 @@
  		SYS_LIBS="-lws2_32 -lwtsapi32 -lpdh -lnetapi32 -liphlpapi -lintl" \
  		gkrellmd
  
@@ -78,22 +78,33 @@ diff -u server/Makefile.orig server/Makefile
 +install: install_bin install_inc install_man install_gkrellmd.pc
  
  install_bin:
- 	$(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR)
-@@ -188,15 +200,20 @@
+-	$(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR)
+-	$(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT)
++	$(INSTALL) -d -m $(INSTALLDIRMODE) $(DESTDIR)$(SINSTALLDIR)
++	$(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT)
+ 
+ install_inc:
+-	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
+-	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2
++	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(DESTDIR)$(INCLUDEDIR)/gkrellm2
++	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(DESTDIR)$(INCLUDEDIR)/gkrellm2
  
  install_man:
- 	$(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)
+-	$(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)
 -	$(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1
-+	$(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).8
++	$(INSTALL) -d -m $(MANDIRMODE) $(DESTDIR)$(SMANDIR)
++	$(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(DESTDIR)$(SMANDIR)/$(PACKAGE_D).8
  
  install_cfg:
- 	$(INSTALL) -d -m $(CFGDIRMODE) $(CFGDIR)
- 	$(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(CFGDIR)/gkrellmd.conf
- 
-+install_gkrellmd.pc:
-+	$(INSTALL) -d $(PKGCONFIGDIR)
-+	$(INSTALL) -c -m $(INCLUDEMODE) gkrellmd.pc $(PKGCONFIGDIR)
+-	$(INSTALL) -d -m $(CFGDIRMODE) $(CFGDIR)
+-	$(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(CFGDIR)/gkrellmd.conf
++	$(INSTALL) -d -m $(CFGDIRMODE) $(DESTDIR)$(CFGDIR)
++	$(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(DESTDIR)$(CFGDIR)/gkrellmd.conf
 +
++install_gkrellmd.pc:
++	$(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
++	$(INSTALL) -c -m $(INCLUDEMODE) gkrellmd.pc $(DESTDIR)$(PKGCONFIGDIR)
+ 
  uninstall:
  	rm -f $(SINSTALLDIR)/$(PACKAGE_D)
  	rm -f $(SMANDIR)/$(PACKAGE_D).1
diff --git a/sysutils/gkrellm2/files/patch-src:Makefile b/sysutils/gkrellm2/files/patch-src:Makefile
index 01d3a7246d03..22b834aa69b8 100644
--- a/sysutils/gkrellm2/files/patch-src:Makefile
+++ b/sysutils/gkrellm2/files/patch-src:Makefile
@@ -1,7 +1,7 @@
 Index: src/Makefile
 diff -u src/Makefile.orig src/Makefile
 --- src/Makefile.orig	2010-10-03 01:21:01.000000000 +0900
-+++ src/Makefile	2010-10-06 17:59:25.769707368 +0900
++++ src/Makefile	2014-06-18 01:12:52.297511351 +0900
 @@ -53,7 +53,8 @@
  	CONFIGURE_ARGS += --without-ntlm
  endif
@@ -43,3 +43,26 @@ diff -u src/Makefile.orig src/Makefile
  # Darwin target for systems that still have libkvm
  darwin: 
  ifeq ($(HAVE_SSL),1)
+@@ -201,16 +209,16 @@
+ install: install_bin install_inc install_man
+ 
+ install_bin:
+-	$(INSTALL) -d -m $(INSTALLDIRMODE) $(INSTALLDIR)
+-	$(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE)$(BINEXT) $(INSTALLDIR)/$(PACKAGE)$(BINEXT)
++	$(INSTALL) -d -m $(INSTALLDIRMODE) $(DESTDIR)$(INSTALLDIR)
++	$(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE)$(BINEXT) $(DESTDIR)$(INSTALLDIR)/$(PACKAGE)$(BINEXT)
+ 
+ install_inc:
+-	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
+-	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2
++	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(DESTDIR)$(INCLUDEDIR)/gkrellm2
++	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(DESTDIR)$(INCLUDEDIR)/gkrellm2
+ 
+ install_man:
+-	$(INSTALL) -d -m $(MANDIRMODE) $(MANDIR)
+-	$(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(MANDIR)/$(PACKAGE).1
++	$(INSTALL) -d -m $(MANDIRMODE) $(DESTDIR)$(MANDIR)
++	$(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(DESTDIR)$(MANDIR)/$(PACKAGE).1
+ 
+ uninstall:
+ 	$(RM) $(INSTALLDIR)/$(PACKAGE)