Date: Fri, 15 Jun 2018 17:38:51 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472469 - head/irc/psybnc Message-ID: <201806151738.w5FHcpCj048186@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Jun 15 17:38:51 2018 New Revision: 472469 URL: https://svnweb.freebsd.org/changeset/ports/472469 Log: - Remove always-true OSVERSION condition - Cosmetic fixes Modified: head/irc/psybnc/Makefile Modified: head/irc/psybnc/Makefile ============================================================================== --- head/irc/psybnc/Makefile Fri Jun 15 17:37:51 2018 (r472468) +++ head/irc/psybnc/Makefile Fri Jun 15 17:38:51 2018 (r472469) @@ -35,21 +35,19 @@ IS_INTERACTIVE= yes post-patch: @${REINPLACE_CMD} -e 's#=help/#=${PSYBASE}/help/#' ${WRKSRC}/lang/* -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000024 - @${REINPLACE_CMD} -e 's,gcc,clang -Wno-return-type,g' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's,gcc,clang -Wno-return-type,g' ${WRKSRC}/tools/autoconf.c -.endif + @${REINPLACE_CMD} -e 's,gcc,${CC} -Wno-return-type,g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's,gcc,${CC} -Wno-return-type,g' ${WRKSRC}/tools/autoconf.c do-configure: .if ${PORT_OPTIONS:MMENUCONFIG} - cd ${WRKSRC} && make menuconfig + cd ${WRKSRC} && ${MAKE_CMD} menuconfig .else # Fool makefile.out into believing certs are unnecessary ${TOUCH} ${WRKSRC}/key/psybnc.cert.pem .endif do-install: - ${INSTALL} -d ${STAGEDIR}${PSYBASE}/lang/ ${STAGEDIR}${PSYBASE}/key/ ${STAGEDIR}${PSYBASE}/help/ + ${MKDIR} ${STAGEDIR}${PSYBASE}/lang/ ${STAGEDIR}${PSYBASE}/key/ ${STAGEDIR}${PSYBASE}/help/ ${INSTALL_DATA} ${WRKSRC}/lang/INFO ${STAGEDIR}${PSYBASE}/lang/ ${INSTALL_DATA} ${WRKSRC}/lang/*.lng ${STAGEDIR}${PSYBASE}/lang/ ${INSTALL_DATA} ${WRKSRC}/src/ssl.cnf ${STAGEDIR}${PSYBASE}/key/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806151738.w5FHcpCj048186>