[gentoo-commits] gentoo-x86 commit in sci-misc/apertium/files: 3.2.0-flags.patch 3.2.0-datadir.patch

[Sebastien Fabbro (bicatali)]

bicatali    11/07/29 06:13:10

  Added:                3.2.0-flags.patch 3.2.0-datadir.patch
  Log:
  Version bump
  
  (Portage version: 2.1.10.7/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-misc/apertium/files/3.2.0-flags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/apertium/files/3.2.0-flags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/apertium/files/3.2.0-flags.patch?rev=1.1&content-type=text/plain

Index: 3.2.0-flags.patch
===================================================================
diff -Nur apertium-3.2.0.orig/configure.ac apertium-3.2.0/configure.ac
--- apertium-3.2.0.orig/configure.ac	2011-07-29 06:43:38.000000000 +0100
+++ apertium-3.2.0/configure.ac	2011-07-29 06:46:26.000000000 +0100
@@ -54,68 +54,6 @@
 
 # Checks for programs.
 
-AC_MSG_CHECKING([Compilation architecture: PPC, i686, x86_64, Other])
-if test x$(which arch) = x
-then ARCH=$($(which uname) -m)
-else ARCH=$($(which arch))
-fi
-
-case "${target_os}" in
-  mingw*)
-    MinGW=yes
-  ;;
-  cygwin*)
-    Cygwin=yes
-  ;;
-esac
-
-if test x$ARCH = xppc
-then
-  AC_MSG_RESULT([PowerPC])
-  CFLAGS="$CFLAGS -Wall -ansi -fomit-frame-pointer"
-  CXXFLAGS="$CXXFLAGS -Wall -ansi -fomit-frame-pointer"
-else
-  if test x$MinGW = xyes
-  then 
-    AC_MSG_RESULT([MinGW])
-    CFLAGS="$CFLAGS -Wall -march=i686 -O3 -DMINGW -fomit-frame-pointer \
-	        -funroll-loops -I/include -L/lib"
-    CXXFLAGS="$CXXFLAGS -Wall -march=i686 -O3 \
-            -fomit-frame-pointer -funroll-loops -I/include -L/lib"
-    CPPFLAGS="$CPPFLAGS -I/include"
-  else
-    if test x$Cygwin = xyes
-    then 
-      AC_MSG_RESULT([Cygwin])
-      CFLAGS="$CFLAGS -Wall -march=i686 -O3 -fomit-frame-pointer \
-           -funroll-loops"
-      CXXFLAGS="$CXXFLAGS -Wall -march=i686 -O3 \
-              -fomit-frame-pointer -funroll-loops"
-      CPPFLAGS="$CPPFLAGS"
-    else
-      if test x$ARCH = xi686
-      then
-        AC_MSG_RESULT([i686])
-        CFLAGS="$CFLAGS -Wall -ansi -march=i686 -O3 -fomit-frame-pointer -funroll-loops"
-        CXXFLAGS="$CXXFLAGS -Wall -ansi -march=i686 -O3 \
-                -fomit-frame-pointer -funroll-loops"
-      else
-        if test x$ARCH = xx86_64
-        then
-          AC_MSG_RESULT([x86_64])
-          CFLAGS="-Wall -ansi -O3 -mtune=nocona -fomit-frame-pointer -funroll-loops $CFLAGS"
-          CXXFLAGS="-Wall -ansi -O3 -mtune=nocona \
-                  -fomit-frame-pointer -funroll-loops $CXXFLAGS"
-        else
-          AC_MSG_RESULT([Other])
-          CFLAGS="-Wall -ansi -O3 $CFLAGS"
-          CXXFLAGS="-Wall -ansi -O3 $CXXFLAGS"
-        fi
-      fi
-    fi    
-  fi
-fi
-
 AC_PROG_CXX
 AC_PROG_LIBTOOL
 AM_SANITY_CHECK



1.1                  sci-misc/apertium/files/3.2.0-datadir.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/apertium/files/3.2.0-datadir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/apertium/files/3.2.0-datadir.patch?rev=1.1&content-type=text/plain

Index: 3.2.0-datadir.patch
===================================================================
diff -Nur apertium-3.2.0.orig/apertium/Makefile.am apertium-3.2.0/apertium/Makefile.am
--- apertium-3.2.0.orig/apertium/Makefile.am	2011-07-29 06:55:49.000000000 +0100
+++ apertium-3.2.0/apertium/Makefile.am	2011-07-29 07:03:58.000000000 +0100
@@ -66,10 +66,10 @@
 
 instdir = apertium
 
-apertiumdir = $(prefix)/share/apertium
+apertiumdir = $(datadir)/
 apertiuminclude = $(prefix)/include/apertium-$(GENERIC_API_VERSION)
 apertiumlib = $(prefix)/lib 
-apertiumsysconf = $(prefix)/etc/apertium
+apertiumsysconf = $(sysconfdir)/apertium
 
 apertium_DATA = deformat.xsl reformat.xsl new2old.xsl lexchoice.xsl \
                 lexchoicebil.xsl tagger.dtd interchunk.dtd format.dtd \
diff -Nur apertium-3.2.0.orig/Makefile.am apertium-3.2.0/Makefile.am
--- apertium-3.2.0.orig/Makefile.am	2011-07-29 06:55:49.000000000 +0100
+++ apertium-3.2.0/Makefile.am	2011-07-29 07:08:39.000000000 +0100
@@ -1,13 +1,10 @@
 SUBDIRS = $(GENERIC_LIBRARY_NAME)
 DIST_SUBDIRS = $(GENERIC_LIBRARY_NAME)
 
-modesdir=$(prefix)/share/apertium/modes
+modesdir = $(datadir)/apertium/modes
+modes_DATA = README-MODES
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = apertium-$(GENERIC_RELEASE).pc
 
 EXTRA_DIST=autogen.sh README-MODES
-
-install-data-local:
-	mkdir -p $(modesdir)
-	$(INSTALL_DATA) README-MODES  $(modesdir)/README