Bug 191662 - [ staging ] mail/imap-uw
Summary: [ staging ] mail/imap-uw
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: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-07-06 13:30 UTC by Dan Lukes
Modified: 2014-07-08 02:49 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Dan Lukes 2014-07-06 13:30:30 UTC
mail/imap-uw require staging or will be removed

Fix:
--- Makefile.orig	2014-07-06 14:45:54.000000000 +0200
+++ Makefile	2014-07-06 14:52:23.000000000 +0200
@@ -25,9 +25,6 @@
 
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		dmail.1 mailutil.1 tmail.1
-MAN8=		ipopd.8 imapd.8
-
 ALL_TARGET=	bsf
 
 # This port must have the same SSL settings as mail/cclient, which it depends on
@@ -40,7 +37,6 @@
 DRAC_DESC=		Dynamically open MTA for relaying
 NETSCAPE_BRAIN_DAMAGE_DESC=	See Makefile for documentation
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDRAC}
@@ -80,22 +76,22 @@
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec/
-	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec/
-	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec/
+	${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${STAGEDIR}${PREFIX}/libexec/
+	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${STAGEDIR}${PREFIX}/libexec/
+	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${STAGEDIR}${PREFIX}/libexec/
 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g mail -m 2711 \
-		${WRKSRC}/mlock/mlock ${PREFIX}/libexec
-	${INSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${PREFIX}/bin/mboxtest
+		${WRKSRC}/mlock/mlock ${STAGEDIR}${PREFIX}/libexec
+	${INSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${STAGEDIR}${PREFIX}/bin/mboxtest
 	${INSTALL_MAN} \
-		${WRKSRC}/src/imapd/imapd.8 ${PREFIX}/man/man8/imapd.8
+		${WRKSRC}/src/imapd/imapd.8 ${STAGEDIR}${PREFIX}/man/man8/imapd.8
 	${INSTALL_MAN} \
-		${WRKSRC}/src/ipopd/ipopd.8 ${PREFIX}/man/man8/ipopd.8
-	${INSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${PREFIX}/man/man1/
+		${WRKSRC}/src/ipopd/ipopd.8 ${STAGEDIR}${PREFIX}/man/man8/ipopd.8
+	${INSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${STAGEDIR}${PREFIX}/man/man1/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
@@ -119,9 +115,9 @@
 	@${ECHO} "================================================================================"
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} -m 0755 -p ${DOCSDIR}
+	${MKDIR} -m 0755 -p ${STAGEDIR}${DOCSDIR}
 	@${TAR} -C ${WRKSRC}/docs -cf - . | \
-		(umask 022; ${TAR} -C ${DOCSDIR} -xf -)
+		(umask 022; ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -)
 .endif
 
 cert:
--- pkg-plist.orig	2014-07-06 15:11:33.000000000 +0200
+++ pkg-plist	2014-07-06 14:57:35.000000000 +0200
@@ -6,6 +6,11 @@
 libexec/ipop2d
 libexec/ipop3d
 libexec/mlock
+man/man1/dmail.1.gz
+man/man1/mailutil.1.gz
+man/man1/tmail.1.gz
+man/man8/ipopd.8.gz
+man/man8/imapd.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/BUILD
 %%PORTDOCS%%%%DOCSDIR%%/CONFIG
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
Comment 1 commit-hook freebsd_committer freebsd_triage 2014-07-08 02:47:47 UTC
A commit references this bug:

Author: swills
Date: Tue Jul  8 02:47:38 UTC 2014
New revision: 361158
URL: http://svnweb.freebsd.org/changeset/ports/361158

Log:
  mail/imap-uw: support stage, use new LIB_DEPENDS format while here

  PR:		191662
  Submitted by:	Dan Lukes <dan@obluda.cz>

Changes:
  head/mail/imap-uw/Makefile
  head/mail/imap-uw/pkg-plist
Comment 2 Steve Wills freebsd_committer freebsd_triage 2014-07-08 02:49:17 UTC
Committed with minor changes. Thanks!