pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/30318: Split up graphics/libcaca



The following reply was made to PR pkg/30318; it has been noted by GNATS.

From: Leonard Schmidt <lems%gmx.net@localhost>
To: Thomas Klausner <wiz%netbsd.org@localhost>
Cc: gnats-bugs%NetBSD.org@localhost
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@localhost
 +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--
 



Home | Main Index | Thread Index | Old Index