Re: PATCH: editors/emacs22

2008-12-27 Thread Eric Faurot
On Sat, 13 Dec 2008 11:29:36 +0100
Eric Faurot  wrote:

> Hi,
> 
> This diff contains the following updates:
> 
> * fix build on hppa (from  Josh Elsasser)
> * do not install image files with no_x11 (from Deanna Phillips)
> 
> ok?

I would like to commit this. Any objection?

Eric.



PATCH: editors/emacs22

2008-12-13 Thread Eric Faurot
Hi,

This diff contains the following updates:

* fix build on hppa (from  Josh Elsasser)
* do not install image files with no_x11 (from Deanna Phillips)

ok?

Eric.

diff -urN emacs22.orig/Makefile emacs22/Makefile
--- emacs22.orig/Makefile   Fri Jul  4 17:39:17 2008
+++ emacs22/MakefileSat Dec 13 11:19:28 2008
@@ -5,7 +5,7 @@
 
 VERSION=   22.2
 DISTNAME=  emacs-${VERSION}
-PKGNAME-main=  emacs-${VERSION}p0
+PKGNAME-main=  emacs-${VERSION}p1
 FULLPKGNAME-el=emacs-el-${VERSION}p0
 FULLPKGPATH-el=editors/emacs22,-el
 
@@ -32,7 +32,8 @@
 
 GCCARCH=   ${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}
 
-CONFIGURE_STYLE=   gnu
+AUTOCONF_VERSION=  2.61
+CONFIGURE_STYLE=   autoconf
 CONFIGURE_ARGS=${GCCARCH} --with-pop --localstatedir=/var
 
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
diff -urN emacs22.orig/patches/patch-configure.in 
emacs22/patches/patch-configure.in
--- emacs22.orig/patches/patch-configure.in Thu Jan  1 01:00:00 1970
+++ emacs22/patches/patch-configure.in  Thu Dec 11 14:43:55 2008
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.in.orig  Sat Mar  1 11:28:11 2008
 configure.in   Mon Nov 17 18:27:53 2008
+@@ -298,7 +298,7 @@ dnl see the `changequote' comment above.
+ case "${canonical}" in
+   alpha*-*-openbsd*)  machine=alpha ;;
+   arm-*-openbsd*)  machine=arm ;;
+-  hppa-*-openbsd*) machine=hp9000s300 ;;
++  hppa-*-openbsd*) machine=hp800 ;;
+   i386-*-openbsd*) machine=intel386 ;;
+   m68k-*-openbsd*) machine=hp9000s300 ;;
+   m88k-*-openbsd*) machine=aviion ;;
diff -urN emacs22.orig/pkg/PFRAG.no-no_x11-main emacs22/pkg/PFRAG.no-no_x11-main
--- emacs22.orig/pkg/PFRAG.no-no_x11-main   Thu Jan  1 01:00:00 1970
+++ emacs22/pkg/PFRAG.no-no_x11-mainThu Dec 11 14:44:41 2008
@@ -0,0 +1,344 @@
+...@comment $OpenBSD: PLIST-main,v 1.1.1.1 2008/06/14 18:31:16 eric Exp $
+share/emacs/${VERSION}/etc/images/
+share/emacs/${VERSION}/etc/images/README
+share/emacs/${VERSION}/etc/images/attach.pbm
+share/emacs/${VERSION}/etc/images/attach.xpm
+share/emacs/${VERSION}/etc/images/back-arrow.pbm
+share/emacs/${VERSION}/etc/images/back-arrow.xpm
+share/emacs/${VERSION}/etc/images/cancel.pbm
+share/emacs/${VERSION}/etc/images/cancel.xpm
+share/emacs/${VERSION}/etc/images/close.pbm
+share/emacs/${VERSION}/etc/images/close.xpm
+share/emacs/${VERSION}/etc/images/connect.xpm
+share/emacs/${VERSION}/etc/images/contact.pbm
+share/emacs/${VERSION}/etc/images/contact.xpm
+share/emacs/${VERSION}/etc/images/copy.pbm
+share/emacs/${VERSION}/etc/images/copy.xpm
+share/emacs/${VERSION}/etc/images/cut.pbm
+share/emacs/${VERSION}/etc/images/cut.xpm
+share/emacs/${VERSION}/etc/images/data-save.pbm
+share/emacs/${VERSION}/etc/images/data-save.xpm
+share/emacs/${VERSION}/etc/images/delete.pbm
+share/emacs/${VERSION}/etc/images/delete.xpm
+share/emacs/${VERSION}/etc/images/describe.xpm
+share/emacs/${VERSION}/etc/images/diropen.pbm
+share/emacs/${VERSION}/etc/images/diropen.xpm
+share/emacs/${VERSION}/etc/images/disconnect.xpm
+share/emacs/${VERSION}/etc/images/exit.pbm
+share/emacs/${VERSION}/etc/images/exit.xpm
+share/emacs/${VERSION}/etc/images/ezimage/
+share/emacs/${VERSION}/etc/images/ezimage/README
+share/emacs/${VERSION}/etc/images/ezimage/bits.xpm
+share/emacs/${VERSION}/etc/images/ezimage/bitsbang.xpm
+share/emacs/${VERSION}/etc/images/ezimage/box-minus.xpm
+share/emacs/${VERSION}/etc/images/ezimage/box-plus.xpm
+share/emacs/${VERSION}/etc/images/ezimage/box.xpm
+share/emacs/${VERSION}/etc/images/ezimage/checkmark.xpm
+share/emacs/${VERSION}/etc/images/ezimage/dir-minus.xpm
+share/emacs/${VERSION}/etc/images/ezimage/dir-plus.xpm
+share/emacs/${VERSION}/etc/images/ezimage/dir.xpm
+share/emacs/${VERSION}/etc/images/ezimage/doc-minus.xpm
+share/emacs/${VERSION}/etc/images/ezimage/doc-plus.xpm
+share/emacs/${VERSION}/etc/images/ezimage/doc.xpm
+share/emacs/${VERSION}/etc/images/ezimage/info.xpm
+share/emacs/${VERSION}/etc/images/ezimage/key.xpm
+share/emacs/${VERSION}/etc/images/ezimage/label.xpm
+share/emacs/${VERSION}/etc/images/ezimage/lock.xpm
+share/emacs/${VERSION}/etc/images/ezimage/mail.xpm
+share/emacs/${VERSION}/etc/images/ezimage/page-minus.xpm
+share/emacs/${VERSION}/etc/images/ezimage/page-plus.xpm
+share/emacs/${VERSION}/etc/images/ezimage/page.xpm
+share/emacs/${VERSION}/etc/images/ezimage/tag-gt.xpm
+share/emacs/${VERSION}/etc/images/ezimage/tag-minus.xpm
+share/emacs/${VERSION}/etc/images/ezimage/tag-plus.xpm
+share/emacs/${VERSION}/etc/images/ezimage/tag-type.xpm
+share/emacs/${VERSION}/etc/images/ezimage/tag-v.xpm
+share/emacs/${VERSION}/etc/images/ezimage/tag.xpm
+share/emacs/${VERSION}/etc/images/ezimage/unlock.xpm
+share/emacs/${VERSION}/etc/images/fwd-arrow.pbm
+share/emacs/${VERSION}/etc/images/fwd-arrow.xpm
+share/emacs/${VERSION}/etc/images/gnus/
+share/emacs/${VERSION}/etc/im