Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Aug 2014 17:26:17 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r365007 - head/irc/xchat-ruby
Message-ID:  <201408151726.s7FHQHES081334@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Fri Aug 15 17:26:17 2014
New Revision: 365007
URL: http://svnweb.freebsd.org/changeset/ports/365007
QAT: https://qat.redports.org/buildarchive/r365007/

Log:
  Fix build on -current. Also, remove unnecessary bsd.port.options.mk inclusion.

Modified:
  head/irc/xchat-ruby/Makefile

Modified: head/irc/xchat-ruby/Makefile
==============================================================================
--- head/irc/xchat-ruby/Makefile	Fri Aug 15 17:21:08 2014	(r365006)
+++ head/irc/xchat-ruby/Makefile	Fri Aug 15 17:26:17 2014	(r365007)
@@ -27,27 +27,25 @@ PORTEXAMPLES=	embedify.rb TimerSample.rb
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's|^RUBY=.*|RUBY=${RUBY}|' \
 		-e 's|-lruby$$|-l${RUBY_NAME}|' \
 		-e 's|^ARCHDIR=.*|ARCHDIR=`$$(RUBY) ${FILESDIR}/rubypath.rb`|' \
+		-e '/^CC=/s|gcc|${CC}|' \
+		-e 's|^CFLAGS=|CFLAGS+=|' \
 		${WRKSRC}/Makefile
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xchat/plugins
 	${INSTALL_PROGRAM} ${WRKSRC}/xchat-ruby.so \
 		${STAGEDIR}${PREFIX}/lib/xchat/plugins/
-.if ${PORT_OPTIONS:MDOCS}
+
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${DOCSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${DOCSRC}/*/,} \
 		${STAGEDIR}${EXAMPLESDIR}/
-.endif
 
 .include <bsd.port.mk>



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