diff options
Diffstat (limited to 'misc/kdeutils3/patches/patch-af')
| -rw-r--r-- | misc/kdeutils3/patches/patch-af | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/misc/kdeutils3/patches/patch-af b/misc/kdeutils3/patches/patch-af index b3e5deaf1d7..e1ab8e90bbd 100644 --- a/misc/kdeutils3/patches/patch-af +++ b/misc/kdeutils3/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $ +$NetBSD: patch-af,v 1.4 2003/05/22 02:57:14 markd Exp $ ---- kedit/Makefile.in.orig Fri Jan 17 08:58:06 2003 +--- kedit/Makefile.in.orig Thu May 8 00:08:45 2003 +++ kedit/Makefile.in -@@ -256,16 +256,20 @@ x_libraries = @x_libraries@ +@@ -280,16 +280,20 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kedit @@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $ kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kedit.h ktextfiledlg.h\ -@@ -289,22 +293,29 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -313,34 +317,44 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -66,10 +66,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $ +kedit_OBJECTS = kedit_main.$(OBJEXT) +kedit_DEPENDENCIES = libkedit_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -313,14 +324,17 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kedit.Plo \ @@ -90,17 +87,17 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextfiledlg.Plo ./$(DEPDIR)/mail.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/optiondialog.Plo -@@ -343,7 +357,8 @@ CXXLD = $(CXX) +@@ -362,7 +376,8 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES) +DIST_SOURCES = $(kedit_la_SOURCES) $(libkedit_main_la_SOURCES) \ + $(kedit_SOURCES) DATA = $(apps_DATA) $(rc_DATA) HEADERS = $(noinst_HEADERS) -@@ -356,7 +371,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -376,7 +391,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \ Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) @@ -109,7 +106,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -403,6 +418,8 @@ clean-libLTLIBRARIES: +@@ -423,6 +438,8 @@ clean-libLTLIBRARIES: done kedit.la: $(kedit_la_OBJECTS) $(kedit_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kedit_la_LDFLAGS) $(kedit_la_OBJECTS) $(kedit_la_LIBADD) $(LIBS) @@ -118,7 +115,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -442,8 +459,9 @@ mostlyclean-compile: +@@ -462,8 +479,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -129,8 +126,8 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ktextfiledlg.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optiondialog.Plo@am__quote@ -@@ -613,7 +631,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -669,7 +687,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=optionstate.h keditui.rc KEdit.desktop @@ -138,7 +135,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -758,14 +776,15 @@ uninstall-info: uninstall-info-recursive +@@ -829,14 +847,15 @@ uninstall-info: uninstall-info-recursive messages: rc.cpp $(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot @@ -157,7 +154,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $ mail.moc: $(srcdir)/mail.h $(MOC) $(srcdir)/mail.h -o mail.moc -@@ -778,12 +797,8 @@ kedit.moc: $(srcdir)/kedit.h +@@ -849,12 +868,8 @@ kedit.moc: $(srcdir)/kedit.h $(MOC) $(srcdir)/kedit.h -o kedit.moc #>+ 3 @@ -171,7 +168,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $ #>+ 2 docs-am: -@@ -796,33 +811,33 @@ force-reedit: +@@ -867,33 +882,33 @@ force-reedit: #>+ 11 @@ -218,7 +215,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -833,10 +848,10 @@ kde-rpo-clean: +@@ -904,10 +919,10 @@ kde-rpo-clean: #>+ 9 optiondialog.o: optiondialog.moc |