Date: Sat, 23 Feb 2002 16:03:07 -0500 (EST) From: Joe Marcus Clarke <marcus@marcuscom.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/35254: [PATCH] Update editors/AbiWord Message-ID: <200202232103.g1NL37f63619@shumai.marcuscom.com>
next in thread | raw e-mail | index | archive | help
>Number: 35254
>Category: ports
>Synopsis: [PATCH] Update editors/AbiWord
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 23 13:10:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Joe Marcus Clarke
>Release: FreeBSD 4.5-STABLE i386
>Organization:
MarcusCom, Inc.
>Environment:
System: FreeBSD shumai.marcuscom.com 4.5-STABLE FreeBSD 4.5-STABLE #0: Wed Feb 13 23:30:15 EST 2002 marcus@shumai.marcuscom.com:/usr/obj/usr/src/sys/SHUMAI i386
>Description:
Update the AbiWord port to 0.99.2.
>How-To-Repeat:
>Fix:
--- abiword.diff begins here ---
--- Makefile.orig Sat Feb 23 15:58:51 2002
+++ Makefile Sat Feb 23 14:00:36 2002
@@ -10,8 +10,7 @@
# AbiWord build system.
PORTNAME= AbiWord
-PORTVERSION= 0.99.1
-PORTREVISION= 1
+PORTVERSION= 0.99.2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -29,7 +28,7 @@
DIST_SUBDIR= AbiWord
-WRKSRC= ${WRKDIR}/abiword/abi
+WRKSRC= ${WRKDIR}/abiword-${PORTVERSION}/abi
USE_X_PREFIX= yes
USE_AUTOMAKE= yes
--- distinfo.orig Sat Feb 23 15:58:59 2002
+++ distinfo Sat Feb 23 13:56:48 2002
@@ -1 +1 @@
-MD5 (AbiWord/abiword-0.99.1.tar.gz) = 09b4a09dad451d4c6f795e7edf8734b2
+MD5 (AbiWord/abiword-0.99.2.tar.gz) = 4d77cc35f049cb17f6bf677e79c54351
--- pkg-plist.orig Sat Feb 23 15:59:11 2002
+++ pkg-plist Sat Feb 23 15:55:26 2002
@@ -374,10 +374,11 @@
share/AbiSuite/AbiWord/strings/bg-BG.strings
share/AbiSuite/AbiWord/strings/ca-ES.strings
share/AbiSuite/AbiWord/strings/cs-CZ.strings
-share/AbiSuite/AbiWord/strings/cy-CY.strings
+share/AbiSuite/AbiWord/strings/cy-GB.strings
share/AbiSuite/AbiWord/strings/da-DK.strings
share/AbiSuite/AbiWord/strings/de-CH.strings
share/AbiSuite/AbiWord/strings/de-DE.strings
+share/AbiSuite/AbiWord/strings/el-GR.strings
share/AbiSuite/AbiWord/strings/en-AU.strings
share/AbiSuite/AbiWord/strings/en-GB.strings
share/AbiSuite/AbiWord/strings/en-IE.strings
@@ -397,7 +398,7 @@
share/AbiSuite/AbiWord/strings/pt-BR.strings
share/AbiSuite/AbiWord/strings/pt-PT.strings
share/AbiSuite/AbiWord/strings/ru-RU.strings
-share/AbiSuite/AbiWord/strings/sk.strings
+share/AbiSuite/AbiWord/strings/sk-SK.strings
share/AbiSuite/AbiWord/strings/sl-SI.strings
share/AbiSuite/AbiWord/strings/sv-SE.strings
share/AbiSuite/AbiWord/strings/tr-TR.strings
@@ -433,6 +434,8 @@
share/AbiSuite/AbiWord/system.profile-fr-CA
share/AbiSuite/AbiWord/system.profile-fr-CH
share/AbiSuite/AbiWord/system.profile-fr-FR
+share/AbiSuite/AbiWord/system.profile-gl-ES
+share/AbiSuite/AbiWord/system.profile-hu-HU
share/AbiSuite/AbiWord/system.profile-it-IT
share/AbiSuite/AbiWord/system.profile-lt-LT
share/AbiSuite/AbiWord/system.profile-nb-NO
@@ -443,6 +446,8 @@
share/AbiSuite/AbiWord/system.profile-pt-PT
share/AbiSuite/AbiWord/system.profile-ru
share/AbiSuite/AbiWord/system.profile-ru-RU
+share/AbiSuite/AbiWord/system.profile-sk-SK
+share/AbiSuite/AbiWord/system.profile-sk-SK.CP1250
share/AbiSuite/AbiWord/system.profile-sl
share/AbiSuite/AbiWord/system.profile-sv
share/AbiSuite/AbiWord/system.profile-sv-SE
--- files/patch-au.orig Sat Feb 23 15:59:27 2002
+++ files/patch-au Sat Feb 23 15:31:34 2002
@@ -1,46 +1,45 @@
-
-$FreeBSD: ports/editors/AbiWord/files/patch-au,v 1.3 2001/11/23 15:35:58 sobomax Exp $
-
---- src/pkg/common/unix/scripts/makewrapper.sh.orig Tue Nov 13 07:59:56 2001
-+++ src/pkg/common/unix/scripts/makewrapper.sh Fri Nov 23 16:31:06 2001
-@@ -66,23 +66,31 @@
+--- src/pkg/common/unix/scripts/makewrapper.sh.orig Wed Jan 23 09:16:52 2002
++++ src/pkg/common/unix/scripts/makewrapper.sh Sat Feb 23 15:30:19 2002
+@@ -80,23 +80,31 @@
if [ -z "\$locale" ]
then
locale=\$LANG
-+elif [ -z \$locale ]
++elif [ -x \$locale ]
+then
-+ locale=\$LC_CTYPE
++ locale=\$LC_CTYPE
fi
- #
+
if [ ! -z "\$locale" ]
then
- #now guess encoding
-+ #now guess country/region/encoding
-+ country=\`echo \$locale | sed -e 's/\(.*\)_.*\$/\1/'\`
-+ region=\`echo \$locale | sed -e 's/^.*_\(.*\)\..*/\1/'\`
++ #now guess country/region/encoding
++ country=\`echo \$locale | sed -e 's/\(.*\)_.*\$/\1/'\`
++ region=\`echo \$locale | sed -e 's/^.*_\(.*\)\..*/\1/'\`
encoding=\`echo \$locale | sed -e 's/^.*\.\(.*\)\$/\1/'\`
- if [ ! -z "\$encoding" ]
-+ if [ ! -z \$country -o ! -z \$region -o ! -z \$encoding ]
++ if [ ! -z \$country -o ! -z \$region -o ! -z \$encoding ]
then
- addfontdir=\$ABISUITE_FONT_HOME/\$encoding
- if [ ! -z "\$addfontdir" ]
- then
- if [ -d "\$addfontdir" ]
+- then
+- #add directory with locale-specific fonts to font path
+- ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir
+- fi
+- fi
+ addfontdirlst="\$ABISUITE_FONT_HOME/\$country \$ABISUITE_FONT_HOME/\${country}-\${region} \$ABISUITE_FONT_HOME/\$encoding \$ABISUITE_FONT_HOME/\${country}-\${region}.\${encoding}"
+ for addfontdir in \$addfontdirlst
+ do
-+ if [ ! -z \$addfontdir ]
- then
-- #add directory with locale-specific fonts to font path
-- ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir
++ if [ ! -z \$addfontdir ]
++ then
+ if [ -d \$addfontdir -a ! -f \$addfontdir/.already-in-fp ]
+ then
-+ #add directory with locale-specific fonts to font path
-+ ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir
++ #add directory with locale-specific fonts to font path
++ ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir
++ fi
+ fi
- fi
-- fi
+ done
fi
fi
- #
+
--- abiword.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200202232103.g1NL37f63619>