Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Mar 2014 09:16:51 +0200 (CEST)
From:      dirk.meyer@dinoex.sub.org
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/188068: [PATCH] mail/milter-bogom
Message-ID:  <201403300716.s2U7Gp1s024163@home8.dinoex.sub.de>
Resent-Message-ID: <201403300720.s2U7K0Mi004918@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         188068
>Category:       ports
>Synopsis:       [PATCH] mail/milter-bogom
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 30 07:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Dirk Meyer
>Release:        FreeBSD 9.2-RELEASE
>Organization:
privat
>Environment:

	FreeBSD ports

>Description:

	convert port to staging
	undo silent install
	drop MAN8PREFIX, which fails on custom PREFIX
	add trailing / to install for robustness

>How-To-Repeat:
>Fix:

	apply patch:

Index: Makefile
===================================================================
--- Makefile	(revision 349338)
+++ Makefile	(working copy)
@@ -14,8 +14,6 @@
 
 RUN_DEPENDS=	bogofilter:${PORTSDIR}/mail/bogofilter
 
-MAN8=		bogom.8
-
 MAKE_ARGS=	CPPFLAGS="-DDEF_CONF=\\\"${PREFIX}/etc/bogom.conf\\\" ${PTHREAD_CFLAGS}" \
 		LIBS="-lmilter ${PTHREAD_LIBS}"
 
@@ -23,31 +21,30 @@
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	sbin/bogom \
+		man/man8/bogom.8.gz \
 		etc/bogom.conf-example
 
 PORTDOCS=	README CHANGELOG
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/bogom.8
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/bogom.8
+	${REINPLACE_CMD} -e \
 		's|/usr/local/bin/bogofilter|${LOCALBASE}/bin/bogofilter|g' \
 		${WRKSRC}/bogom.8 \
 		${WRKSRC}/bogom.conf-example \
 		${WRKSRC}/milter.c
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/bogom ${PREFIX}/sbin
-	@${INSTALL_MAN} ${WRKSRC}/bogom.8 ${MAN8PREFIX}/man/man8
-	@${INSTALL_DATA} ${WRKSRC}/bogom.conf-example ${PREFIX}/etc
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bogom ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_MAN} ${WRKSRC}/bogom.8 ${STAGEDIR}${PREFIX}/man/man8/
+	${INSTALL_DATA} ${WRKSRC}/bogom.conf-example ${STAGEDIR}${PREFIX}/etc/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
>Unformatted:



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