[PC-BSD Commits] r21587 - pcbsd/current/src-sh/port-files

[svn at pcbsd.org]

Author: kris
Date: 2013-02-19 20:01:17 +0000 (Tue, 19 Feb 2013)
New Revision: 21587

Modified:
   pcbsd/current/src-sh/port-files/Makefile
   pcbsd/current/src-sh/port-files/pkg-install
Log:

Try to fix the port to run the pkg-install at the right time



Modified: pcbsd/current/src-sh/port-files/Makefile
===================================================================
--- pcbsd/current/src-sh/port-files/Makefile	2013-02-19 19:36:38 UTC (rev 21586)
+++ pcbsd/current/src-sh/port-files/Makefile	2013-02-19 20:01:17 UTC (rev 21587)
@@ -35,7 +35,12 @@
 MAN8=		pbi_addrepo.8 pbi_autobuild.8 pbi_deleterepo.8 \
 		pbi_makepatch.8 pbi_makeport.8 pbi_makerepo.8 pbid.8
 
+.include <bsd.port.pre.mk>
+
 do-install:
 	cd ${WRKSRC} && make install
 
-.include <bsd.port.mk>
+post-install:
+	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.include <bsd.port.post.mk>

Modified: pcbsd/current/src-sh/port-files/pkg-install
===================================================================
--- pcbsd/current/src-sh/port-files/pkg-install	2013-02-19 19:36:38 UTC (rev 21586)
+++ pcbsd/current/src-sh/port-files/pkg-install	2013-02-19 20:01:17 UTC (rev 21587)
@@ -3,6 +3,10 @@
 
 PREFIX=${PKG_PREFIX-/usr/local}
 
+if [ "$2" != "POST-INSTALL" ] ; then
+   exit 0
+fi
+
 # If this is a new install, add the PC-BSD master repo
 if [ ! -d "/var/db/pbi/keys" ] ; then
         ${PREFIX}/sbin/pbi_addrepo ${PREFIX}/share/pbi-manager/pcbsd.rpo