update to 1.0.6

2003-08-16 16:32:58 +00:00 · 2003-08-16 16:32:58 +00:00 · cc231f8295
commit cc231f8295
parent 0ab760e71a
7 changed files with 26 additions and 41 deletions
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.29 2003/03/06 00:49:08 brad Exp $
+# $OpenBSD: Makefile,v 1.30 2003/08/16 16:32:58 couderc Exp $

 COMMENT=	"open-source, cross-platform WYSIWYG word processor"

-VERSION=	1.0.4
+VERSION=	1.0.6
 DISTNAME=	abiword-${VERSION}
 CATEGORIES=	editors

@ -10,6 +10,11 @@ HOMEPAGE=	http://www.abisource.com/

 MAINTAINER=	Damien Couderc <couderc@openbsd.org>

+AUTOCONF_VERSION=	2.52
+
+BUILD_DEPENDS=	::devel/autoconf/${AUTOCONF_VERSION} \
+		::devel/metaauto \
+		::devel/automake
 LIB_DEPENDS=	png.2::graphics/png \
 		jpeg.62::graphics/jpeg \
 		gtk.1.2,gdk.1.2::x11/gtk+
@ -36,7 +41,6 @@ FAKE_FLAGS=	prefix="${WRKINST}${PREFIX}"

 MAKE_FILE=	GNUmakefile

-WRKDIST=	${WRKDIR}/abiword-${VERSION}
 WRKSRC=		${WRKDIST}/abi

 FLAVORS=	gnome
@ -53,6 +57,9 @@ CONFIGURE_ARGS+=	--disable-gnome --with-libxml2
 LIB_DEPENDS+=		xml2::textproc/libxml
 .endif

+pre-configure:
+	@cd ${WRKSRC} && AUTOCONF_VERSION=${AUTOCONF_VERSION} sh autogen.sh
+
 .if ${FLAVOR:L:Mgnome}
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gnome/apps/Applications
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@ -1,3 +1,3 @@
-MD5 (abiword-1.0.4.tar.gz) = fec2f2770c29afe0d30e653b5d1d40bb
-RMD160 (abiword-1.0.4.tar.gz) = 22576b129f715df084d24621ff82129e44066d6a
-SHA1 (abiword-1.0.4.tar.gz) = c42df6f219ee370f4e69a2175364d6489924ac82
+MD5 (abiword-1.0.6.tar.gz) = b35ea76f8d3eb70a94c3432a44e4a9d9
+RMD160 (abiword-1.0.6.tar.gz) = 7ee1ef1e4c4c6a74ec68e3e813b4de15b17b31c8
+SHA1 (abiword-1.0.6.tar.gz) = 3c63b5d7f4636c79406f58a5748faf026c9a7a4c
--- a/editors/abiword/patches/patch-abi_GNUmakefile_in
+++ b/editors/abiword/patches/patch-abi_GNUmakefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-abi_GNUmakefile_in,v 1.1 2003/02/11 19:47:34 couderc Exp $
--- abi/GNUmakefile.in.orig	Thu Jan 23 02:07:40 2003
-+++ abi/GNUmakefile.in	Tue Feb 11 19:16:43 2003
-@@ -40,6 +40,8 @@ pkgincludedir = $(includedir)/@PACKAGE@
- 
- top_builddir = .
- 
-+DESTDIR =
-+
- ACLOCAL = @ACLOCAL@
- AUTOCONF = @AUTOCONF@
- AUTOMAKE = @AUTOMAKE@
--- a/editors/abiword/patches/patch-abi_src_wp_main_unix_GNUmakefile_am
+++ b/editors/abiword/patches/patch-abi_src_wp_main_unix_GNUmakefile_am
@ -0,0 +1,11 @@
+$OpenBSD: patch-abi_src_wp_main_unix_GNUmakefile_am,v 1.1 2003/08/16 16:32:58 couderc Exp $
+--- abi/src/wp/main/unix/GNUmakefile.am.orig	2003-08-16 14:53:59.000000000 +0200
+++ abi/src/wp/main/unix/GNUmakefile.am	2003-08-16 15:08:09.000000000 +0200
+@@ -68,4 +68,6 @@ install-exec-local:	install-wrapper
+ 	fi
+ 
+ install-wrapper:	
+-	@$(top_srcdir)/src/pkg/common/unix/scripts/makewrapper.sh AbiWord $(pkgdatadir) $(bindir) $(DESTDIR)
+	@$(top_srcdir)/src/pkg/common/unix/scripts/makewrapper.sh AbiWord \
+		$(LOCALBASE)/share/AbiSuite $(LOCALBASE)/bin \
+		`echo $(PREFIX) | sed -e s#$(LOCALBASE)##`
--- a/editors/abiword/patches/patch-abi_src_wp_main_unix_GNUmakefile_in
+++ b/editors/abiword/patches/patch-abi_src_wp_main_unix_GNUmakefile_in
@ -1,19 +0,0 @@
-$OpenBSD: patch-abi_src_wp_main_unix_GNUmakefile_in,v 1.1 2003/02/11 19:47:34 couderc Exp $
--- abi/src/wp/main/unix/GNUmakefile.in.orig	Thu Jan 23 02:08:17 2003
-+++ abi/src/wp/main/unix/GNUmakefile.in	Tue Feb 11 19:16:43 2003
-@@ -636,11 +636,13 @@ install-exec-local:	install-wrapper
- 	@if test -f $(DESTDIR)/$(bindir)/abiword; then \
- 	  echo "$(DESTDIR)/$(bindir)/abiword is a regular file - I'm not going to create a link."; \
- 	else \
-	  ln -sf $(DESTDIR)/$(bindir)/AbiWord $(DESTDIR)/$(bindir)/abiword; \
-+	  ln -sf $(LOCALBASE)/bin/AbiWord $(DESTDIR)/$(bindir)/abiword; \
- 	fi
- 
- install-wrapper:	
-	@$(top_srcdir)/src/pkg/common/unix/scripts/makewrapper.sh AbiWord $(pkgdatadir) $(bindir) $(DESTDIR)
-+	@$(top_srcdir)/src/pkg/common/unix/scripts/makewrapper.sh AbiWord \
-+		$(LOCALBASE)/share/AbiSuite $(LOCALBASE)/bin \
-+		`echo $(PREFIX) | sed -e s#$(LOCALBASE)##`
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/editors/abiword/pkg/DESCR
+++ b/editors/abiword/pkg/DESCR
@ -1,4 +1,2 @@
 AbiWord is an open-source, cross-platform WYSIWYG word processor, based
 on the GTK tool kit.
-
-WWW: ${HOMEPAGE}
--- a/editors/abiword/pkg/PLIST
+++ b/editors/abiword/pkg/PLIST
@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.9 2003/02/06 17:59:32 couderc Exp $
+@comment $OpenBSD: PLIST,v 1.10 2003/08/16 16:32:58 couderc Exp $
 %%gnome%%
 bin/AbiWord
 bin/AbiWord_d
-bin/abiword
+@comment bin/abiword
 bin/ttfadmin.sh
 bin/ttftool
 share/AbiSuite/AbiWord/help/en-US/aboutos.html