[Bug 191728] New: [PATCH] mail/postfix-logwatch: fix StageDir

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191728

            Bug ID: 191728
           Summary: [PATCH] mail/postfix-logwatch: fix StageDir
           Product: Ports Tree
           Version: Latest
          Hardware: Any
                OS: Any
            Status: Needs Triage
          Severity: Affects Only Me
          Priority: Normal
         Component: Individual Port(s)
          Assignee: freebsd-ports-bugs at FreeBSD.org
          Reporter: takefu at airport.fm

diff -ruN /usr/ports/mail/postfix-logwatch/Makefile ./Makefile
--- /usr/ports/mail/postfix-logwatch/Makefile    2014-07-04 18:12:57.000000000
+0900
+++ ./Makefile    2014-07-08 10:20:24.000000000 +0900
@@ -7,7 +7,7 @@
 MASTER_SITES=    SF/logreporters/${PORTNAME}/release/${PORTVERSION}
 EXTRACT_SUFX=    .tgz

-MAINTAINER= ports at FreeBSD.org
+MAINTAINER=    ports at FreeBSD.org
 COMMENT=    Postfix MTA log parser

 LICENSE=    MIT
@@ -16,36 +16,35 @@
 PORTDOCS=    Bugs Changes README
 PORTEXAMPLES=    ${PORTNAME}.conf ${PORTNAME}.conf-topn

-MAN1=        ${PORTNAME}.1
-
-USES=        perl5
+USES=        perl5 shebangfix
 USE_PERL5=    run
 NO_BUILD=    yes
+SHEBANG_FILES=    ${PORTNAME}
+
+.include <bsd.port.options.mk>

-NO_STAGE=    yes
 post-patch:
     @cd ${WRKSRC} && ${REINPLACE_CMD} -e '\
         s!/usr/local/etc!${ETCDIR}! \
         ' ${PORTNAME} ${PORTNAME}.1 README

 do-install:
-    ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-    ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
-    @${CP} ${WRKSRC}/${PORTNAME}.conf ${WRKSRC}/${PORTNAME}.conf.sample
-    @${MKDIR} ${ETCDIR}
-    ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${ETCDIR}
+    ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+    ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+    @${MKDIR} ${STAGEDIR}${ETCDIR}
+    ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf
${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample

 post-install:
     @if [ ! -f ${ETCDIR}/${PORTNAME}.conf ]; then \
-        ${CP} -p ${ETCDIR}/${PORTNAME}.conf.sample ${ETCDIR}/${PORTNAME}.conf;
\
+        ${CP} -p ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
${STAGEDIR}${ETCDIR}/${PORTNAME}.conf; \
     fi
-.if !defined(NOPORTDOCS)
-    @${MKDIR} ${DOCSDIR}
-    cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+    @${MKDIR} ${STAGEDIR}${DOCSDIR}
+    cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
-    @${MKDIR} ${EXAMPLESDIR}
-    cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+    @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+    cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 .endif

 .include <bsd.port.mk>
diff -ruN /usr/ports/mail/postfix-logwatch/pkg-plist ./pkg-plist
--- /usr/ports/mail/postfix-logwatch/pkg-plist    2014-01-23 00:16:56.000000000
+0900
+++ ./pkg-plist    2014-07-08 10:44:55.000000000 +0900
@@ -3,3 +3,4 @@
 @exec if [ ! -f %B/postfix-logwatch.conf ] ; then cp -p %B/%f
%B/postfix-logwatch.conf; fi
 @dirrmtry %%ETCDIR%%
 bin/postfix-logwatch
+man/man1/postfix-logwatch.1.gz
---

-- 
You are receiving this mail because:
You are the assignee for the bug.