Fix PLIST and make patch apply again (the relevant parts were

integrated upstream).
This commit is contained in:
Thomas Klausner 2008-06-11 14:35:39 +00:00
parent 02870b58ee
commit a3a338c787
3 changed files with 22 additions and 46 deletions

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.54 2008/05/15 11:03:39 thomasklausner Exp $
@comment $NetBSD: PLIST,v 1.55 2008/06/11 14:35:39 thomasklausner Exp $
bin/b2m
bin/ctags
bin/ebrowse
@ -77,7 +77,6 @@ share/emacs/${PKGVERSION}/etc/DEBUG
share/emacs/${PKGVERSION}/etc/DEVEL.HUMOR
share/emacs/${PKGVERSION}/etc/DISTRIB
share/emacs/${PKGVERSION}/etc/DOC-${PKGVERSION}.1
share/emacs/${PKGVERSION}/etc/DOC-${PKGVERSION}.2
share/emacs/${PKGVERSION}/etc/ERC-NEWS
share/emacs/${PKGVERSION}/etc/ETAGS.EBNF
share/emacs/${PKGVERSION}/etc/ETAGS.README
@ -923,8 +922,7 @@ share/emacs/${PKGVERSION}/leim/quail/greek.el.gz
share/emacs/${PKGVERSION}/leim/quail/greek.elc
share/emacs/${PKGVERSION}/leim/quail/hangul.el.gz
share/emacs/${PKGVERSION}/leim/quail/hangul.elc
share/emacs/${PKGVERSION}/leim/quail/hangul3.el.gz
share/emacs/${PKGVERSION}/leim/quail/hangul3.elc
share/emacs/${PKGVERSION}/leim/quail/hangul3.el
share/emacs/${PKGVERSION}/leim/quail/hanja-jis.el.gz
share/emacs/${PKGVERSION}/leim/quail/hanja-jis.elc
share/emacs/${PKGVERSION}/leim/quail/hanja.el.gz
@ -1610,6 +1608,8 @@ share/emacs/${PKGVERSION}/lisp/expand.el.gz
share/emacs/${PKGVERSION}/lisp/expand.elc
share/emacs/${PKGVERSION}/lisp/ezimage.el.gz
share/emacs/${PKGVERSION}/lisp/ezimage.elc
share/emacs/${PKGVERSION}/lisp/face-remap.el.gz
share/emacs/${PKGVERSION}/lisp/face-remap.elc
share/emacs/${PKGVERSION}/lisp/facemenu.el.gz
share/emacs/${PKGVERSION}/lisp/facemenu.elc
share/emacs/${PKGVERSION}/lisp/faces.el.gz
@ -1837,6 +1837,8 @@ share/emacs/${PKGVERSION}/lisp/gnus/nnheader.el.gz
share/emacs/${PKGVERSION}/lisp/gnus/nnheader.elc
share/emacs/${PKGVERSION}/lisp/gnus/nnimap.el.gz
share/emacs/${PKGVERSION}/lisp/gnus/nnimap.elc
share/emacs/${PKGVERSION}/lisp/gnus/nnir.el.gz
share/emacs/${PKGVERSION}/lisp/gnus/nnir.elc
share/emacs/${PKGVERSION}/lisp/gnus/nnkiboze.el.gz
share/emacs/${PKGVERSION}/lisp/gnus/nnkiboze.elc
share/emacs/${PKGVERSION}/lisp/gnus/nnlistserv.el.gz
@ -2083,6 +2085,8 @@ share/emacs/${PKGVERSION}/lisp/language/european.el.gz
share/emacs/${PKGVERSION}/lisp/language/european.elc
share/emacs/${PKGVERSION}/lisp/language/georgian.el
share/emacs/${PKGVERSION}/lisp/language/greek.el
share/emacs/${PKGVERSION}/lisp/language/hanja-util.el.gz
share/emacs/${PKGVERSION}/lisp/language/hanja-util.elc
share/emacs/${PKGVERSION}/lisp/language/hebrew.el
share/emacs/${PKGVERSION}/lisp/language/ind-util.el.gz
share/emacs/${PKGVERSION}/lisp/language/ind-util.elc
@ -2332,6 +2336,16 @@ share/emacs/${PKGVERSION}/lisp/net/net-utils.el.gz
share/emacs/${PKGVERSION}/lisp/net/net-utils.elc
share/emacs/${PKGVERSION}/lisp/net/netrc.el.gz
share/emacs/${PKGVERSION}/lisp/net/netrc.elc
share/emacs/${PKGVERSION}/lisp/net/newsticker-backend.el.gz
share/emacs/${PKGVERSION}/lisp/net/newsticker-backend.elc
share/emacs/${PKGVERSION}/lisp/net/newsticker-plainview.el.gz
share/emacs/${PKGVERSION}/lisp/net/newsticker-plainview.elc
share/emacs/${PKGVERSION}/lisp/net/newsticker-reader.el.gz
share/emacs/${PKGVERSION}/lisp/net/newsticker-reader.elc
share/emacs/${PKGVERSION}/lisp/net/newsticker-ticker.el.gz
share/emacs/${PKGVERSION}/lisp/net/newsticker-ticker.elc
share/emacs/${PKGVERSION}/lisp/net/newsticker-treeview.el.gz
share/emacs/${PKGVERSION}/lisp/net/newsticker-treeview.elc
share/emacs/${PKGVERSION}/lisp/net/newsticker.el.gz
share/emacs/${PKGVERSION}/lisp/net/newsticker.elc
share/emacs/${PKGVERSION}/lisp/net/ntlm.el.gz
@ -2437,20 +2451,10 @@ share/emacs/${PKGVERSION}/lisp/nxml/xmltok.el.gz
share/emacs/${PKGVERSION}/lisp/nxml/xmltok.elc
share/emacs/${PKGVERSION}/lisp/nxml/xsd-regexp.el.gz
share/emacs/${PKGVERSION}/lisp/nxml/xsd-regexp.elc
share/emacs/${PKGVERSION}/lisp/obsolete/auto-show.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/auto-show.elc
share/emacs/${PKGVERSION}/lisp/obsolete/awk-mode.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/awk-mode.elc
share/emacs/${PKGVERSION}/lisp/obsolete/bg-mouse.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/bg-mouse.elc
share/emacs/${PKGVERSION}/lisp/obsolete/fast-lock.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/fast-lock.elc
share/emacs/${PKGVERSION}/lisp/obsolete/float.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/float.elc
share/emacs/${PKGVERSION}/lisp/obsolete/hilit19.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/hilit19.elc
share/emacs/${PKGVERSION}/lisp/obsolete/hscroll.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/hscroll.elc
share/emacs/${PKGVERSION}/lisp/obsolete/iso-acc.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/iso-acc.elc
share/emacs/${PKGVERSION}/lisp/obsolete/iso-insert.el.gz
@ -2460,32 +2464,20 @@ share/emacs/${PKGVERSION}/lisp/obsolete/iso-swed.elc
share/emacs/${PKGVERSION}/lisp/obsolete/keyswap.el
share/emacs/${PKGVERSION}/lisp/obsolete/lazy-lock.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/lazy-lock.elc
share/emacs/${PKGVERSION}/lisp/obsolete/lselect.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/lselect.elc
share/emacs/${PKGVERSION}/lisp/obsolete/mlsupport.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/mlsupport.elc
share/emacs/${PKGVERSION}/lisp/obsolete/old-whitespace.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/old-whitespace.elc
share/emacs/${PKGVERSION}/lisp/obsolete/ooutline.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/ooutline.elc
share/emacs/${PKGVERSION}/lisp/obsolete/options.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/options.elc
share/emacs/${PKGVERSION}/lisp/obsolete/profile.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/profile.elc
share/emacs/${PKGVERSION}/lisp/obsolete/rnews.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/rnews.elc
share/emacs/${PKGVERSION}/lisp/obsolete/rnewspost.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/rnewspost.elc
share/emacs/${PKGVERSION}/lisp/obsolete/rsz-mini.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/rsz-mini.elc
share/emacs/${PKGVERSION}/lisp/obsolete/sc.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/sc.elc
share/emacs/${PKGVERSION}/lisp/obsolete/scribe.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/scribe.elc
share/emacs/${PKGVERSION}/lisp/obsolete/swedish.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/swedish.elc
share/emacs/${PKGVERSION}/lisp/obsolete/uncompress.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/uncompress.elc
share/emacs/${PKGVERSION}/lisp/obsolete/x-menu.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/x-menu.elc
share/emacs/${PKGVERSION}/lisp/org/org-agenda.el.gz

