Bug 183961 - Add staging support to mail/dbmail22
Add staging support to mail/dbmail22
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Sunpoet Po-Chuan Hsieh
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2013-11-14 18:10 UTC by Alan Hicks
Modified: 2013-11-15 11:00 UTC (History)
0 users

See Also:


Attachments
dbmail22-staging.diff (1.65 KB, patch)
2013-11-14 18:10 UTC, Alan Hicks
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alan Hicks 2013-11-14 18:10:00 UTC
Add staging support

Fix: Apply patch
Comment 1 Sunpoet Po-Chuan Hsieh freebsd_committer 2013-11-14 23:26:31 UTC
Responsible Changed
From-To: freebsd-ports-bugs->sunpoet

I'll take it.
Comment 2 dfilter freebsd_committer 2013-11-15 10:44:15 UTC
Author: sunpoet
Date: Fri Nov 15 10:44:06 2013
New Revision: 333846
URL: http://svnweb.freebsd.org/changeset/ports/333846

Log:
  - Support STAGEDIR
  - While I'm here, fix typo in PLIST
  
  PR:		ports/183961
  Submitted by:	Alan Hicks <ahicks@p-o.co.uk> (maintainer)

Modified:
  head/mail/dbmail22/Makefile   (contents, props changed)
  head/mail/dbmail22/pkg-plist   (contents, props changed)

Modified: head/mail/dbmail22/Makefile
==============================================================================
--- head/mail/dbmail22/Makefile	Fri Nov 15 10:43:17 2013	(r333845)
+++ head/mail/dbmail22/Makefile	Fri Nov 15 10:44:06 2013	(r333846)
@@ -42,11 +42,6 @@ PORTDOCS=	AUTHORS BUGS COPYING INSTALL N
 		README.postfix README.qmail README.sieve \
 		README.smtp README.solaris README.usermap \
 		THANKS
-MAN1=		dbmail-smtp.1 dbmail.1
-MAN5=		dbmail.conf.5
-MAN8=		dbmail-export.8 dbmail-imapd.8 dbmail-lmtpd.8 \
-		dbmail-pop3d.8 dbmail-sievecmd.8 dbmail-timsieved.8 \
-		dbmail-users.8 dbmail-util.8
 SUB_FILES=	pkg-message
 
 PLIST_SUB+=	PORTNAME=${PORTNAME}
@@ -56,7 +51,6 @@ PLIST_SUB+=	PORTDOCS="@comment "
 PLIST_SUB+=	PORTDOCS=""
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
@@ -114,24 +108,24 @@ post-configure:
 # fixes the `Shared object "libpgsqldbmail.so.0" not found, required by "libdbmail.so.0"' error.
 pre-install:
 	@for f in 'a' 'la' 'so' 'so.0'; do \
-	  if [ -f ${PREFIX}/lib/libdbmail.$$f ] ; then \
-	    ${RM} ${PREFIX}/lib/libdbmail.$$f; \
+	  if [ -f ${STAGEDIR}${PREFIX}/lib/libdbmail.$$f ] ; then \
+	    ${RM} ${STAGEDIR}${PREFIX}/lib/libdbmail.$$f; \
 	  fi; \
 	done
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist
-	@if [ ! -f ${PREFIX}/etc/dbmail.conf ] ; then \
-	  ${CP} -p ${PREFIX}/etc/dbmail.conf-dist ${PREFIX}/etc/dbmail.conf; \
+	@${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf-dist
+	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/dbmail.conf ] ; then \
+	  ${CP} -p ${STAGEDIR}${PREFIX}/etc/dbmail.conf-dist ${STAGEDIR}${PREFIX}/etc/dbmail.conf; \
 	fi
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@for f in ${DATABASE}; do \
-	  ${MKDIR} ${DATADIR}/$$f ; \
-	  ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${DATADIR}/$$f; \
+	  ${MKDIR} ${STAGEDIR}${DATADIR}/$$f ; \
+	  ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${STAGEDIR}${DATADIR}/$$f; \
 	done
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 

Modified: head/mail/dbmail22/pkg-plist
==============================================================================
--- head/mail/dbmail22/pkg-plist	Fri Nov 15 10:43:17 2013	(r333845)
+++ head/mail/dbmail22/pkg-plist	Fri Nov 15 10:44:06 2013	(r333846)
@@ -31,6 +31,17 @@ lib/dbmail/libdbmail.so.0
 %%SQLITE%%lib/dbmail/libsqlite.so
 %%SQLITE%%lib/dbmail/libsqlite.so.0
 @dirrm lib/dbmail
+man/man1/dbmail-smtp.1.gz
+man/man1/dbmail.1.gz
+man/man5/dbmail.conf.5.gz
+man/man8/dbmail-export.8.gz
+man/man8/dbmail-imapd.8.gz
+man/man8/dbmail-lmtpd.8.gz
+man/man8/dbmail-pop3d.8.gz
+man/man8/dbmail-sievecmd.8.gz
+man/man8/dbmail-timsieved.8.gz
+man/man8/dbmail-users.8.gz
+man/man8/dbmail-util.8.gz
 sbin/dbmail-export
 sbin/dbmail-imapd
 sbin/dbmail-lmtpd
@@ -41,7 +52,7 @@ sbin/dbmail-smtp
 sbin/dbmail-users
 sbin/dbmail-util
 @exec mkdir -p %D/share/%%PORTNAME%%
-%%MYSQL%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/mysql
+%%MYSQL%%@exec mkdir -p %D/share/%%PORTNAME%%/mysql
 %%MYSQL%%share/%%PORTNAME%%/mysql/2_1_7-2_2_0.mysql
 %%MYSQL%%share/%%PORTNAME%%/mysql/create_tables.mysql
 %%MYSQL%%share/%%PORTNAME%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Sunpoet Po-Chuan Hsieh freebsd_committer 2013-11-15 11:00:46 UTC
State Changed
From-To: open->closed

Committed. Thanks!