Date: Fri, 31 May 2013 22:11:06 +0200 From: Kalten <kalten@gmx.at> To: FreeBSD-gnats-submit@FreeBSD.org Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/179116: New port: graphics/xcftools Command-line tools for extracting from Gimp's XCF format Message-ID: <86hahihput.fsf@sbox.tugraz.at> In-Reply-To: <201305301940.r4UJe0Qc039426@freefall.freebsd.org> (FreeBSD-gnats-submit@freebsd.org's message of "Thu, 30 May 2013 19:40:00 GMT") References: <201305301940.r4UJe0Qc039426@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hello!
There is a new version making use of the GitHub Variables
USE_GITHUB, GH_ACCOUNT, GH_TAGNAME and GH_COMMIT (and minor other
changes).
Sadly GH_COMMIT is only used for WRKSRC. If master changes, the
``make patch''-command will break, as it will be extracted to the wrong
directory---so far so good. But downloading the commit with the right
sha already stated in GH_COMMIT would be nice (until now I have not
found out, how to create a download url for a commit id, not a tag).
Note: The xcftools code itself does not honour the --disable-nls switch
of configure, so a WITHOUT_NLS knob (as suggested by ``portlint -A'')
does no good.
Not tested in RedPorts yet as the ``Browse source'' states No Node for
me yet (yes, mail address is already stated as confirmed with the token;
I hope, it will work soon).
So: new shell archive here replacing the old one.
Greetings,
Kalten
>Fix:
--- xcftools_v02.shar begins here ---
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# xcftools
# xcftools/files
# xcftools/files/patch-io-unix.c
# xcftools/files/patch-xcf2png.c
# xcftools/files/patch-Makefile.in
# xcftools/files/patch-test_dotest
# xcftools/Makefile
# xcftools/pkg-plist
# xcftools/pkg-descr
# xcftools/distinfo
#
echo c - xcftools
mkdir -p xcftools > /dev/null 2>&1
echo c - xcftools/files
mkdir -p xcftools/files > /dev/null 2>&1
echo x - xcftools/files/patch-io-unix.c
sed 's/^X//' >xcftools/files/patch-io-unix.c << 'fcaaf551ce2ab243ceb5c1e52188fa43'
X--- io-unix.c.orig 2013-01-31 14:46:20.000000000 +0100
X+++ io-unix.c 2013-05-27 15:00:57.000000000 +0200
X@@ -106,7 +106,7 @@
X if( status > 0 ) {
X fclose(xcfstream) ;
X xcfstream = 0 ;
X- FatalGeneric(status,NULL);
X+ FatalGeneric(status,"status=%d",status);
X }
X } else {
X fclose(xcfstream) ;
fcaaf551ce2ab243ceb5c1e52188fa43
echo x - xcftools/files/patch-xcf2png.c
sed 's/^X//' >xcftools/files/patch-xcf2png.c << 'a42e86a4be326dc4c2286bcbedd62443'
X--- xcf2png.c.orig 2013-01-31 14:46:20.000000000 +0100
X+++ xcf2png.c 2013-05-27 15:09:53.000000000 +0200
X@@ -20,6 +20,13 @@
X #include "flatten.h"
X #include "palette.h"
X #include <png.h>
X+#ifndef png_voidp_NULL
X+#define png_voidp_NULL (png_voidp)NULL
X+#endif
X+#ifndef png_error_ptr_NULL
X+#define png_error_ptr_NULL (png_error_ptr)NULL
X+#endif
X+
X #include <stdlib.h>
X #include <string.h>
X #include <locale.h>
a42e86a4be326dc4c2286bcbedd62443
echo x - xcftools/files/patch-Makefile.in
sed 's/^X//' >xcftools/files/patch-Makefile.in << '4287e599f7eaa953e11b89356cbd2e05'
X--- Makefile.in.orig 2013-01-31 14:46:20.000000000 +0100
X+++ Makefile.in 2013-05-30 19:58:00.000000000 +0200
X@@ -36,6 +36,7 @@
X
X INSTALL = @INSTALL@ -D
X INSTALL_PROGRAM = @INSTALL_PROGRAM@
X+INSTALL_SCRIPT = @INSTALL_SCRIPT@
X INSTALL_DATA = @INSTALL_DATA@
X
X RM = rm -f
X@@ -89,8 +90,8 @@
X
X install: all
X for p in $(BINARIES) ; do \
X- case $$p in xcfview) strip= ;; *) strip=-s ;; esac ; \
X- $(INSTALL_PROGRAM) $$strip $$p \
X+ case $$p in xcfview) installer="$(INSTALL_SCRIPT)"; strip= ;; *) installer="$(INSTALL_PROGRAM)"; strip=-s ;; esac ; \
X+ $$installer $$strip $$p \
X $(DESTDIR)$(bindir)/`echo $$p | $(SED) $(program_transform_name)` \
X || exit 1 ;\
X done
X@@ -163,7 +164,7 @@
X msgfmt -c -o$@ $<
X
X po/stamp: $(patsubst %,po/%.mo,$(LINGUAS))
X- if ! make -q po/$(APPNAME).pot ; then \
X+ if ! $(MAKE) -q po/$(APPNAME).pot ; then \
X touch po/$(APPNAME).pot ; touch po/*.po ; touch po/*.mo ; fi
X touch $@
X
X@@ -187,7 +188,7 @@
X touch $@
X
X manpo/stamp: $(patsubst %,manpo/%.po,$(MANLINGUAS))
X- if ! make -q manpo/manpages.pot ; then \
X+ if ! $(MAKE) -q manpo/manpages.pot ; then \
X touch manpo/manpages.pot ; touch $^ ; fi
X touch $@
X
4287e599f7eaa953e11b89356cbd2e05
echo x - xcftools/files/patch-test_dotest
sed 's/^X//' >xcftools/files/patch-test_dotest << '5945542d9aa847ec450a557141f9ade0'
X--- test/dotest.orig 2013-01-31 14:46:20.000000000 +0100
X+++ test/dotest 2013-05-27 15:34:37.000000000 +0200
X@@ -1,4 +1,4 @@
X-#! /bin/bash
X+#!/usr/local/bin/bash
X
X # Regression test for Xcftools
X #
5945542d9aa847ec450a557141f9ade0
echo x - xcftools/Makefile
sed 's/^X//' >xcftools/Makefile << 'f2c575185295cfe5398ef7652fdf85f1'
X# $FreeBSD$
X
XPORTNAME= xcftools
XPORTVERSION= 0.0
XCATEGORIES= graphics
X
XMAINTAINER= kalten@gmx.at
XCOMMENT= Command-line tools for extracting from Gimp's XCF format
X
XUSE_GITHUB= yes
XGH_ACCOUNT= j-jorge
XGH_TAGNAME= master
XGH_COMMIT= 2c4d3fc
X
XDIST_SUBDIR= ${PORTNAME}
X
XUSE_PERL5= yes
XUSE_PKGCONFIG= yes
XUSE_AUTOTOOLS+= libtool
XGNU_CONFIGURE= yes
XCONFIGURE_ARGS=
XUSE_GMAKE= yes
XMAKE_JOBS_SAFE= no
XUSE_LDCONFIG= yes
XUSE_GETTEXT= yes
X
XOPTIONS_DEFINE= TESTS
XTESTS_DESC= Run bundled self-tests after build (pulls in graphics/netpbm)
XOPTIONS_DEFAULT=
X
X.include <bsd.port.options.mk>
X
X.if ${PORT_OPTIONS:MTESTS}
XBUILD_DEPENDS+= pngtopnm:${PORTSDIR}/graphics/netpbm
X.endif
X
XMAN1= xcf2png.1 xcf2pnm.1 xcfinfo.1 xcfview.1
XMAN1_DA= xcf2png.1 xcf2pnm.1 xcfinfo.1 xcfview.1
X
XCFLAGS+= -I${LOCALBASE}/include
XCPPFLAGS+= -I${LOCALBASE}/include
XLDFLAGS+= -L${LOCALBASE}/lib -lintl
X
X.include <bsd.port.pre.mk>
X
Xtest check:
X.if (${PORT_OPTIONS:MTESTS} || defined(PACKAGE_BUILDING))
X -cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${GMAKE} check
X.endif
X
Xpost-build: check
X
X.include <bsd.port.post.mk>
f2c575185295cfe5398ef7652fdf85f1
echo x - xcftools/pkg-plist
sed 's/^X//' >xcftools/pkg-plist << 'a9508632c813f30af60acf6e7bdf9697'
Xbin/xcf2png
Xbin/xcf2pnm
Xbin/xcfinfo
Xbin/xcfview
Xshare/locale/da/LC_MESSAGES/xcftools.mo
X@dirrmtry man/da/man1
X@dirrmtry man/da
a9508632c813f30af60acf6e7bdf9697
echo x - xcftools/pkg-descr
sed 's/^X//' >xcftools/pkg-descr << 'e7b9d91acff8b3670976296a981c7359'
XXcftools is a set of fast command-line tools for extracting
Xinformation from the Gimp's native file format XCF. The tools
Xare designed to allow efficient use of layered XCF files as
Xsources in a build system that use 'make' and similar tools
Xto manage automatic processing of the graphics. These tools
Xwork independently of the Gimp engine and do not require the
XGimp to even be installed.
X
XWWW: https://github.com/j-jorge/xcftools
e7b9d91acff8b3670976296a981c7359
echo x - xcftools/distinfo
sed 's/^X//' >xcftools/distinfo << '17c2317948a4c2980d1b7557f835925b'
XSHA256 (xcftools/xcftools-0.0.tar.gz) = 94cd21c0e2c5c293042913e3f106a2a875af8edc4d15e2b2ea7d8ae5697cc56f
XSIZE (xcftools/xcftools-0.0.tar.gz) = 275527
17c2317948a4c2980d1b7557f835925b
exit
--- xcftools_v02.shar ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86hahihput.fsf>