[Midnightbsd-cvs] CVS Commit: textproc/aspell: Added patch that fixes a bug where the

ctriv at midnightbsd.org ctriv at midnightbsd.org
Sat Aug 18 19:53:32 EDT 2007 

Log Message:
-----------
Added patch that fixes a bug where the --prefix option was broken when the
charset was explicitly set.  See
http://lists.gnu.org/archive/html/aspell-devel/2007-04/msg00000.html
Added license.
Updated to 0.60.5.

Modified Files:
--------------
    mports/textproc/aspell:
        Makefile (r1.5 -> r1.6)
        distinfo (r1.1 -> r1.2)
    mports/textproc/aspell/files:
        patch-Makefile.in (r1.2 -> r1.3)
        patch-configure (r1.2 -> r1.3)

Added Files:
-----------
    mports/textproc/aspell/files:
        patch-common__config.cpp (r1.1)

Removed Files:
-------------
    mports/textproc/aspell/files:
        patch-modules_filter_nroff.cpp

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/textproc/aspell/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ltextproc/aspell/Makefile -Ltextproc/aspell/Makefile -u -r1.5 -r1.6
--- textproc/aspell/Makefile
+++ textproc/aspell/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	aspell
-PORTVERSION=	0.60.4
-PORTREVISION=	5
+PORTVERSION=	0.60.5
 CATEGORIES=	textproc
 MASTER_SITES+=		${MASTER_SITE_GNU:S|$|:dicten|}
 MASTER_SITE_SUBDIR+=	aspell/dict/en/:dicten
@@ -20,6 +19,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Spelling checker with better suggestion logic than ispell
+LICENSE=	lgpl
 
 FAKE_OPTS=	libs bin
 
@@ -27,7 +27,9 @@
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd6.0
 CONFIGURE_ARGS=		--enable-dict-dir=${DATADIR}	\
 			--enable-docdir=${DOCSDIR}	\
-			--enable-static
+			--enable-static 		\
+			--mandir=${PREFIX}/man		\
+			--infodir=${PREFIX}/info	
 PTHREAD_CFLAGS=		# Disable threading
 PTHREAD_LIBS=		# libaspell may be used by unthreaded apps.
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"	\
@@ -121,7 +123,7 @@
 .if !exists(${LOCALBASE}/lib/aspell-${VERINST}/en.dat) && !defined(WITHOUT_DICTEN)
 	@${ECHO_MSG} "===>   Installing for en dictionaries"
 	cd ${WRKDIR}/aspell${VERDICT_EN} &&		\
-	 ${SETENV} ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} --vars DESTDIR=${FAKE_DESTDIR} ASPELL_FLAGS="--data-dir=${PREFIX}/lib/aspell-0.60" && \
+	 ${SETENV} ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} --vars DESTDIR=${FAKE_DESTDIR} ASPELL_FLAGS="--prefix=${PREFIX}" && \
 	 ${GMAKE} ${INSTALL_TARGET}
 	${SED} -e "s|%%VER%%|${VERINST}|" ${MASTERDIR}/pkg-plist.en	\
 		>> ${TMPPLIST}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/textproc/aspell/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltextproc/aspell/distinfo -Ltextproc/aspell/distinfo -u -r1.1 -r1.2
--- textproc/aspell/distinfo
+++ textproc/aspell/distinfo
@@ -1,6 +1,6 @@
-MD5 (aspell-0.60.4.tar.gz) = 4f1737e726d66476b9c7388831305510
-SHA256 (aspell-0.60.4.tar.gz) = 8931d8644da9a71fdd970cafe9d6c20d796ad1d8ef2aaf89a801171104e426e4
-SIZE (aspell-0.60.4.tar.gz) = 1676825
+MD5 (aspell-0.60.5.tar.gz) = 17fd8acac6293336bcef44391b71e337
+SHA256 (aspell-0.60.5.tar.gz) = ee9e81d2e3e66b01ad91da736e48568ed8acd6dfb6b664d904066ecc5ea4e84b
+SIZE (aspell-0.60.5.tar.gz) = 1754865
 MD5 (aspell6-en-6.0-0.tar.bz2) = 16449e0a266e1ecc526b2f3cd39d4bc2
 SHA256 (aspell6-en-6.0-0.tar.bz2) = 24f0688711d2b893fa06c16d14d0aa3a8000e326226b839aad32611f7ace4898
 SIZE (aspell6-en-6.0-0.tar.bz2) = 182442
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/textproc/aspell/files/patch-configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ltextproc/aspell/files/patch-configure -Ltextproc/aspell/files/patch-configure -u -r1.2 -r1.3
--- textproc/aspell/files/patch-configure
+++ textproc/aspell/files/patch-configure
@@ -1,6 +1,6 @@
---- ./configure.orig	Wed Oct 19 04:36:26 2005
-+++ ./configure	Thu Apr  5 00:40:43 2007
-@@ -2916,7 +2916,7 @@
+--- ./configure.orig	Tue Dec 19 06:03:38 2006
++++ ./configure	Sat Aug 18 17:59:39 2007
+@@ -3509,7 +3509,7 @@
  fi
  
  
