From owner-svn-ports-head@FreeBSD.ORG  Fri Aug 15 17:26:17 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B488BDCB;
 Fri, 15 Aug 2014 17:26:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9FF722E5C;
 Fri, 15 Aug 2014 17:26:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7FHQHbG081336;
 Fri, 15 Aug 2014 17:26:17 GMT (envelope-from adamw@FreeBSD.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7FHQHES081334;
 Fri, 15 Aug 2014 17:26:17 GMT (envelope-from adamw@FreeBSD.org)
Message-Id: <201408151726.s7FHQHES081334@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adamw set sender to
 adamw@FreeBSD.org using -f
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Fri, 15 Aug 2014 17:26:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r365007 - head/irc/xchat-ruby
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Aug 2014 17:26:17 -0000

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>