From owner-svn-ports-all@FreeBSD.ORG Fri Nov 2 13:16:04 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BCF6E23D; Fri, 2 Nov 2012 13:16:04 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 97E018FC0A; Fri, 2 Nov 2012 13:16:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA2DG4lq027556; Fri, 2 Nov 2012 13:16:04 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA2DG4gh027551; Fri, 2 Nov 2012 13:16:04 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201211021316.qA2DG4gh027551@svn.freebsd.org> From: Pawel Pekala Date: Fri, 2 Nov 2012 13:16:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306849 - head/graphics/grx X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2012 13:16:04 -0000 Author: pawel Date: Fri Nov 2 13:16:03 2012 New Revision: 306849 URL: http://svn.freebsd.org/changeset/ports/306849 Log: - Update to version 2.4.9 - Add LICENSE - Remove ABI versions from LID_DEPENDS PR: ports/172241 Submitted by: KATO Tsuguru Feature safe: yes Modified: head/graphics/grx/Makefile head/graphics/grx/distinfo head/graphics/grx/pkg-descr head/graphics/grx/pkg-plist Modified: head/graphics/grx/Makefile ============================================================================== --- head/graphics/grx/Makefile Fri Nov 2 13:11:56 2012 (r306848) +++ head/graphics/grx/Makefile Fri Nov 2 13:16:03 2012 (r306849) @@ -1,13 +1,8 @@ -# New ports collection makefile for: grx -# Date created: 1 Jul 2006 -# Whom: alepulver -# +# Created by: alepulver # $FreeBSD$ -# PORTNAME= grx -PORTVERSION= 2.4.8 -PORTREVISION= 1 +PORTVERSION= 2.4.9 CATEGORIES= graphics MASTER_SITES= http://grx.gnu.de/download/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} @@ -15,21 +10,31 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.// MAINTAINER= ports@FreeBSD.org COMMENT= A 2D graphics library +LICENSE= LGPL20 MIT +LICENSE_COMB= multi + +LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ + xcb:${PORTSDIR}/x11/libxcb + +OPTIONS_DEFINE= BGI BMP JPEG PNG PRINT TIFF ZLIB +OPTIONS_DEFAULT= ZLIB BGI BMP PNG PRINT +BGI_DESC= Enable BGI support +BMP_DESC= Enable BMP support + +USE_XORG= x11 xau xdmcp USE_GMAKE= yes -USE_XORG= x11 -USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --with-fontpath=${DATADIR}/fonts \ --with-x11-base=${LOCALBASE} -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ALL_TARGET= libs INSTALL_TARGET= install install-bin install-fonts install-info +USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes -OPTIONS_DEFINE= BGI BMP JPEG PNG PRINT TIFF ZLIB -OPTIONS_DEFAULT= ZLIB BGI BMP PNG PRINT -BGI_DESC= Enable BGI support -BMP_DESC= Enable BMP support +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +PLIST_SUB= VERSION="${PORTVERSION}" INFO= grx @@ -50,7 +55,7 @@ CONFIGURE_ARGS+=--disable-bmp .endif .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+=--enable-jpeg .else CONFIGURE_ARGS+=--disable-jpeg @@ -72,7 +77,7 @@ PLIST_SUB+= PRINT="@comment " .endif .if ${PORT_OPTIONS:MTIFF} -LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff +LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff CONFIGURE_ARGS+=--enable-tiff .else CONFIGURE_ARGS+=--disable-tiff @@ -84,7 +89,9 @@ CONFIGURE_ARGS+=--enable-zlib CONFIGURE_ARGS+=--disable-zlib .endif -.if ${ARCH} == amd64 +.include + +.if ${ARCH} == "amd64" CONFIGURE_ARGS+=--enable-x86_64 .endif @@ -96,13 +103,16 @@ post-patch: @${GREP} -ERl '<(malloc|alloca)\.h>' ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -Ee 's|<(malloc\|alloca)\.h>||' @${REINPLACE_CMD} -Ee \ - 's|-m32||; s|-m64||; \ - s|^(CC[[:blank:]]*=).*|\1 ${CC}|; \ - s|^(CCOPT =)|\1 ${CPPFLAGS} ${CFLAGS}|; \ - s|^(LDOPT =)|\1 ${LDFLAGS}|;' \ - -e 's|lib64|lib|' \ + 's|-m32|| ; \ + s|-m64|| ; \ + s|^(CC[[:blank:]]*=).*|\1 ${CC}| ; \ + s|^(CCOPT =)|\1 ${CPPFLAGS} ${CFLAGS}| ; \ + s|^(LDOPT =)|\1 ${LDFLAGS}| ; \ + s|lib64|lib|' \ ${WRKSRC}/makedefs.grx - @${REINPLACE_CMD} -e 's|gcc|${CC}|' -e 's|lib64|lib|' \ - ${WRKSRC}/src/makefile.[lx]* + @${REINPLACE_CMD} -e \ + 's|gcc|${CC}| ; \ + s|lib64|lib|' \ + ${WRKSRC}/src/makefile.[lx]* -.include +.include Modified: head/graphics/grx/distinfo ============================================================================== --- head/graphics/grx/distinfo Fri Nov 2 13:11:56 2012 (r306848) +++ head/graphics/grx/distinfo Fri Nov 2 13:16:03 2012 (r306849) @@ -1,2 +1,2 @@ -SHA256 (grx248.tar.gz) = 57e565689b7d0909f61818e9be0dbc14e6bceaa0b996ee84aca7fcb37a6733ed -SIZE (grx248.tar.gz) = 1510074 +SHA256 (grx249.tar.gz) = a899956b3ee46492696114d220431405320c64c1f6f058fdfc2b4d6a2beae786 +SIZE (grx249.tar.gz) = 1514962 Modified: head/graphics/grx/pkg-descr ============================================================================== --- head/graphics/grx/pkg-descr Fri Nov 2 13:11:56 2012 (r306848) +++ head/graphics/grx/pkg-descr Fri Nov 2 13:16:03 2012 (r306849) @@ -1,7 +1,5 @@ -GRX is a 2D graphics library originaly written by Csaba Biegl for DJ Delorie's -DOS port of the GCC compiler. - -Now it support DOS (using the DJGPP v2 compiler), Linux console, X11 and Win32 -(using the Mingw compiler). +GRX is a 2D graphics C library originaly written by Csaba Biegl for +DJ Delorie's DOS port of the GCC compiler. Now it support a big range +of platforms. WWW: http://grx.gnu.de/ Modified: head/graphics/grx/pkg-plist ============================================================================== --- head/graphics/grx/pkg-plist Fri Nov 2 13:11:56 2012 (r306848) +++ head/graphics/grx/pkg-plist Fri Nov 2 13:16:03 2012 (r306849) @@ -8,7 +8,7 @@ include/libbcc.h lib/libgrx20X.a lib/libgrx20X.so lib/libgrx20X.so.2 -lib/libgrx20X.so.2.4.8 +lib/libgrx20X.so.%%VERSION%% %%DATADIR%%/fonts/char11.fnt %%DATADIR%%/fonts/char11b.fnt %%DATADIR%%/fonts/char11bi.fnt