From owner-svn-ports-head@FreeBSD.ORG Tue Aug 26 08:13:25 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A5E144CC; Tue, 26 Aug 2014 08:13:25 +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 9116537A7; Tue, 26 Aug 2014 08:13:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q8DPEX043794; Tue, 26 Aug 2014 08:13:25 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q8DPHU043792; Tue, 26 Aug 2014 08:13:25 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201408260813.s7Q8DPHU043792@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Tue, 26 Aug 2014 08:13:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366195 - head/games/crossfire-server 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 08:13:25 -0000 Author: tijl Date: Tue Aug 26 08:13:24 2014 New Revision: 366195 URL: http://svnweb.freebsd.org/changeset/ports/366195 QAT: https://qat.redports.org/buildarchive/r366195/ Log: - Convert to USES=libtool - This port runs configure using bash so the libtool script it generates must also run with bash; set CONFIGURE_SHELL to accomplish this - Add INSTALL_TARGET=install-strip - Remove PTHREAD_CFLAGS and PTHREAD_LIBS - Remove Xorg dependencies Modified: head/games/crossfire-server/Makefile head/games/crossfire-server/pkg-plist Modified: head/games/crossfire-server/Makefile ============================================================================== --- head/games/crossfire-server/Makefile Tue Aug 26 07:40:57 2014 (r366194) +++ head/games/crossfire-server/Makefile Tue Aug 26 08:13:24 2014 (r366195) @@ -3,7 +3,7 @@ PORTNAME= crossfire PORTVERSION= 1.70.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= -server @@ -21,15 +21,15 @@ LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -USES= gmake perl5 uidfix -USE_XORG= ice sm x11 xaw xext xmu xpm xt +USES= gmake libtool perl5 uidfix USE_SQLITE= 3 USE_PYTHON= yes -USE_AUTOTOOLS= libtool -CONFIGURE_ARGS= --with-check=no --localstatedir=/var/games - -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static --with-check=no --localstatedir=/var/games +CONFIGURE_SHELL=${LOCALBASE}/bin/bash +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip PORTDOCS= * @@ -50,17 +50,12 @@ post-patch: 's|-ldl||g' @${REINPLACE_CMD} -e 's|^#.*/bin/sh|#! ${LOCALBASE}/bin/bash|g; \ s|-ldl||g; \ - s|python[{].*[}]|${PYTHON_VERSION}|g; \ - s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + s|python[{].*[}]|${PYTHON_VERSION}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e '//d' ${WRKSRC}/socket/metaserver.c @${REINPLACE_CMD} -e 's| /usr/bin/perl|${LOCALBASE}/bin/perl|' \ ${WRKSRC}/lib/adm/map_expand.pl post-install: -.for l in cflogger citylife cfpython cfanim cfnewspaper - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/crossfire/plugins/${l}.so -.endfor - @${MKDIR} ${STAGEDIR}${DATADIR}/maps @(cd ${WRKDIR}/maps && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/maps) Modified: head/games/crossfire-server/pkg-plist ============================================================================== --- head/games/crossfire-server/pkg-plist Tue Aug 26 07:40:57 2014 (r366194) +++ head/games/crossfire-server/pkg-plist Tue Aug 26 08:13:24 2014 (r366195) @@ -18,20 +18,10 @@ bin/player_dl.pl %%ETCDIR%%/rules %%ETCDIR%%/settings %%ETCDIR%%/stat_bonus -lib/crossfire/plugins/cfanim.a -lib/crossfire/plugins/cfanim.la lib/crossfire/plugins/cfanim.so -lib/crossfire/plugins/cflogger.a -lib/crossfire/plugins/cflogger.la lib/crossfire/plugins/cflogger.so -lib/crossfire/plugins/cfnewspaper.a -lib/crossfire/plugins/cfnewspaper.la lib/crossfire/plugins/cfnewspaper.so -lib/crossfire/plugins/cfpython.a -lib/crossfire/plugins/cfpython.la lib/crossfire/plugins/cfpython.so -lib/crossfire/plugins/citylife.a -lib/crossfire/plugins/citylife.la lib/crossfire/plugins/citylife.so libexec/crossfire/add_throw.perl libexec/crossfire/metaserver.pl