From nobody Fri Jul 8 08:23:56 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6EB963E1460; Fri, 8 Jul 2022 08:23:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LfRBh26Llz3tWj; Fri, 8 Jul 2022 08:23:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657268636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IwBevenRX4qaiJT8cWXt3aW5r6wlNZMLJT6A8rEJvcw=; b=UmO+wo8qC1IwSdt3AGiefdLZBJj868vHcHq6VcbraMGbMApfh+/LEF7qvnBxLw/M+0oLoU 5T4ZIMhbEkFws77eO4piyDbFOkbxMkp5tDuXQWc/VJ4PPQdVLw9ROnBltCfpdmUF9jV51t pF0KXtKiPPv1H6GXQEVQPwXn4afnoNjbf6qSfuRPVOO8ftvqqmSkH0FLH7nLHTNhW0rdRR HpWoJ25/Pb+efIKko/IB6xlYjASkYQemTWrMHFfRsT530El+ibJOv6LvdI18FdIBL/vD7l 6f5PigDvKFjCkoG0geftH348aG91BlO0mZePQlVEPZOdeBRV6lLFH8NqfKbC8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LfRBh190zz1Dld; Fri, 8 Jul 2022 08:23:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2688NuNj004748; Fri, 8 Jul 2022 08:23:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2688NuwT004747; Fri, 8 Jul 2022 08:23:56 GMT (envelope-from git) Date: Fri, 8 Jul 2022 08:23:56 GMT Message-Id: <202207080823.2688NuwT004747@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: d608f8c71624 - main - graphics/lua-gd: the port had been updated and improved (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d608f8c71624f61904fc4660b293de3de3d02d1b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657268636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IwBevenRX4qaiJT8cWXt3aW5r6wlNZMLJT6A8rEJvcw=; b=Zl9tStAZ/Tq96mg7xOyszwGPor47eQZiS+IKIPY2AMOhqpSfBUCMT+9g4vfqLrfpxaD+EY TnGimq4OOerULIsRl696CmwK052G4OkMB9RA+0be1zh0vVdpnTEI9f9Ar/bOCcriDk9zdl XmAe5Pnxp1iAKT9s/TbHl+H322bmJSimnBgUVbu+A5AdHL4YBKQwy1jIKhwh23tmcUdkQq QXW0uqumO0hsZGFOAX/DYwgodqi6CY4b/jAuZAojd3WrwvnELrnnZRYPHwktoIvFQJ98ec DvNTKdh8fWyLgtEr+v+u+tMvVcSamMmrnTLQmPkhBS2+zS7yiVK8bmPM6g/Ctw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657268636; a=rsa-sha256; cv=none; b=wmgwSW+R/E+A+XkjIvicHsW72A/3Vpk5in6uOY/4sNHva28n20W32cudkU4bTLAIzRaWWJ 69DUfVQuUw184q9DqP+rq2++5lb4GZ6uOJd9ipka8Fxmi2FTnLt5PVeRY9xv0SWtySTlZr fS03UCbBcxU0LXtxEixMaCUWil0RWtg4ZbveSB80QqeXmpO3WfUc4/o4J9iw3fibYhzPoH P6YdH6bkUllAabDibZykb1bg11cvPIXMLM1ziUY0bdvnr3O3FarTuq1BnnXpiwjymMDtkl RD/62Dwwr34Aa8tZYsxQUD9Jq3gouBA6XZghQ1tBo2MNhSjhU+oO2kuQxK8fsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=d608f8c71624f61904fc4660b293de3de3d02d1b commit d608f8c71624f61904fc4660b293de3de3d02d1b Author: Alexey Dokuchaev AuthorDate: 2022-07-08 08:22:24 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-07-08 08:22:24 +0000 graphics/lua-gd: the port had been updated and improved (+) - Update the version 2.0.33r3 (it's not tagged yet, but that's what written inside their Makefile) and unrestrict from the particular version of Lua (now we need to set PKGNAMEPREFIX) - Simplify building: drop hand-rolled `do-build' target plus associated bits and use upstream routine, slightly adjusted - Development now happens at GitHub, update MASTER_SITES and the WWW line in the port description accordingly - Convert to option helpers and optimize some target recipes PR: 253811 --- graphics/lua-gd/Makefile | 42 +++++++++++------------------------- graphics/lua-gd/distinfo | 5 +++-- graphics/lua-gd/files/patch-Makefile | 18 ++++++++++++++++ graphics/lua-gd/pkg-descr | 2 +- graphics/lua-gd/pkg-plist | 7 +++--- 5 files changed, 38 insertions(+), 36 deletions(-) diff --git a/graphics/lua-gd/Makefile b/graphics/lua-gd/Makefile index eb7b70a9407e..3196dfb82cb6 100644 --- a/graphics/lua-gd/Makefile +++ b/graphics/lua-gd/Makefile @@ -1,10 +1,9 @@ # Created by: Sergey V. Dyatko PORTNAME= lua-gd -PORTVERSION= 2.0.33r2 -PORTREVISION= 5 +PORTVERSION= 2.0.33r3 CATEGORIES= graphics -MASTER_SITES= http://files.luaforge.net/releases/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}forLua5.1/ +PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} MAINTAINER= sergey.dyatko@gmail.com COMMENT= GD bindings for the Lua programming language @@ -13,42 +12,27 @@ LICENSE= MIT LIB_DEPENDS= libgd.so:graphics/gd -OPTIONS_DEFINE= DOCS EXAMPLES - -USES= lua:51,module -CFLAGS+= -I${LUA_INCDIR} -I${LOCALBASE}/include -LDFLAGS+= -shared -L${LOCALBASE}/lib -lgd -L${LUA_LIBDIR} -llua-${LUA_VER} -lm -GDFEATURES= `gdlib-config --features |sed -e "s/GD_/-DGD_/g"` +USES= lua:module pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= ittner +GH_TAGNAME= 2ce8e47 +MAKE_ARGS= LUABIN=${LUA_CMD} LUAPKG=lua-${LUA_VER} DOCSDIR= ${LUA_DOCSDIR} EXAMPLESDIR= ${LUA_EXAMPLESDIR} -.include - -CFLAGS_aarch64= -fPIC -CFLAGS_amd64= -fPIC -CFLAGS_armv7= -fPIC -CFLAGS_i386= -fPIC -CFLAGS_powerpc= -fPIC -CFLAGS_riscv64= -fPIC - -do-build: - ${CC} -o ${WRKSRC}/gd.so ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${GDFEATURES} ${WRKSRC}/luagd.c +OPTIONS_DEFINE= DOCS EXAMPLES do-install: ${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} ${INSTALL_PROGRAM} ${WRKSRC}/gd.so ${STAGEDIR}${LUA_MODLIBDIR} - ${SETENV} LUA_CPATH=${STAGEDIR}${LUA_MODLIBDIR}/?.so ${LUA_CMD} ${WRKSRC}/test_features.lua -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc/ && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/ - @${ECHO_MSG} "===> Documentation installed in ${STAGEDIR}${DOCSDIR}" -.endif + ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} -.if ${PORT_OPTIONS:MEXAMPLES} +do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/demos && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR} - @${ECHO_MSG} "===> Examples installed in ${STAGEDIR}${EXAMPLESDIR}" -.endif + ${INSTALL_DATA} ${WRKSRC}/demos/* ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/graphics/lua-gd/distinfo b/graphics/lua-gd/distinfo index 057bd33460c1..01da262576d5 100644 --- a/graphics/lua-gd/distinfo +++ b/graphics/lua-gd/distinfo @@ -1,2 +1,3 @@ -SHA256 (lua-gd-2.0.33r2.tar.gz) = 235eceba9b55fd6b6cb6d88b0df676d6f94ff49155a0710363c21e2cc0987ec6 -SIZE (lua-gd-2.0.33r2.tar.gz) = 448606 +TIMESTAMP = 1582425200 +SHA256 (ittner-lua-gd-2.0.33r3-2ce8e47_GH0.tar.gz) = cc0b17efff44f0b715a17da3c0a3d8238f1354fb41315b4c231ed0f40f3de2b6 +SIZE (ittner-lua-gd-2.0.33r3-2ce8e47_GH0.tar.gz) = 436980 diff --git a/graphics/lua-gd/files/patch-Makefile b/graphics/lua-gd/files/patch-Makefile new file mode 100644 index 000000000000..d5c08e3a9333 --- /dev/null +++ b/graphics/lua-gd/files/patch-Makefile @@ -0,0 +1,18 @@ +--- Makefile.orig 2020-02-23 02:33:20 UTC ++++ Makefile +@@ -44,12 +44,12 @@ OUTFILE=gd.so + LUAPKG=lua5.1 + OUTFILE=gd.so + +-CFLAGS=-O3 -Wall -fPIC $(OMITFP) +-CFLAGS+=`pkg-config $(LUAPKG) --cflags` ++CFLAGS+=-Wall -fPIC # $(OMITFP) ++CFLAGS+=`pkg-config $(LUAPKG) gdlib --cflags` + CFLAGS+=-DVERSION=\"$(VERSION)\" + + GDFEATURES=-DGD_XPM -DGD_JPEG -DGD_FONTCONFIG -DGD_FREETYPE -DGD_PNG -DGD_GIF +-LFLAGS=-shared `pkg-config $(LUAPKG) --libs` -lgd ++LFLAGS=-shared `pkg-config $(LUAPKG) gdlib --libs` + + INSTALL_PATH := `pkg-config $(LUAPKG) --variable=INSTALL_CMOD` + diff --git a/graphics/lua-gd/pkg-descr b/graphics/lua-gd/pkg-descr index 03e2411a0273..92fc4cf874e9 100644 --- a/graphics/lua-gd/pkg-descr +++ b/graphics/lua-gd/pkg-descr @@ -1,4 +1,4 @@ Lua-GD is a library that allows you to use the gd graphic library from programs written in the Lua programming language. -WWW: http://lua-gd.luaforge.net/ +WWW: https://www.ittner.com.br/lua-gd/ diff --git a/graphics/lua-gd/pkg-plist b/graphics/lua-gd/pkg-plist index 3159acd3c9d6..8f8de8b4263f 100644 --- a/graphics/lua-gd/pkg-plist +++ b/graphics/lua-gd/pkg-plist @@ -14,20 +14,20 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bugs.jpg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circle.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clock.lua +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colortransparent.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter.lua -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ellipse.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fontconfig.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fractal.lua +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gd-open-any.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gifanim.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gifanim2.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gifanim3.lua -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grid.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lua-gd.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lualogo.lua -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lualogo.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/paper.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/poly.lua +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/setstyle.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stdfont.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/steg.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.lua @@ -35,4 +35,3 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ttftext.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ttftextex.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/utf-8.lua -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/utf-8.png