Date: Thu, 1 Nov 2001 10:15:46 +0200 From: Peter Pentchev <roam@ringlet.net> To: Mikhail Teterin <mi@aldan.algebra.com> Cc: ports@FreeBSD.org Subject: Re: cvs commit: ports/graphics/gd Makefile pkg-plist Message-ID: <20011101101545.C77661@straylight.oblivion.bg> In-Reply-To: <200110261649.f9QGnWa79416@aldan.algebra.com>; from mi@aldan.algebra.com on Fri, Oct 26, 2001 at 12:49:29PM -0400 References: <200110261207.f9QC72K56756@freefall.freebsd.org> <200110261649.f9QGnWa79416@aldan.algebra.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Oct 26, 2001 at 12:49:29PM -0400, Mikhail Teterin wrote:
> On 26 Oct, Peter Pentchev wrote:
> > roam 2001/10/26 05:07:02 PDT
> >
> > Modified files:
> > graphics/gd Makefile pkg-plist
> > Log:
> > Install the HTML documentation.
>
[snip]
> But more importantly, please, do the same to gd2, which will eventually
> replace gd...
OK, how about the attached patch? I'm planning to commit it
(with a PORTREVISION bump) along with the NOPROFILE fix that
I'm currently discussing in private with John Hildreth
<partsman@liquidunix.org>.
On second thought, I'm attaching the revised NOPROFILE fix
here, too, for additional eye-balling. I could commit those
in the next day or two, if no objections should arise.
G'luck,
Peter
--
If I had finished this sentence,
Index: ports/graphics/gd2/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/gd2/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- ports/graphics/gd2/Makefile 21 Oct 2001 04:30:31 -0000 1.44
+++ ports/graphics/gd2/Makefile 1 Nov 2001 08:00:06 -0000
@@ -43,7 +43,20 @@
MAKE_ARGS+= $v="${$v}"
.endfor
+DOCS= README-JPEG.TXT alphachanneltest.html antialiased.png \
+ demoin.png index.html readme.jpn readme.txt
+DOCS_TEST= fttest.png gdtest.gd2 gdtest.png gdtest_200_300_150_100.png \
+ gdtest_merge.png gdtest_wbmp_to_png.png
+
post-extract:
bzip2 -d < ${_DISTDIR}/gd_gif_in.c.bz2 > ${WRKSRC}/gd_gif_in.c
+
+.if !defined(NOPORTDOCS)
+post-install:
+ ${MKDIR} ${DOCSDIR}
+ ${MKDIR} ${DOCSDIR}/test
+ ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+ ${INSTALL_DATA} ${DOCS_TEST:S,^,${WRKSRC}/test/,} ${DOCSDIR}/test/
+.endif
.include <bsd.port.mk>
Index: ports/graphics/gd2/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/gd2/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- ports/graphics/gd2/pkg-plist 14 Oct 2001 20:23:23 -0000 1.11
+++ ports/graphics/gd2/pkg-plist 1 Nov 2001 08:03:07 -0000
@@ -14,7 +14,22 @@
include/gd/gdfontmb.h
include/gd/gdfonts.h
include/gd/gdfontt.h
+@dirrm include/gd
lib/libgd.a
lib/libgd.so
lib/libgd.so.3.0
-@dirrm include/gd
+%%PORTDOCS%%share/doc/gd/test/fttest.png
+%%PORTDOCS%%share/doc/gd/test/gdtest.gd2
+%%PORTDOCS%%share/doc/gd/test/gdtest.png
+%%PORTDOCS%%share/doc/gd/test/gdtest_200_300_150_100.png
+%%PORTDOCS%%share/doc/gd/test/gdtest_merge.png
+%%PORTDOCS%%share/doc/gd/test/gdtest_wbmp_to_png.png
+%%PORTDOCS%%share/doc/gd/README-JPEG.TXT
+%%PORTDOCS%%share/doc/gd/alphachanneltest.html
+%%PORTDOCS%%share/doc/gd/antialiased.png
+%%PORTDOCS%%share/doc/gd/demoin.png
+%%PORTDOCS%%share/doc/gd/index.html
+%%PORTDOCS%%share/doc/gd/readme.jpn
+%%PORTDOCS%%share/doc/gd/readme.txt
+%%PORTDOCS%%@dirrm share/doc/gd/test
+%%PORTDOCS%%@dirrm share/doc/gd
Index: ports/graphics/gd2/files/Makefile.bsd
===================================================================
RCS file: /home/ncvs/ports/graphics/gd2/files/Makefile.bsd,v
retrieving revision 1.2
diff -u -r1.2 Makefile.bsd
--- ports/graphics/gd2/files/Makefile.bsd 30 Oct 2001 14:46:42 -0000 1.2
+++ ports/graphics/gd2/files/Makefile.bsd 1 Nov 2001 07:36:03 -0000
@@ -41,7 +41,7 @@
install:
mkdir -p ${PREFIX}/include/gd
- make LIB=${LIB} LIBDIR="${PREFIX}/lib" \
+ make LIB=${LIB} LIBDIR="${PREFIX}/lib" NOPROFILE=true \
SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
-f bsd.lib.mk install
cd ${.CURDIR} && ${INSTALL_DATA} ${INCS} ${PREFIX}/include/gd
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011101101545.C77661>