Date: Thu, 14 Nov 2013 17:58:52 +0000 From: Alan Hicks <ahicks@p-o.co.uk> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/183961: Add staging support to mail/dbmail22 Message-ID: <E1Vh1Bs-000DCU-Co@p-o.co.uk> Resent-Message-ID: <201311141810.rAEIA134082120@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183961
>Category: ports
>Synopsis: Add staging support to mail/dbmail22
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 14 18:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Alan Hicks
>Release: FreeBSD 9.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD schnittke.p-o.co.uk 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Add staging support
>How-To-Repeat:
>Fix:
Apply patch
--- dbmail22-staging.diff begins here ---
diff -ur dbmail22/Makefile dbmail22/Makefile
--- dbmail22/Makefile 2013-11-06 17:52:42.000000000 +0000
+++ dbmail22/Makefile 2013-11-14 17:19:53.000000000 +0000
@@ -56,7 +56,6 @@
PLIST_SUB+= PORTDOCS=""
.endif
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMYSQL}
@@ -114,24 +113,24 @@
# 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}
--- dbmail22-staging.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1Vh1Bs-000DCU-Co>