svn commit: r472469 - head/irc/psybnc

Dmitry Marakasov amdmi3 at FreeBSD.org
Fri Jun 15 17:38:52 UTC 2018


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/


More information about the svn-ports-all mailing list