Attachment 144620 Details for Bug 191841 – Updated Makefile. Apologies for the incorrect encoding.

[patch] Updated Makefile. Apologies for the incorrect encoding.

Makefile.diff (text/plain), 1.57 KB, created by Jonathan Price on 2014-07-12 20:31:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Price

Created: 2014-07-12 20:31:33 UTC

Size: 1.57 KB

patch

obsolete

>--- Makefile    (revision 361616)
>+++ Makefile    (working copy)
>@@ -111,7 +111,6 @@
>                --disable-linux-tproxy \
>                --disable-epoll
>
>-NO_STAGE=      yes
> .include <bsd.port.options.mk>
>
> .if ${OSVERSION} >= 800037
>@@ -311,23 +310,23 @@
>        @${FIND} ${WRKSRC} -name '*.orig' -delete
>
> pre-su-install:
>-       @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
>+       @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${STAGEDIR}${PREFIX} \
>            ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
>
> post-install:
> .if ${PORT_OPTIONS:MNLS}
>-       @${MKDIR} ${EXAMPLESDIR}
>+       @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-       ${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
>+       ${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${STAGEDIR}${E
> .endif
> .if ${PORT_OPTIONS:MSQUID_PINGER}
>-       ${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
>+       ${CHMOD} 4510 ${STAGEDIR}${PREFIX}/libexec/squid/pinger; \
>-       ${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
>+       ${CHGRP} ${SQUID_GID} ${STAGEDIR}${PREFIX}/libexec/squid/pinger
> .endif
> .if ${PORT_OPTIONS:MDOCS}
>-       @${MKDIR} ${DOCSDIR}
>+       @${MKDIR} ${STAGEDIR}${DOCSDIR}
>-       cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
>+       cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${STAGEDIR}${DOCSDIR}
> .endif
>-       @${SETENV} PKG_PREFIX=${PREFIX} \
>+       @${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} \
>            ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>
>        @${ECHO_CMD} "===> post-installation information for ${PKGNAME}:"
>

Actions: View | Diff

Attachments on bug 191841: 144616 | 144620 | 144621