From 7f486ccba19e8b6fbcd3c85b529c12ea3c1e089a Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 12 Nov 2001 22:07:49 +0000 Subject: [PATCH] let it build if automake is around (admin/am_edit generates buggy Makefile.in with loops, the kind that our make doesn't like) --- editors/kxmleditor/Makefile | 4 ++-- editors/kxmleditor/patches/patch-admin_am_edit | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 editors/kxmleditor/patches/patch-admin_am_edit diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile index dca9834b344..da39c7e96f6 100644 --- a/editors/kxmleditor/Makefile +++ b/editors/kxmleditor/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2001/10/27 15:23:39 kevlo Exp $ +# $OpenBSD: Makefile,v 1.7 2001/11/12 22:07:49 espie Exp $ COMMENT= "xml editor for KDE" @@ -21,7 +21,7 @@ MASTER_SITE_SUBDIR= kxmleditor BUILD_DEPENDS= ::x11/qt2-designer LIB_DEPENDS= kdecore.3,DCOP,kfile,kdeui,kparts,ksycoca,kio,kdesu,kssl::x11/kde/libs2 -PATCH_LIST=${PORTSDIR}/x11/kde/libs2/patches/p-* +PATCH_LIST=${PORTSDIR}/x11/kde/libs2/patches/p-* patch-* MODULES= qt2 diff --git a/editors/kxmleditor/patches/patch-admin_am_edit b/editors/kxmleditor/patches/patch-admin_am_edit new file mode 100644 index 00000000000..3efe4e6766f --- /dev/null +++ b/editors/kxmleditor/patches/patch-admin_am_edit @@ -0,0 +1,14 @@ +$OpenBSD: patch-admin_am_edit,v 1.1 2001/11/12 22:07:49 espie Exp $ +--- admin/am_edit.orig Mon Nov 12 18:55:28 2001 ++++ admin/am_edit Mon Nov 12 18:57:16 2001 +@@ -1546,7 +1546,9 @@ sub tag_DOCFILES () + } + $lookup = '\nindex.cache.bz2:'; + if ($MakefileData !~ /\n($lookup)/) { +- $lines .= "index.cache.bz2: \$(srcdir)/index.docbook \$(KDE_XSL_STYLESHEET) $files\n"; ++ $files2= $files; ++ $files2=~ s/\b\s*index.cache.bz2\s*\b/ /; ++ $lines .= "index.cache.bz2: \$(srcdir)/index.docbook \$(KDE_XSL_STYLESHEET) $files2\n"; + $lines .= "\t\@if test -n \"\$(MEINPROC)\"; then echo \$(MEINPROC) --check --cache index.cache.bz2 \$(srcdir)/index.docbook; \$(MEINPROC) --check --cache index.cache.bz2 \$(srcdir)/index.docbook; fi\n"; + $lines .= "\n"; + }