View file

@ -1,3 +1,3 @@
$NetBSD: distinfo,v 1.12 2008/04/24 10:41:24 thomasklausner Exp $
$NetBSD: distinfo,v 1.13 2008/06/11 14:35:39 thomasklausner Exp $
SHA1 (patch-ab) = e935f26499d24a0334858c1172d0fe5cc6336bd8
SHA1 (patch-ab) = 52672f9b3f08d3be18b7131c34523166227dd827

View file

@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.7 2008/04/24 10:41:24 thomasklausner Exp $
$NetBSD: patch-ab,v 1.8 2008/06/11 14:35:39 thomasklausner Exp $
--- configure.orig 2008-04-18 17:48:03.000000000 +0200
--- configure.orig 2008-06-10 15:19:18.000000000 +0000
+++ configure
@@ -1847,7 +1847,7 @@ archlibdir='${libexecdir}/emacs/${versio
docdir='${datadir}/emacs/${version}/etc'
@ -11,19 +11,3 @@ $NetBSD: patch-ab,v 1.7 2008/04/24 10:41:24 thomasklausner Exp $
@@ -24052,13 +24052,13 @@ cat >>confdefs.h <<\_ACEOF
#define USE_X_TOOLKIT 1
_ACEOF
- if test "${USE_X_TOOLKIT}" == "LUCID"; then
+ if test "${USE_X_TOOLKIT}" = "LUCID"; then
cat >>confdefs.h <<\_ACEOF
#define USE_LUCID 1
_ACEOF
- elif test "${USE_X_TOOLKIT}" == "MOTIF"; then
+ elif test "${USE_X_TOOLKIT}" = "MOTIF"; then
cat >>confdefs.h <<\_ACEOF
#define USE_MOTIF 1