Bug 190805 - Update Perforce ports for stage support
Summary: Update Perforce ports for stage support
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Many People
Assignee: Antoine Brodin
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-06-08 20:49 UTC by Gordon Tetlow
Modified: 2014-06-14 15:27 UTC (History)
1 user (show)

See Also:


Attachments
Attached version of the inlined patch (2.60 KB, patch)
2014-06-08 20:54 UTC, Gordon Tetlow
gordon: maintainer-approval+
Details | Diff
Additional patch for the p4d port (3.41 KB, patch)
2014-06-11 05:40 UTC, Gordon Tetlow
gordon: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Gordon Tetlow 2014-06-08 20:49:48 UTC
Update p4d, p4p, and p4ftpd for STAGE support.

Fix:
Index: p4d/Makefile
===================================================================
--- p4d/Makefile	(revision 357067)
+++ p4d/Makefile	(working copy)
@@ -34,7 +34,6 @@
 
 USE_RC_SUBR=	p4d
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/../p4/Makefile.inc"
@@ -43,16 +42,9 @@
 GROUPS=	p4admin
 
 do-install:
-	${INSTALL_PROGRAM} ${_DISTDIR}/p4d ${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${_DISTDIR}/p4d ${STAGEDIR}${PREFIX}/sbin/
 
 post-install:
-	@${CAT} ${PKGMESSAGE}
-	${MKDIR} ${DESTDIR}${P4ROOT}
-	${CHOWN} p4admin:p4admin ${DESTDIR}${P4ROOT}
-	${CHMOD} 750 ${DESTDIR}${P4ROOT}
-	${TOUCH} ${DESTDIR}${P4LOG}
-	${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}
-	${CHMOD} 640 ${DESTDIR}${P4LOG}
 	@${ECHO_CMD} "@exec ${MKDIR} ${DESTDIR}${P4ROOT}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${DESTDIR}${P4ROOT}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 750 ${DESTDIR}${P4ROOT}" >> ${TMPPLIST}
Index: p4ftpd/Makefile
===================================================================
--- p4ftpd/Makefile	(revision 357067)
+++ p4ftpd/Makefile	(working copy)
@@ -30,7 +30,6 @@
 
 USE_RC_SUBR=	p4ftpd
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/../p4/Makefile.inc"
@@ -39,12 +38,9 @@
 GROUPS=	p4admin
 
 do-install:
-	${INSTALL_PROGRAM} ${_DISTDIR}/p4ftpd ${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${_DISTDIR}/p4ftpd ${STAGEDIR}${PREFIX}/sbin/
 
 post-install:
-	${TOUCH} ${DESTDIR}${P4LOG}
-	${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}
-	${CHMOD} 640 ${DESTDIR}${P4LOG}
 	@${ECHO_CMD} "@exec ${TOUCH} ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 640 ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
Index: p4p/Makefile
===================================================================
--- p4p/Makefile	(revision 357067)
+++ p4p/Makefile	(working copy)
@@ -34,7 +34,6 @@
 
 USE_RC_SUBR=	p4p
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/../p4/Makefile.inc"
@@ -43,15 +42,9 @@
 GROUPS=	p4admin
 
 do-install:
-	${INSTALL_PROGRAM} ${_DISTDIR}/p4p ${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${_DISTDIR}/p4p ${STAGEDIR}${PREFIX}/sbin/
 
 post-install:
-	${MKDIR} ${DESTDIR}${P4CACHE}
-	${CHOWN} p4admin:p4admin ${DESTDIR}${P4CACHE}
-	${CHMOD} 750 ${DESTDIR}${P4CACHE}
-	${TOUCH} ${DESTDIR}${P4LOG}
-	${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}
-	${CHMOD} 640 ${DESTDIR}${P4LOG}
 	@${ECHO_CMD} "@exec ${MKDIR} ${DESTDIR}${P4CACHE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${DESTDIR}${P4CACHE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 750 ${DESTDIR}${P4CACHE}" >> ${TMPPLIST}
Comment 1 Gordon Tetlow freebsd_committer freebsd_triage 2014-06-08 20:54:15 UTC
Created attachment 143544 [details]
Attached version of the inlined patch
Comment 2 Gordon Tetlow freebsd_committer freebsd_triage 2014-06-11 05:40:49 UTC
Created attachment 143663 [details]
Additional patch for the p4d port

Uploaded a new patch for just the p4d port as Perforce has changed the binary out from underneath us.
Comment 3 Antoine Brodin freebsd_committer freebsd_triage 2014-06-14 14:28:39 UTC
take
Comment 4 commit-hook freebsd_committer freebsd_triage 2014-06-14 15:27:17 UTC
A commit references this bug:

Author: antoine
Date: Sat Jun 14 15:26:19 UTC 2014
New revision: 357789
URL: http://svnweb.freebsd.org/changeset/ports/357789

Log:
  - Update LEGAL for some perforce ports
  - Update and stage p4d, this makes it fetchable again
  - Stage p4ftpd
  - Stage p4p

  PR:		ports/190805
  Submitted by:	maintainer

Changes:
  head/LEGAL
  head/devel/p4d/Makefile
  head/devel/p4d/distinfo.freebsd60x86
  head/devel/p4d/distinfo.freebsd60x86_64
  head/devel/p4d/distinfo.freebsd70x86
  head/devel/p4d/distinfo.freebsd70x86_64
  head/devel/p4ftpd/Makefile
  head/devel/p4p/Makefile
Comment 5 Antoine Brodin freebsd_committer freebsd_triage 2014-06-14 15:27:42 UTC
patch committed with a few changes, thanks!