Revision: 5510 Author: pebender Date: Fri Sep 18 05:38:04 2009 Log: - Patched lib/ncurses so that its *-config file gives out the correct values for installation paths.
http://code.google.com/p/minimyth/source/detail?r=5510 Added: /trunk/gar-minimyth/script/lib/ncurses/files/ncurses-5.7.patch.gar Deleted: /trunk/gar-minimyth/script/lib/ncurses/files/ncurses-5.7.patch Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/script/lib/ncurses/Makefile /trunk/gar-minimyth/script/lib/ncurses/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/lib/ncurses/files/ncurses-5.7.patch.gar Fri Sep 18 05:38:04 2009 @@ -0,0 +1,125 @@ +diff -Naur ncurses-5.7-old/aclocal.m4 ncurses-5.7-new/aclocal.m4 +--- ncurses-5.7-old/aclocal.m4 2008-10-25 15:15:32.000000000 -0700 ++++ ncurses-5.7-new/aclocal.m4 2009-09-18 05:24:26.000000000 -0700 +@@ -73,14 +73,14 @@ + ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS" + fi + if test "$GCC" != yes; then +- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" ++ ACPPFLAGS="$ACPPFLAGS -I\${DESTDIR}/\${includedir}" + elif test "$includedir" != "/usr/include"; then + if test "$includedir" = '${prefix}/include' ; then + if test $prefix != /usr ; then +- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" ++ ACPPFLAGS="$ACPPFLAGS -I\${DESTDIR}/\${includedir}" + fi + else +- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" ++ ACPPFLAGS="$ACPPFLAGS -I\${DESTDIR}/\${includedir}" + fi + fi + AC_SUBST(ACPPFLAGS) +@@ -2039,14 +2039,14 @@ + CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS" + fi + if test "$GCC" != yes; then +- CPPFLAGS="$CPPFLAGS -I\${includedir}" ++ CPPFLAGS="$CPPFLAGS -I\${DESTDIR}/\${includedir}" + elif test "$includedir" != "/usr/include"; then + if test "$includedir" = '${prefix}/include' ; then + if test $prefix != /usr ; then +- CPPFLAGS="$CPPFLAGS -I\${includedir}" ++ CPPFLAGS="$CPPFLAGS -I\${DESTDIR}/\${includedir}" + fi + else +- CPPFLAGS="$CPPFLAGS -I\${includedir}" ++ CPPFLAGS="$CPPFLAGS -I\${DESTDIR}/\${includedir}" + fi + fi + AC_SUBST(CPPFLAGS) +diff -Naur ncurses-5.7-old/configure ncurses-5.7-new/configure +--- ncurses-5.7-old/configure 2008-10-25 17:04:38.000000000 -0700 ++++ ncurses-5.7-new/configure 2009-09-18 05:24:26.000000000 -0700 +@@ -16198,14 +16198,14 @@ + CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS" + fi + if test "$GCC" != yes; then +- CPPFLAGS="$CPPFLAGS -I\${includedir}" ++ CPPFLAGS="$CPPFLAGS -I\${DESTDIR}/\${includedir}" + elif test "$includedir" != "/usr/include"; then + if test "$includedir" = '${prefix}/include' ; then + if test $prefix != /usr ; then +- CPPFLAGS="$CPPFLAGS -I\${includedir}" ++ CPPFLAGS="$CPPFLAGS -I\${DESTDIR}/\${includedir}" + fi + else +- CPPFLAGS="$CPPFLAGS -I\${includedir}" ++ CPPFLAGS="$CPPFLAGS -I\${DESTDIR}/\${includedir}" + fi + fi + +@@ -16214,14 +16214,14 @@ + ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS" + fi + if test "$GCC" != yes; then +- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" ++ ACPPFLAGS="$ACPPFLAGS -I\${DESTDIR}/\${includedir}" + elif test "$includedir" != "/usr/include"; then + if test "$includedir" = '${prefix}/include' ; then + if test $prefix != /usr ; then +- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" ++ ACPPFLAGS="$ACPPFLAGS -I\${DESTDIR}/\${includedir}" + fi + else +- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" ++ ACPPFLAGS="$ACPPFLAGS -I\${DESTDIR}/\${includedir}" + fi + fi + +diff -Naur ncurses-5.7-old/misc/ncurses-config.in ncurses-5.7-new/misc/ncurses-config.in +--- ncurses-5.7-old/misc/ncurses-config.in 2007-03-17 13:02:19.000000000 -0700 ++++ ncurses-5.7-new/misc/ncurses-config.in 2009-09-18 05:25:50.000000000 -0700 +@@ -30,13 +30,13 @@ + # + # Author: Thomas E. Dickey, 2006 + +-prefix="@prefix@" +-exec_prefix="@exec_prefix@" ++prefix="@DESTDIR@@prefix@" ++exec_prefix="@DESTDIR@@exec_prefix@" + +-bindir="@bindir@" +-libdir="@libdir@" +-datadir="@datadir@" +-mandir="@mandir@" ++bindir="@DESTDIR@@bindir@" ++libdir="@DESTDIR@@libdir@" ++datadir="@DESTDIR@@datadir@" ++mandir="@DESTDIR@@mandir@" + + THIS="ncur...@dft_arg_suffix@" + +@@ -75,11 +75,11 @@ + # compile/link + --cflags) + INCS= +- if test "${prefix}/include" != /usr/include ; then +- INCS="-I${prefix}/include" ++ if test "${includedir}" != @GAR_DESTDIR@@GAR_includedir@ ; then ++ INCS="-I${includedir}" + fi + if test "@WITH_OVERWRITE@" != no ; then +- INCS="$INCS -I${prefix}/include/${THIS}" ++ INCS="$INCS -I${includedir}/${THIS}" + fi + sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO + $INCS +@@ -87,7 +87,7 @@ + ;; + --libs) + sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO +- -L${exec_prefix}/lib @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ ++ -L${libdir} @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ + ENDECHO + ;; + # identification ======================================= --- /trunk/gar-minimyth/script/lib/ncurses/files/ncurses-5.7.patch Tue Nov 4 20:06:02 2008 +++ /dev/null @@ -1,113 +0,0 @@ -diff -Naur ncurses-5.7-old/aclocal.m4 ncurses-5.7-new/aclocal.m4 ---- ncurses-5.7-old/aclocal.m4 2008-11-04 11:23:42.000000000 -0800 -+++ ncurses-5.7-new/aclocal.m4 2008-11-04 11:24:42.000000000 -0800 -@@ -73,14 +73,14 @@ - ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS" - fi - if test "$GCC" != yes; then -- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" -+ ACPPFLAGS="$ACPPFLAGS -I\${DESTDIR}/\${includedir}" - elif test "$includedir" != "/usr/include"; then - if test "$includedir" = '${prefix}/include' ; then - if test $prefix != /usr ; then -- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" -+ ACPPFLAGS="$ACPPFLAGS -I\${DESTDIR}/\${includedir}" - fi - else -- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" -+ ACPPFLAGS="$ACPPFLAGS -I\${DESTDIR}/\${includedir}" - fi - fi - AC_SUBST(ACPPFLAGS) -@@ -2039,14 +2039,14 @@ - CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS" - fi - if test "$GCC" != yes; then -- CPPFLAGS="$CPPFLAGS -I\${includedir}" -+ CPPFLAGS="$CPPFLAGS -I\${DESTDIR}/\${includedir}" - elif test "$includedir" != "/usr/include"; then - if test "$includedir" = '${prefix}/include' ; then - if test $prefix != /usr ; then -- CPPFLAGS="$CPPFLAGS -I\${includedir}" -+ CPPFLAGS="$CPPFLAGS -I\${DESTDIR}/\${includedir}" - fi - else -- CPPFLAGS="$CPPFLAGS -I\${includedir}" -+ CPPFLAGS="$CPPFLAGS -I\${DESTDIR}/\${includedir}" - fi - fi - AC_SUBST(CPPFLAGS) -diff -Naur ncurses-5.7-old/configure ncurses-5.7-new/configure ---- ncurses-5.7-old/configure 2008-11-04 11:23:42.000000000 -0800 -+++ ncurses-5.7-new/configure 2008-11-04 11:24:42.000000000 -0800 -@@ -16198,14 +16198,14 @@ - CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS" - fi - if test "$GCC" != yes; then -- CPPFLAGS="$CPPFLAGS -I\${includedir}" -+ CPPFLAGS="$CPPFLAGS -I\${DESTDIR}/\${includedir}" - elif test "$includedir" != "/usr/include"; then - if test "$includedir" = '${prefix}/include' ; then - if test $prefix != /usr ; then -- CPPFLAGS="$CPPFLAGS -I\${includedir}" -+ CPPFLAGS="$CPPFLAGS -I\${DESTDIR}/\${includedir}" - fi - else -- CPPFLAGS="$CPPFLAGS -I\${includedir}" -+ CPPFLAGS="$CPPFLAGS -I\${DESTDIR}/\${includedir}" - fi - fi - -@@ -16214,14 +16214,14 @@ - ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS" - fi - if test "$GCC" != yes; then -- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" -+ ACPPFLAGS="$ACPPFLAGS -I\${DESTDIR}/\${includedir}" - elif test "$includedir" != "/usr/include"; then - if test "$includedir" = '${prefix}/include' ; then - if test $prefix != /usr ; then -- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" -+ ACPPFLAGS="$ACPPFLAGS -I\${DESTDIR}/\${includedir}" - fi - else -- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" -+ ACPPFLAGS="$ACPPFLAGS -I\${DESTDIR}/\${includedir}" - fi - fi - -diff -Naur ncurses-5.7-old/misc/ncurses-config.in ncurses-5.7-new/misc/ncurses-config.in ---- ncurses-5.7-old/misc/ncurses-config.in 2008-11-04 11:23:42.000000000 -0800 -+++ ncurses-5.7-new/misc/ncurses-config.in 2008-11-04 11:24:42.000000000 -0800 -@@ -30,6 +30,7 @@ - # - # Author: Thomas E. Dickey, 2006 - -+DESTDIR="@DESTDIR@" - prefix="@prefix@" - exec_prefix="@exec_prefix@" - -@@ -75,11 +76,11 @@ - # compile/link - --cflags) - INCS= -- if test "${prefix}/include" != /usr/include ; then -- INCS="-I${prefix}/include" -+ if test "${includedir}" != /usr/include ; then -+ INCS="-I${includedir}" - fi - if test "@WITH_OVERWRITE@" != no ; then -- INCS="$INCS -I${prefix}/include/${THIS}" -+ INCS="$INCS -I${DESTDIR}${includedir}/${THIS}" - fi - sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO - $INCS -@@ -87,7 +88,7 @@ - ;; - --libs) - sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO -- -L${exec_prefix}/lib @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ -+ -L${DESTDIR}${libdir} @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ - ENDECHO - ;; - # identification ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Sep 18 05:04:17 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Sep 18 05:38:04 2009 @@ -80,9 +80,11 @@ - Added tcl for packages that need it to build, including sqlite. Fixed build system - - Patched system/g15daemon so that it does not add includedir to CPPFLAGS. - - Patched kernel-2.6.*/linxu so that it uses ncurses from the build + - Patched kernel-2.6.*/linux so that it uses ncurses from the build environment rather than the local system. + - Patched lib/ncurses so that its *-config file gives out the correct + values for installation paths. + - Patched system/g15daemon so that it does not add includedir to CPPFLAGS. Removed packages Removed myth-trunk/myththemes. ======================================= --- /trunk/gar-minimyth/script/lib/ncurses/Makefile Thu Sep 17 20:02:23 2009 +++ /trunk/gar-minimyth/script/lib/ncurses/Makefile Fri Sep 18 05:38:04 2009 @@ -3,7 +3,7 @@ CATEGORIES = lib MASTER_SITES = ftp://ftp.gnu.org/gnu/$(GARNAME)/ DISTFILES = $(DISTNAME).tar.gz -PATCHFILES = $(DISTNAME)-perl.patch.gar $(DISTNAME).patch +PATCHFILES = $(DISTNAME)-perl.patch.gar $(DISTNAME).patch.gar LICENSE = MIT_Modified DESCRIPTION = ======================================= --- /trunk/gar-minimyth/script/lib/ncurses/checksums Tue Nov 4 20:06:02 2008 +++ /trunk/gar-minimyth/script/lib/ncurses/checksums Fri Sep 18 05:38:04 2009 @@ -1,3 +1,3 @@ cce05daf61a64501ef6cd8da1f727ec6 download/ncurses-5.7.tar.gz 07b842531d573474a7e6163b42ea53d2 download/ncurses-5.7-perl.patch.gar -b520cd65cf99efec705e8a7e314a7d57 download/ncurses-5.7.patch +fb3bcfcf222e3d9d6889179348161452 download/ncurses-5.7.patch.gar --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
