Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Nov 2013 14:47:05 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335018 - head/ports-mgmt/pkg_replace
Message-ID:  <201311271447.rAREl5tB003879@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danilo
Date: Wed Nov 27 14:47:05 2013
New Revision: 335018
URL: http://svnweb.freebsd.org/changeset/ports/335018

Log:
  - Revert to the original installation schema. With stage, files can be unconditionally installed
  
  Reported by:	ak

Modified:
  head/ports-mgmt/pkg_replace/Makefile

Modified: head/ports-mgmt/pkg_replace/Makefile
==============================================================================
--- head/ports-mgmt/pkg_replace/Makefile	Wed Nov 27 14:02:12 2013	(r335017)
+++ head/ports-mgmt/pkg_replace/Makefile	Wed Nov 27 14:47:05 2013	(r335018)
@@ -29,23 +29,11 @@ PLIST_SUB+=	PKGDB_FIX="@comment "
 
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/pkg_replace/pkg_replace pkgdb_fix/' ${WRKSRC}/sbin/Makefile
 	@${REINPLACE_CMD} -e 's/mkdir -p $${FILESDIR}/@true/' ${WRKSRC}/share/zsh/Makefile
 
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/sbin/pkg_replace/pkg_replace ${STAGEDIR}${PREFIX}/sbin
-	${CP} ${WRKSRC}/etc/pkg_replace.conf ${STAGEDIR}${PREFIX}/etc/pkg_replace.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/sbin/pkg_replace/pkg_replace.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.if ${PORT_OPTIONS:MZSH}
+pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
-	${INSTALL_DATA} ${WRKSRC}/share/zsh/_pkg_replace ${STAGEDIR}${PREFIX}/share/zsh/site-functions
-.endif
-.if ${PORT_OPTIONS:MPKGDB_FIX}
-	${INSTALL_SCRIPT} ${WRKSRC}/sbin/pkgdb_fix/pkgdb_fix ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/sbin/pkgdb_fix/pkgdb_fix.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.endif
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311271447.rAREl5tB003879>