@@ -9,7 +9,7 @@
  then
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
  fi
-@@ -9975,13 +9975,6 @@
+@@ -10857,13 +10857,6 @@
  	;;
      esac
  
@@ -23,7 +23,7 @@
      # Update the list of available tags.
      if test -n "$tagname"; then
        echo appending configuration tag \"$tagname\" to $ofile
-@@ -19872,6 +19865,10 @@
+@@ -19503,6 +19496,10 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -34,7 +34,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -23160,7 +23157,7 @@
+@@ -22764,7 +22761,7 @@
    CURSES_LIB=-lncurses
  
  cat >>confdefs.h <<\_ACEOF
@@ -43,7 +43,7 @@
  _ACEOF
  
  else
-@@ -23341,7 +23338,7 @@
+@@ -22938,7 +22935,7 @@
  
  
  cat >>confdefs.h <<\_ACEOF
--- /dev/null
+++ textproc/aspell/files/patch-common__config.cpp
@@ -0,0 +1,20 @@
+--- ./common/config.cpp.orig	Wed Jun 22 01:32:29 2005
++++ ./common/config.cpp	Sat Aug 18 18:01:35 2007
+@@ -1308,13 +1308,14 @@
+ 
+   PosibErr<void> Config::commit_all(Vector<int> * phs, const char * codeset)
+   {
++    Conv to_utf8;
++   if (codeset)
++      RET_ON_ERR(to_utf8.setup(*this, codeset, "utf-8", NormTo)); 
++      
+     committed_ = true;
+     others_ = first_;
+     first_ = 0;
+     insert_point_ = &first_;
+-    Conv to_utf8;
+-    if (codeset)
+-      RET_ON_ERR(to_utf8.setup(*this, codeset, "utf-8", NormTo));
+     while (others_) {
+       *insert_point_ = others_;
+       others_ = others_->next;
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/textproc/aspell/files/patch-Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ltextproc/aspell/files/patch-Makefile.in -Ltextproc/aspell/files/patch-Makefile.in -u -r1.2 -r1.3
--- textproc/aspell/files/patch-Makefile.in
+++ textproc/aspell/files/patch-Makefile.in
@@ -1,8 +1,8 @@
---- ./Makefile.in.orig	Wed Oct 19 05:14:24 2005
-+++ ./Makefile.in	Thu Apr  5 00:40:43 2007
-@@ -446,7 +446,12 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
+--- ./Makefile.in.orig	Tue Dec 19 06:03:37 2006
++++ ./Makefile.in	Sat Aug 18 17:59:39 2007
+@@ -474,7 +474,12 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign subdir-objects
 -SUBDIRS = . po manual
 +
@@ -14,16 +14,16 @@
  DIST_SUBDIRS = ${SUBDIRS} examples myspell lib5
  filterdir = ${pkglibdir}
  optdir = ${pkgdatadir}
-@@ -535,7 +540,7 @@
+@@ -562,7 +567,7 @@
  	lib/string_list-c.cpp lib/find_speller.cpp lib/speller-c.cpp \
  	lib/string_pair_enumeration-c.cpp lib/new_checker.cpp \
  	modules/filter/url.cpp $(am__append_3)
--libaspell_la_LIBADD = $(LIBINTL) $(PTHREAD_LIB)
-+libaspell_la_LIBADD = $(LIBINTL) $(PTHREAD_LIB)  $(LTLIBINTL)
+-libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB)
++libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB) $(LTLIBINTL)
  @INCREMENTED_SONAME_FALSE at libaspell_la_LDFLAGS = -version-info 16:4:1 -no-undefined
  @INCREMENTED_SONAME_TRUE at libaspell_la_LDFLAGS = -version-info 16:4:0 -no-undefined
  @PSPELL_COMPATIBILITY_TRUE at libpspell_la_SOURCES = lib/dummy.cpp
-@@ -544,7 +549,7 @@
+@@ -571,7 +576,7 @@
  @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE at libpspell_la_LDFLAGS = -version-info 16:4:0 -no-undefined
  word_list_compress_SOURCES = prog/compress.c
  aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp
--- textproc/aspell/files/patch-modules_filter_nroff.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-add the following as a new patch file in textproc/aspell/files:
-
---- modules/filter/nroff.cpp.orig	Fri Mar 31 09:52:23 2006
-+++ modules/filter/nroff.cpp	Fri Mar 31 09:52:42 2006
-@@ -73,7 +73,7 @@
-       return false;
-     }
-     
--    bool NroffFilter::process_char (FilterChar::Chr c);
-+    bool process_char (FilterChar::Chr c);
-       
-   public:
- 
-

More information about the Midnightbsd-cvs mailing list