From owner-freebsd-ports Fri Nov 2 3:21:11 2001 Delivered-To: freebsd-ports@freebsd.org Received: from straylight.ringlet.net (sentinel.office1.bg [217.75.134.126]) by hub.freebsd.org (Postfix) with SMTP id ED2D137B401 for ; Fri, 2 Nov 2001 03:21:03 -0800 (PST) Received: (qmail 1634 invoked by uid 1000); 2 Nov 2001 09:44:52 -0000 Date: Fri, 2 Nov 2001 11:44:52 +0200 From: Peter Pentchev To: Mikhail Teterin Cc: ports@FreeBSD.org Subject: Re: cvs commit: ports/graphics/gd Makefile pkg-plist Message-ID: <20011102114451.A75362@straylight.oblivion.bg> Mail-Followup-To: Mikhail Teterin , ports@FreeBSD.org References: <20011101101545.C77661@straylight.oblivion.bg> <200111012311.fA1NApW98407@aldan.algebra.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200111012311.fA1NApW98407@aldan.algebra.com>; from mi@aldan.algebra.com on Thu, Nov 01, 2001 at 06:10:48PM -0500 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org On Thu, Nov 01, 2001 at 06:10:48PM -0500, Mikhail Teterin wrote: > On 1 Nov, Peter Pentchev wrote: > > +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 > > Unless the test images are referenced from the documentation, I'd oppose > installing them. If you can make a sensible test-target, however, that > would be great, IMO. I could work on a test target in the next few days; in the meantime, attached is a patch that installs only the docs themselves, without the test files. Thanks for pointing out that those files are not docs themselves, but part of a test routine :) > --- 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 > > Mmm, ok... BTW, may be, we should install the include files into > ${LOCALBASE}/include directly? All of the names starts with gd anyway -- > let's do that for the sake of hier(7) :-) Would this not break applications that expect to be able to include "gd/*.h"? I don't think it makes sense to introduce tons of patches to every such application under the sun, when it is perfectly acceptable IMHO for a library to differentiate its include files from the rest.. [snip] > Yep, this is right -- I have NOPROFILE in /etc/make.conf, so I've never > noticed this myself :| Thanks! OK, I committed this part today. BTW, is gd2's API incompatible with that of gd? If so, what do we do about PR ports/31699, which points out that some of those ports' files conflict in a bad way? :) G'luck, Peter -- You have, of course, just begun reading the sentence that you have just finished reading. 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 2 Nov 2001 09:34:11 -0000 @@ -43,7 +43,16 @@ MAKE_ARGS+= $v="${$v}" .endfor +DOCS= README-JPEG.TXT alphachanneltest.html antialiased.png \ + demoin.png index.html readme.jpn readme.txt + post-extract: bzip2 -d < ${_DISTDIR}/gd_gif_in.c.bz2 > ${WRKSRC}/gd_gif_in.c + +.if !defined(NOPORTDOCS) +post-install: + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ +.endif .include 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 2 Nov 2001 09:41:41 -0000 @@ -14,7 +14,15 @@ 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/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 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message