NetBSD Problem Report #30318
From www@netbsd.org Tue May 24 08:22:34 2005
Return-Path: <www@netbsd.org>
Received: by narn.netbsd.org (Postfix, from userid 31301)
id C478763B104; Tue, 24 May 2005 08:22:34 +0000 (UTC)
Message-Id: <20050524082234.C478763B104@narn.netbsd.org>
Date: Tue, 24 May 2005 08:22:34 +0000 (UTC)
From: Leonard Schmidt <lems@gmx.net>
Reply-To: lems@gmx.net
To: gnats-bugs@netbsd.org
Subject: Split up graphics/libcaca
X-Send-Pr-Version: www-1.0
>Number: 30318
>Category: pkg
>Synopsis: Split up graphics/libcaca
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: wiz
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Tue May 24 08:23:00 +0000 2005
>Closed-Date: Fri Jul 29 13:29:56 +0000 2005
>Last-Modified: Fri Jul 29 13:29:56 +0000 2005
>Originator: lems@gmx.net
>Release: NetBSD 2.0.2
>Organization:
>Environment:
NetBSD kafka 2.0.2 NetBSD 2.0.2 (THEWIRED) #0: Mon May 23 20:58:18 GMT 2005 lems@kafka:/usr/src/sys/arch/i386/compile/THEWIRED i386
>Description:
I split up graphics/libcaca, resulting in graphics/libcaca and graphics/libcaca-x11, since this is also done for graphics/aalib.
I used audio/aumix as an example. The buildlink3.mk files were created using createbuildlink(8).
>How-To-Repeat:
>Fix:
http://tollpatch.de/code/pkgsrc/libcaca.tgz
http://tollpatch.de/code/pkgsrc/libcaca-x11.tgz
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: pkg-manager->wiz
Responsible-Changed-By: wiz@netbsd.org
Responsible-Changed-When: Tue, 24 May 2005 17:13:17 +0000
Responsible-Changed-Why:
Over to maintainer.
From: Leonard Schmidt <lems@gmx.net>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/30318: Split up graphics/libcaca
Date: Sun, 17 Jul 2005 20:11:30 +0000
--3siQDZowHQqNOShm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Updated patches are at:
http://tollpatch.de/code/pkgsrc/libcaca-x11.diff
http://tollpatch.de/code/pkgsrc/libcaca_split.diff
Leonard
--3siQDZowHQqNOShm
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (NetBSD)
iD8DBQFC2rtyeffumNo0U88RAh0WAJ41yPXkJk9O3dU+rtC3UmcbdA3FYACbBVVI
ZfWC3TmQTeI2RyhGwd/ptQA=
=g/LR
-----END PGP SIGNATURE-----
--3siQDZowHQqNOShm--
From: Thomas Klausner <wiz@netbsd.org>
To: Leonard Schmidt <lems@gmx.net>
Cc: gnats-bugs@NetBSD.org
Subject: Re: pkg/30318: Split up graphics/libcaca
Date: Thu, 21 Jul 2005 16:23:59 +0200
On Sun, Jul 17, 2005 at 06:09:04PM +0000, Leonard Schmidt wrote:
> Updated patches are at:
> http://tollpatch.de/code/pkgsrc/libcaca-x11.diff
> http://tollpatch.de/code/pkgsrc/libcaca_split.diff
Thanks for the patches, I (finally) took a look at them.
One change:
Moving the CONFIGURE_ARGS+=--disable-x11 to libcaca/Makefile
is better than having it in Makefile.common and removing
it again in libcaca-x11/Makefile.
What is the plan on how to use this package in pkgsrc? Currently
one can only have libcaca installed, since a package has to include
one or the other's buildlink3.mk file and thus it's not even the
user's choice which to use (except if we make it an option in every
package). That doesn't look like the best possible way to me.
I think aalib has the same problem.
Suggestions?
Thomas
From: Leonard Schmidt <lems@gmx.net>
To: Thomas Klausner <wiz@netbsd.org>
Cc: gnats-bugs@NetBSD.org
Subject: Re: pkg/30318: Split up graphics/libcaca
Date: Thu, 21 Jul 2005 17:57:11 +0000
--sdtB3X0nJg68CQEu
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Thu, Jul 21, 2005 at 04:23:59PM +0200, Thomas Klausner wrote:
> What is the plan on how to use this package in pkgsrc?
I split it up for use with MPlayer (so it does not only play in a
terminal). I thought I'd better share the changes in case any other
person would like to have this, too.
Cheers!
Leonard
--sdtB3X0nJg68CQEu
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (NetBSD)
iD8DBQFC3+H2effumNo0U88RAqYhAJ4g9ARkd9guPX2u6h93HkqJE/+GHgCffRzc
r5rR9i4BMoaHXnt/8IolwWk=
=k+3N
-----END PGP SIGNATURE-----
--sdtB3X0nJg68CQEu--
From: Thomas Klausner <wiz@netbsd.org>
To: Leonard Schmidt <lems@gmx.net>
Cc: gnats-bugs@NetBSD.org
Subject: Re: pkg/30318: Split up graphics/libcaca
Date: Thu, 21 Jul 2005 22:43:08 +0200
Actually, I think an option for x11 support would be
good (same for the aalib package), since the two packages
can't really coexist anyway, and this way, you can
decide per installation if you want x11 support or not.
Do you want to provide patches for that? Should be easy.
Thomas
From: Leonard Schmidt <lems@gmx.net>
To: Thomas Klausner <wiz@netbsd.org>
Cc: gnats-bugs@NetBSD.org
Subject: Re: pkg/30318: Split up graphics/libcaca
Date: Fri, 22 Jul 2005 02:10:31 +0000
--/NkBOFFp2J2Af1nK
Content-Type: multipart/mixed; boundary="qMm9M+Fa2AknHoGS"
Content-Disposition: inline
--qMm9M+Fa2AknHoGS
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Thu, Jul 21, 2005 at 10:43:08PM +0200, Thomas Klausner wrote:
> Actually, I think an option for x11 support would be
> good (same for the aalib package), since the two packages
> can't really coexist anyway, and this way, you can
> decide per installation if you want x11 support or not.
I fully agree.
> Do you want to provide patches for that? Should be easy.
I have attached two patches. Do not know if they are "good". I had
problems with (n)curses. For libcaca, I added an option to disable and
enable it. However, if one disables ncurses, libcaca does not build
because of no selected output drivers (PKG_OPTIONS.libcaca+=3D-ncurses=20
and nothing else).
Leonard
--qMm9M+Fa2AknHoGS
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="aalib_options-framework-conversion.diff"
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/aalib/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 11 Apr 2005 21:46:00 -0000 1.15
+++ Makefile 22 Jul 2005 00:03:57 -0000
@@ -1,12 +1,34 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/03/29 14:28:05 wiz Exp $
=20
-PKGNAME=3D aalib-${BASE_VERS}
-CONFLICTS+=3D aalib-x11<=3D1.4.0.4
+DISTNAME=3D aalib-1.4rc5
+PKGNAME=3D ${DISTNAME:S/rc5/.0.5/}
+CATEGORIES=3D graphics x11
+MASTER_SITES+=3D ${MASTER_SITE_SOURCEFORGE:=3Daa-project/}
=20
+MAINTAINER?=3D manu@NetBSD.org
+HOMEPAGE=3D http://aa-project.sourceforge.net/aalib/
COMMENT=3D ASCII Art library
=20
-CONFIGURE_ARGS+=3D --with-x11-driver=3Dno
+PKG_INSTALLATION_TYPES=3D overwrite pkgviews
+
+WRKSRC=3D ${WRKDIR}/aalib-1.4.0
+GNU_CONFIGURE=3D YES
+USE_LIBTOOL=3D YES
+
+.include "options.mk"
=20
INFO_FILES=3D aalib.info
=20
-.include "Makefile.common"
+.if ${MACHINE_ARCH} =3D=3D "arm" || ${MACHINE_ARCH} =3D=3D "arm32"
+GCC_REQD+=3D 2.95.3
+.endif
+
+.if !target(post-patch)
+post-patch:
+ @for f in `${FIND} ${WRKSRC} -name '*.[ch]' -print`; do \
+ ${SED} -e "s|<malloc.h>|<stdlib.h>|g" $$f > $$f.patch \
+ && ${MV} $$f.patch $$f; \
+ done
+.endif
+
+.include "../../mk/bsd.pkg.mk"
--- /dev/null 2005-07-22 02:04:04.000000000 +0000
+++ options.mk 2005-07-22 02:07:05.000000000 +0000
@@ -0,0 +1,28 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=3D PKG_OPTIONS.aalib
+PKG_SUPPORTED_OPTIONS=3D ncurses slang x11
+PKG_SUGGESTED_OPTIONS=3D ncurses
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mncurses)
+. include "../../devel/ncurses/buildlink3.mk"
+CONFIGURE_ARGS+=3D --with-curses-driver=3Dyes
+.else
+CONFIGURE_ARGS+=3D --with-curses-driver=3Dno
+.endif
+
+.if !empty(PKG_OPTIONS:Mslang)
+. include "../../devel/libslang/buildlink3.mk"
+CONFIGURE_ARGS+=3D --with-slang-driver=3Dyes
+.else
+CONFIGURE_ARGS+=3D --with-slang-driver=3Dno
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+. include "../../mk/x11.buildlink3.mk"
+CONFIGURE_ARGS+=3D --with-x11-driver=3Dyes
+.else
+CONFIGURE_ARGS+=3D --with-x11-driver=3Dno
+.endif
--qMm9M+Fa2AknHoGS
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="libcaca_options-framework-conversion.diff"
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/libcaca/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 11 Apr 2005 21:46:05 -0000 1.9
+++ Makefile 21 Jul 2005 23:03:28 -0000
@@ -16,7 +16,9 @@
GNU_CONFIGURE=3D yes
INCOMPAT_CURSES=3D NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-Q]-*
=20
-CONFIGURE_ARGS+=3D --disable-slang --enable-ncurses --disable-imlib2 --dis=
able-doc
+.include "options.mk"
+
+CONFIGURE_ARGS+=3D --disable-doc
=20
.include "../../mk/bsd.prefs.mk"
=20
--- /dev/null 2005-07-22 00:53:24.000000000 +0000
+++ options.mk 2005-07-22 01:04:38.000000000 +0000
@@ -0,0 +1,37 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=3D PKG_OPTIONS.libcaca
+PKG_SUPPORTED_OPTIONS=3D imlib2 ncurses slang x11
+PKG_SUGGESTED_OPTIONS=3D ncurses
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mimlib2)
+. include "../../graphics/imlib2/buildlink3.mk"
+. include "../../mk/x11.buildlink3.mk"
+CONFIGURE_ARGS+=3D --enable-imlib2
+CONFIGURE_ARGS+=3D --enable-x11
+.else
+CONFIGURE_ARGS+=3D --disable-imlib2
+.endif
+
+.if !empty(PKG_OPTIONS:Mncurses)
+. include "../../devel/ncurses/buildlink3.mk"
+CONFIGURE_ARGS+=3D --enable-ncurses
+.else
+CONFIGURE_ARGS+=3D --disable-ncurses
+.endif
+
+.if !empty(PKG_OPTIONS:Mslang)
+. include "../../devel/libslang/buildlink3.mk"
+CONFIGURE_ARGS+=3D --enable-slang
+.else
+CONFIGURE_ARGS+=3D --disable-slang
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+. include "../../mk/x11.buildlink3.mk"
+CONFIGURE_ARGS+=3D --enable-x11
+.else
+CONFIGURE_ARGS+=3D --disable-x11
+.endif
--qMm9M+Fa2AknHoGS--
--/NkBOFFp2J2Af1nK
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (NetBSD)
iD8DBQFC4FWXeffumNo0U88RAneUAJ9CaOZfZ13nW9vnkDg83J0FfBNBgQCgju6z
VglNn8T7jKJzyjbM3e28U10=
=dbVH
-----END PGP SIGNATURE-----
--/NkBOFFp2J2Af1nK--
From: Thomas Klausner <wiz@netbsd.org>
To: Leonard Schmidt <lems@gmx.net>
Cc: gnats-bugs@NetBSD.org
Subject: Re: pkg/30318: Split up graphics/libcaca
Date: Fri, 22 Jul 2005 02:24:07 +0200
On Fri, Jul 22, 2005 at 02:10:31AM +0000, Leonard Schmidt wrote:
> I have attached two patches. Do not know if they are "good". I had
> problems with (n)curses. For libcaca, I added an option to disable and
> enable it. However, if one disables ncurses, libcaca does not build
> because of no selected output drivers (PKG_OPTIONS.libcaca+=-ncurses
> and nothing else).
Take a look at PKG_OPTIONS_REQUIRED_GROUPS (mk/bsd.options.mk).
Thomas
From: Leonard Schmidt <lems@gmx.net>
To: Thomas Klausner <wiz@netbsd.org>
Cc: gnats-bugs@NetBSD.org
Subject: Re: pkg/30318: Split up graphics/libcaca
Date: Fri, 22 Jul 2005 11:56:31 +0000
--+HP7ph2BbKc20aGI
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Fri, Jul 22, 2005 at 02:24:07AM +0200, Thomas Klausner wrote:
> Take a look at PKG_OPTIONS_REQUIRED_GROUPS (mk/bsd.options.mk).
Thanks! Exactly what I was looking for.
An updated libcaca patch is here:
http://tollpatch.de/code/pkgsrc/libcaca_options-framework-conversion.diff
I also added an caca entry to mk/defaults/options.description (and
changed the aalib one):
http://tollpatch.de/code/pkgsrc/options.description_aalib_and_libcaca.diff
Though: Should it be Ascii (or ASCII) Art, indicating that `aa' is an=20
abbreviation for ASCII art or ASCII art? (Same with libcaca).
Regards,
Leonard
--+HP7ph2BbKc20aGI
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (NetBSD)
iD8DBQFC4N7veffumNo0U88RAgsTAJ9d4H9ACxgGX6Irda0l/YVHl6GGKgCfZTFX
iIN52PpFukFayCtQY1qP9Bc=
=rQM1
-----END PGP SIGNATURE-----
--+HP7ph2BbKc20aGI--
From: Thomas Klausner <wiz@netbsd.org>
To: Leonard Schmidt <lems@gmx.net>
Cc: gnats-bugs@NetBSD.org
Subject: Re: pkg/30318: Split up graphics/libcaca
Date: Thu, 28 Jul 2005 02:30:18 +0200
On Fri, Jul 22, 2005 at 11:56:31AM +0000, Leonard Schmidt wrote:
> On Fri, Jul 22, 2005 at 02:24:07AM +0200, Thomas Klausner wrote:
> > Take a look at PKG_OPTIONS_REQUIRED_GROUPS (mk/bsd.options.mk).
>
> Thanks! Exactly what I was looking for.
>
> An updated libcaca patch is here:
> http://tollpatch.de/code/pkgsrc/libcaca_options-framework-conversion.diff
>
> I also added an caca entry to mk/defaults/options.description (and
> changed the aalib one):
> http://tollpatch.de/code/pkgsrc/options.description_aalib_and_libcaca.diff
dillo implemented PKG_OPTIONS_NONEMPTY_SETS, which are an even
better match for what we want: We need at least one backend, but
more than one is ok too. Are you willing to provide one more patch?
Otherwise I'll adapt your latest one.
> Though: Should it be Ascii (or ASCII) Art, indicating that `aa' is an
> abbreviation for ASCII art or ASCII art? (Same with libcaca).
What do you mean?
Thomas
From: Leonard Schmidt <lems@gmx.net>
To: Thomas Klausner <wiz@netbsd.org>
Cc: gnats-bugs@NetBSD.org
Subject: Re: pkg/30318: Split up graphics/libcaca
Date: Thu, 28 Jul 2005 14:08:50 +0000
--3MwIy2ne0vdjdPXF
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Thu, Jul 28, 2005 at 02:30:18AM +0200, Thomas Klausner wrote:
> dillo implemented PKG_OPTIONS_NONEMPTY_SETS, which are an even
> better match for what we want: We need at least one backend, but
> more than one is ok too. Are you willing to provide one more patch?
> Otherwise I'll adapt your latest one.
Um, I am afraid I do not know how to use PKG_OPTIONS_NONEMPTY_SETS; I
added=20
PKG_OPTIONS_NONEMPTY_SETS=3D driver
PKG_OPTIONS_SET.driver=3D ncurses slang x11
PKG_OPTIONS.libcaca=3D ncurses
`make show-options' shows me this:
Any of the following general options may be selected:
imlib2 Use imlib2 as imaging library.
At least one of the following driver options must be selected:
ncurses
slang
x11
These options are enabled by default:
These options are currently enabled: ncurses
But when trying to build, I get this:
=3D=3D=3D> At least one of the following options must be selected: ncurses =
slang x11
*** Error code 1
ncurses is enabled, so it should build, no?
I looked for examples, but only found regress/pkg-options/files/sets.mk.
I really do not want to waste your time, but right now I am kind of
stuck.
> > Though: Should it be Ascii (or ASCII) Art, indicating that `aa' is an=
=20
> > abbreviation for ASCII art or ASCII art? (Same with libcaca).
>=20
> What do you mean?
I mean the mk/defaults/options.description file. At the moment,
aalib's comment says to enable "aalib" support. Wouldn't something
like "ASCII art library" be better?
Regards,
Leonard
--3MwIy2ne0vdjdPXF
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (NetBSD)
iD8DBQFC6ObyeffumNo0U88RAr6uAJ4pmaXTRSRLYGd4uCr/oHUcuPX/BwCfdjgR
7jwgtHtogdbPYttjys5HCDk=
=ecNv
-----END PGP SIGNATURE-----
--3MwIy2ne0vdjdPXF--
From: Thomas Klausner <wiz@netbsd.org>
To: gnats-bugs@netbsd.org
Cc:
Subject: PR/30318 CVS commit: pkgsrc/graphics/libcaca
Date: Thu, 28 Jul 2005 19:21:02 +0000 (UTC)
Module Name: pkgsrc
Committed By: wiz
Date: Thu Jul 28 19:21:02 UTC 2005
Modified Files:
pkgsrc/graphics/libcaca: Makefile
Added Files:
pkgsrc/graphics/libcaca: options.mk
Log Message:
Convert to options framework, patch provided by Leonard Schmidt
in follow-up to PR 30318.
To generate a diff of this commit:
cvs rdiff -r1.9 -r1.10 pkgsrc/graphics/libcaca/Makefile
cvs rdiff -r0 -r1.1 pkgsrc/graphics/libcaca/options.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->closed
State-Changed-By: wiz@netbsd.org
State-Changed-When: Fri, 29 Jul 2005 13:29:56 +0000
State-Changed-Why:
Committed, thank you!
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.