From 11a4af36937dba73f14101e5e3af04d9b4ec2f27 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 31 Mar 2006 17:11:54 +0000 Subject: * Avoid an unnecessary SUBST_FILES class by using environnment variables to accomplish the same thing. * Move the arm compiler hack into a hacks.mk file. --- graphics/aalib/Makefile | 23 ++++++++--------------- graphics/aalib/distinfo | 4 ++-- graphics/aalib/hacks.mk | 8 ++++++++ graphics/aalib/patches/patch-ac | 36 +++++++++++++++++++++++------------- 4 files changed, 41 insertions(+), 30 deletions(-) create mode 100644 graphics/aalib/hacks.mk diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index 18707ac327e..9c24133c42b 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/02/05 23:09:28 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/31 17:11:54 jlam Exp $ DISTNAME= aalib-1.4rc5 PKGNAME= ${DISTNAME:S/rc5/.0.5/} @@ -16,26 +16,19 @@ WRKSRC= ${WRKDIR}/aalib-1.4.0 GNU_CONFIGURE= YES USE_LIBTOOL= YES -SUBST_CLASSES+= malloc paths +CONFIGURE_ENV+= SLANG_PREFIX=${BUILDLINK_PREFIX.libslang:Q} +CONFIGURE_ENV+= NCURSES_PREFIX=${BUILDLINK_PREFIX.ncurses:Q} +SUBST_CLASSES+= malloc SUBST_STAGE.malloc= pre-configure -SUBST_FILES.malloc= src/aalinux.c src/aax.c src/aaxkbd.c -SUBST_FILES.malloc+= src/aaxmouse.c src/aarec.c src/aalib.c -SUBST_FILES.malloc+= src/aaedit.c src/aaregist.c src/aakbdreg.c -SUBST_FILES.malloc+= src/aamoureg.c src/aados.c src/aadoskbd.c +SUBST_FILES.malloc= src/aalinux.c src/aax.c src/aaxkbd.c \ + src/aaxmouse.c src/aarec.c src/aalib.c \ + src/aaedit.c src/aaregist.c src/aakbdreg.c \ + src/aamoureg.c src/aados.c src/aadoskbd.c SUBST_SED.malloc= -e 's|||g' -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= configure -SUBST_SED.paths= -e 's|BUILDLINK_SL|${BUILDLINK_PREFIX.libslang}|g' -SUBST_SED.paths+= -e 's|BUILDLINK_NC|${BUILDLINK_PREFIX.ncurses}|g' - INFO_FILES= aalib.info .include "options.mk" -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD+= 2.95.3 -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/graphics/aalib/distinfo b/graphics/aalib/distinfo index 201096fd728..6c60f63c6a1 100644 --- a/graphics/aalib/distinfo +++ b/graphics/aalib/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2005/12/11 09:40:44 wiz Exp $ +$NetBSD: distinfo,v 1.7 2006/03/31 17:11:54 jlam Exp $ SHA1 (aalib-1.4rc5.tar.gz) = a23269e950a249d2ef93625837cace45ddbce03b RMD160 (aalib-1.4rc5.tar.gz) = a10bcab16d3aa0e60facca3e989f6a51846885f6 Size (aalib-1.4rc5.tar.gz) = 391028 bytes SHA1 (patch-aa) = 927d69a8f499b99f0bd5f13cf220ce8cbb7ea591 SHA1 (patch-ab) = 272f6f10dbe7a525c582a9b4c865f0ab9b2f9fba -SHA1 (patch-ac) = 104d896182671e732efec445704140b361c34533 +SHA1 (patch-ac) = 8d9c812b9b871f44dd1285d6a635eeab6e49bf49 diff --git a/graphics/aalib/hacks.mk b/graphics/aalib/hacks.mk new file mode 100644 index 00000000000..d6a2ac28012 --- /dev/null +++ b/graphics/aalib/hacks.mk @@ -0,0 +1,8 @@ +# $NetBSD: hacks.mk,v 1.1 2006/03/31 17:11:54 jlam Exp $ + +### [Mon Mar 25 14:45:05 2002 UTC : cjep] +### On arm{,32}, avoid internal compiler errors with old GCC versions. +### +.if (${MACHINE_ARCH} == "arm") || (${MACHINE_ARCH} == "arm32") +GCC_REQD+= 2.95.3 +.endif diff --git a/graphics/aalib/patches/patch-ac b/graphics/aalib/patches/patch-ac index 99ff087230b..12eff5d672a 100644 --- a/graphics/aalib/patches/patch-ac +++ b/graphics/aalib/patches/patch-ac @@ -1,52 +1,62 @@ -$NetBSD: patch-ac,v 1.1 2005/12/11 09:40:44 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2006/03/31 17:11:54 jlam Exp $ ---- configure.orig 2001-04-26 14:44:54.000000000 +0000 +--- configure.orig 2001-04-26 10:44:54.000000000 -0400 +++ configure -@@ -3145,7 +3145,7 @@ EOF +@@ -1957,6 +1957,9 @@ if test "${with_curses_driver+set}" = se + + fi + ++test "x$SLANG_PREFIX" != x || SLANG_PREFIX=/usr/local ++test "x$NCURSES_PREFIX" != x || NCURSES_PREFIX=/usr/local ++ + # Check whether --with-gpm-mouse or --without-gpm-mouse was given. + if test "${with_gpm_mouse+set}" = set; then + withval="$with_gpm_mouse" +@@ -3145,7 +3148,7 @@ EOF if $search_slang then - if test -f /usr/local/include/slang.h -+ if test -f BUILDLINK_SL/include/slang.h ++ if test -f $SLANG_PREFIX/include/slang.h then LIBS1="$LIBS" LIBS="$LIBS " -@@ -3197,10 +3197,10 @@ else +@@ -3197,10 +3200,10 @@ else fi if test "x$ac_cv_lib_slang_SLsmg_init_smg" = xyes; then - echo "$ac_t""Found slang on /usr/local/include/slang.h" 1>&6 -+ echo "$ac_t""Found slang on BUILDLINK_SL/include/slang.h" 1>&6 ++ echo "$ac_t""Found slang on $SLANG_PREFIX/include/slang.h" 1>&6 AALIB_LIBS="$AALIB_LIBS -lslang" LIBS="$LIBS " - CFLAGS="$CFLAGS -I/usr/local/include/slang " -+ CFLAGS="$CFLAGS -IBUILDLINK_SL/include/slang " ++ CFLAGS="$CFLAGS -I$SLANG_PREFIX/include/slang " slang_driver=true search_slang=false cat >> confdefs.h <<\EOF -@@ -3453,7 +3453,7 @@ EOF +@@ -3453,7 +3456,7 @@ EOF if $search_ncurses then - if test -f /usr/local/include/ncurses.h -+ if test -f BUILDLINK_NC/include/ncurses.h ++ if test -f NCURSES_PREFIX/include/ncurses.h then LIBS1="$LIBS" LIBS="$LIBS " -@@ -3505,13 +3505,13 @@ else +@@ -3505,13 +3508,13 @@ else fi if test "x$ac_cv_lib_ncurses_initscr" = xyes; then - echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6 -+ echo "$ac_t""Found ncurses on BUILDLINK_NC/include/ncurses.h" 1>&6 ++ echo "$ac_t""Found ncurses on NCURSES_PREFIX/include/ncurses.h" 1>&6 AALIB_LIBS="$AALIB_LIBS -lncurses" LIBS="$LIBS " - CFLAGS="$CFLAGS -L/usr/local/lib" -+ CFLAGS="$CFLAGS -LBUILDLINK_NC/lib" ++ CFLAGS="$CFLAGS -LNCURSES_PREFIX/lib" search_ncurses=false curses_driver=true - screen_manager=-I/usr/local/include -+ screen_manager=-IBUILDLINK_NC/include ++ screen_manager=-INCURSES_PREFIX/include cat >> confdefs.h <<\EOF #define USE_NCURSES 1 EOF -- cgit v1.2.3