diff options
Diffstat (limited to 'net/kdenetwork3')
-rw-r--r-- | net/kdenetwork3/Makefile | 11 | ||||
-rw-r--r-- | net/kdenetwork3/PLIST | 6 | ||||
-rw-r--r-- | net/kdenetwork3/buildlink2.mk | 6 | ||||
-rw-r--r-- | net/kdenetwork3/distinfo | 12 | ||||
-rw-r--r-- | net/kdenetwork3/patches/patch-aa | 8 | ||||
-rw-r--r-- | net/kdenetwork3/patches/patch-af | 124 | ||||
-rw-r--r-- | net/kdenetwork3/patches/patch-aj | 30 |
7 files changed, 135 insertions, 62 deletions
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index ab4c1f37bd4..1a632683249 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.18 2003/07/13 13:52:55 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2003/07/30 13:58:35 markd Exp $ -DISTNAME= kdenetwork-3.1.2 -PKGREVISION= 1 +DISTNAME= kdenetwork-3.1.3 CATEGORIES= net COMMENT= Network modules for the KDE integrated X11 desktop -.include "../../x11/kde3/Makefile.kde3" +.include "../../meta-pkgs/kde3/Makefile.kde3" USE_BUILDLINK2= yes PTHREAD_OPTS+= require @@ -22,11 +21,11 @@ REPLACE_PERL= ksirc/dsirc CONFIGURE_ENV+= ac_cv_sys_file_offset_bits=no .endif -.include "../../x11/kde3/Makefile.foo_main" +.include "../../meta-pkgs/kde3/Makefile.foo_main" .include "../../converters/uulib/buildlink2.mk" .include "../../databases/gdbm/buildlink2.mk" -.include "../../x11/kde3/buildlink2.mk" +.include "../../meta-pkgs/kde3/buildlink2.mk" .include "../../x11/kdebase3/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" diff --git a/net/kdenetwork3/PLIST b/net/kdenetwork3/PLIST index e2d4dcb3323..e1d56b1e20c 100644 --- a/net/kdenetwork3/PLIST +++ b/net/kdenetwork3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2003/04/01 12:27:11 markd Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/07/30 13:58:36 markd Exp $ bin/dsirc bin/kdict bin/kget @@ -760,8 +760,8 @@ share/kde/apps/kppp/Rules/Italy/Infostrada_Libero1055_SpZero.rst share/kde/apps/kppp/Rules/Italy/Infostrada_Loc_Reg_Naz_SpZero.rst share/kde/apps/kppp/Rules/Italy/Infostrada_Locali_Base.rst share/kde/apps/kppp/Rules/Italy/Infostrada_Reg_Naz_Base.rst -share/kde/apps/kppp/Rules/Italy/Tele2_Interurbane.rst -share/kde/apps/kppp/Rules/Italy/Tele2_Urbane.rst +share/kde/apps/kppp/Rules/Italy/Tele2_Altri_ISP.rst +share/kde/apps/kppp/Rules/Italy/Tele2_Internet.rst share/kde/apps/kppp/Rules/Italy/Telecom_Interurbane_Fino15Km.rst share/kde/apps/kppp/Rules/Italy/Telecom_Interurbane_Oltre15Km.rst share/kde/apps/kppp/Rules/Italy/Telecom_Locali.rst diff --git a/net/kdenetwork3/buildlink2.mk b/net/kdenetwork3/buildlink2.mk index 47992eb6f25..100a2c1f39d 100644 --- a/net/kdenetwork3/buildlink2.mk +++ b/net/kdenetwork3/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.5 2003/07/13 13:52:55 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2003/07/30 13:58:36 markd Exp $ # # This Makefile fragment is included by packages that use kdenetwork. # @@ -9,7 +9,7 @@ KDENETWORK_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= kdenetwork -BUILDLINK_DEPENDS.kdenetwork?= kdenetwork>=3.1.2nb1 +BUILDLINK_DEPENDS.kdenetwork?= kdenetwork>=3.1.3 BUILDLINK_PKGSRCDIR.kdenetwork?= ../../net/kdenetwork3 EVAL_PREFIX+= BUILDLINK_PREFIX.kdenetwork=kdenetwork @@ -36,7 +36,7 @@ BUILDLINK_FILES.kdenetwork+= lib/libmimelib.* .include "../../converters/uulib/buildlink2.mk" .include "../../databases/gdbm/buildlink2.mk" -.include "../../x11/kde3/buildlink2.mk" +.include "../../meta-pkgs/kde3/buildlink2.mk" .include "../../x11/kdebase3/buildlink2.mk" BUILDLINK_TARGETS+= kdenetwork-buildlink diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index 1ae98865963..5ea3dd20253 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.15 2003/07/13 11:48:17 wulf Exp $ +$NetBSD: distinfo,v 1.16 2003/07/30 13:58:36 markd Exp $ -SHA1 (kdenetwork-3.1.2.tar.bz2) = 41fbf47e0b3301a6eb480e8d94f84f7b6ea58f02 -Size (kdenetwork-3.1.2.tar.bz2) = 4995101 bytes -SHA1 (patch-aa) = e34c95949df5a6e4836db458b8c56b574a78a9a4 +SHA1 (kdenetwork-3.1.3.tar.bz2) = a1e1a4c6b27c0e6a6c4d136d3dcca21c38488f77 +Size (kdenetwork-3.1.3.tar.bz2) = 4989774 bytes +SHA1 (patch-aa) = 1050ca130a50a2f64c72e9e2933016339844ef88 SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855 SHA1 (patch-ad) = 916bcbe11ca71f7a0f5f03c91fa18a6af9197be2 SHA1 (patch-ae) = 8b58afa071bd3f47577e5aeb46210ae77690b8bb -SHA1 (patch-af) = b707dd12917f7c46192e1702e9affc09473cb611 +SHA1 (patch-af) = 2c7bc0c148c2b45f9edef02e879833a196689609 SHA1 (patch-ag) = 41838a86a06877deb2635470a79aeb104cd56474 SHA1 (patch-ai) = 90a97f8354c477ddb1d4600e715520adde329417 -SHA1 (patch-aj) = d780a0b1713562edc517f763d693152fb85f26f1 +SHA1 (patch-aj) = 89dc1011d79e22103c03f128afd4fb1d66083187 SHA1 (patch-al) = 13c6bfb20fc49ae22d30029044808c9b77747754 SHA1 (patch-am) = 6c698e49cb342b619df7c05ff6b54049af67a0aa diff --git a/net/kdenetwork3/patches/patch-aa b/net/kdenetwork3/patches/patch-aa index bf88072ba96..0cf39d07ad7 100644 --- a/net/kdenetwork3/patches/patch-aa +++ b/net/kdenetwork3/patches/patch-aa @@ -1,15 +1,15 @@ -$NetBSD: patch-aa,v 1.6 2003/05/22 02:53:24 markd Exp $ +$NetBSD: patch-aa,v 1.7 2003/07/30 13:58:37 markd Exp $ ---- configure.orig Thu May 8 00:38:01 2003 +--- configure.orig 2003-07-15 22:08:08.000000000 +1200 +++ configure -@@ -28610,65 +28610,6 @@ _ACEOF +@@ -28619,65 +28619,6 @@ _ACEOF - echo "$as_me:$LINENO: checking sizeof(size_t) == sizeof(unsigned long)" >&5 -echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" +-/* #line $LINENO "configure" */ -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext diff --git a/net/kdenetwork3/patches/patch-af b/net/kdenetwork3/patches/patch-af index 9bf4e7395c7..3c6171b7249 100644 --- a/net/kdenetwork3/patches/patch-af +++ b/net/kdenetwork3/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ +$NetBSD: patch-af,v 1.6 2003/07/30 13:58:37 markd Exp $ ---- ksirc/Makefile.in.orig Thu May 8 00:37:59 2003 +--- ksirc/Makefile.in.orig 2003-07-15 22:08:06.000000000 +1200 +++ ksirc/Makefile.in -@@ -302,13 +302,13 @@ testview_SOURCES = kstextviewtest.cpp +@@ -303,13 +303,13 @@ testview_SOURCES = kstextviewtest.cpp testview_LDADD = kstextview.lo $(LIB_KDEUI) testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) @@ -18,7 +18,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ #>- toplevel.cpp \ #>- charSelector.cpp \ #>- chanButtons.cpp \ -@@ -341,7 +341,7 @@ noinst_PROGRAMS = getdate +@@ -342,7 +342,7 @@ noinst_PROGRAMS = getdate #>- kstextview.cpp \ #>- colorpicker.cpp #>+ 32 @@ -27,7 +27,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ toplevel.cpp \ charSelector.cpp \ chanButtons.cpp \ -@@ -376,8 +376,11 @@ ksirc_la_SOURCES=\ +@@ -377,8 +377,11 @@ ksirc_la_SOURCES=\ # the library search path @@ -40,7 +40,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ all_ksirc_libraries = \ ./KSPrefs/libksprefs.la \ -@@ -388,10 +391,10 @@ all_ksirc_libraries = \ +@@ -389,10 +392,10 @@ all_ksirc_libraries = \ # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. @@ -54,7 +54,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ ksirc_LDFLAGS = $(all_libraries) $(KDE_RPATH) getdate_SOURCES = getdate.c -@@ -450,9 +453,14 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -451,9 +454,14 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -71,7 +71,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ ksirc.lo alistbox.lo ahistlineedit.lo iocontroller.lo \ NewWindowDialog.lo messageReceiver.lo ioBroadcast.lo \ ksircprocess.lo servercontroller.lo FilterRuleEditor.lo \ -@@ -461,10 +469,10 @@ am_ksirc_la_OBJECTS = toplevel.lo charSe +@@ -462,10 +470,10 @@ am_ksirc_la_OBJECTS = toplevel.lo charSe baserules.lo chanparser.lo objFinder.lo displayMgrSDI.lo \ displayMgrMDI.lo mditoplevel.lo ksopts.lo topic.lo ksview.lo \ logfile.lo kstextview.lo colorpicker.lo @@ -85,7 +85,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ ksirc.lo alistbox.lo ahistlineedit.lo iocontroller.lo \ NewWindowDialog.lo messageReceiver.lo ioBroadcast.lo \ ksircprocess.lo servercontroller.lo FilterRuleEditor.lo \ -@@ -473,8 +481,8 @@ ksirc_la_nofinal_OBJECTS = toplevel.lo c +@@ -474,8 +482,8 @@ ksirc_la_nofinal_OBJECTS = toplevel.lo c baserules.lo chanparser.lo objFinder.lo displayMgrSDI.lo \ displayMgrMDI.lo mditoplevel.lo ksopts.lo topic.lo ksview.lo \ logfile.lo kstextview.lo colorpicker.lo FilterRuleWidget.lo @@ -96,7 +96,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ bin_PROGRAMS = ksirc$(EXEEXT) check_PROGRAMS = testview$(EXEEXT) noinst_PROGRAMS = getdate$(EXEEXT) -@@ -487,11 +495,11 @@ getdate_OBJECTS = getdate.$(OBJEXT) +@@ -488,11 +496,11 @@ getdate_OBJECTS = getdate.$(OBJEXT) getdate_LDADD = $(LDADD) getdate_DEPENDENCIES = getdate_LDFLAGS = @@ -111,7 +111,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ am_testview_OBJECTS = kstextviewtest.$(OBJEXT) #>- testview_OBJECTS = $(am_testview_OBJECTS) #>+ 1 -@@ -514,11 +522,13 @@ am__depfiles_maybe = depfiles +@@ -515,11 +523,13 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@ ./$(DEPDIR)/dccDialog.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/dccDialogData.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrMDI.Plo \ @@ -126,7 +126,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ #>- @AMDEP_TRUE@ ./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kstextview.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kstextviewtest.Po \ -@@ -531,8 +541,8 @@ am__depfiles_maybe = depfiles +@@ -532,8 +542,8 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@ ./$(DEPDIR)/ssfepromptdata.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/topic.Plo ./$(DEPDIR)/toplevel.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/usercontrolmenu.Plo @@ -137,7 +137,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/NewWindowDialog.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ahistlineedit.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/alistbox.Plo ./$(DEPDIR)/baserules.Plo \ -@@ -543,11 +553,13 @@ am__depfiles_maybe = depfiles +@@ -544,11 +554,13 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dccDialog.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dccDialogData.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrMDI.Plo \ @@ -152,7 +152,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstextview.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstextviewtest.Po \ -@@ -571,11 +583,13 @@ am__depfiles_maybe = depfiles +@@ -572,11 +584,13 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dccDialog.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dccDialogData.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrMDI.Plo \ @@ -167,7 +167,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstextview.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstextviewtest.Po \ -@@ -614,8 +628,8 @@ CXXLD = $(CXX) +@@ -615,8 +629,8 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -178,7 +178,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ DATA = $(apps_DATA) $(conf_DATA) $(misc_DATA) HEADERS = $(noinst_HEADERS) -@@ -628,7 +642,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -629,7 +643,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r check-recursive installcheck-recursive DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -187,7 +187,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -675,6 +689,8 @@ clean-libLTLIBRARIES: +@@ -676,6 +690,8 @@ clean-libLTLIBRARIES: done ksirc.la: $(ksirc_la_OBJECTS) $(ksirc_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(ksirc_la_LDFLAGS) $(ksirc_la_OBJECTS) $(ksirc_la_LIBADD) $(LIBS) @@ -196,7 +196,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -767,7 +783,6 @@ distclean-compile: +@@ -768,7 +784,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dccDialogData.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displayMgrMDI.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displayMgrSDI.Plo@am__quote@ @@ -204,7 +204,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioBroadcast.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioDCC.Plo@am__quote@ -@@ -776,6 +791,8 @@ distclean-compile: +@@ -777,6 +792,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioNotify.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iocontroller.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc.Plo@am__quote@ @@ -213,16 +213,16 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksircprocess.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksopts.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstextview.Plo@am__quote@ -@@ -1044,7 +1061,7 @@ distclean-tags: +@@ -1045,7 +1062,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=sirc.help.gz eventsrc displayMgrMDI.h Artistic default.pl kstextview.h charSelector.h relnotes filters.pl openksircproc.dlg FilterRuleWidget.ui servercontroller.dlg dccDialog.dlg chanButtons.h topic.h ksircrc ksirc.pl stringparserstate.h FilterRuleEditor.dlg ksirc.desktop FAQ logfile.h colorpicker.h dsirc mditoplevel.h version.h -+KDE_DIST=FilterRuleEditor.dlg stringparserstate.h FAQ mditoplevel.h ksircrc FilterRuleWidget.ui charSelector.h kstextview.h default.pl sirc.help.gz dsirc filters.pl openksircproc.dlg Artistic logfile.h servercontroller.dlg topic.h displayMgrMDI.h chanButtons.h ksirc.pl ksirc.desktop version.h relnotes eventsrc dccDialog.dlg colorpicker.h ++KDE_DIST=FilterRuleEditor.dlg stringparserstate.h FAQ mditoplevel.h Makefile.in.rej ksircrc FilterRuleWidget.ui charSelector.h kstextview.h default.pl sirc.help.gz dsirc filters.pl openksircproc.dlg Artistic logfile.h servercontroller.dlg topic.h displayMgrMDI.h chanButtons.h ksirc.pl ksirc.desktop version.h relnotes eventsrc dccDialog.dlg colorpicker.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -1220,127 +1237,124 @@ messages: rc.cpp +@@ -1221,64 +1238,58 @@ messages: rc.cpp $(EXTRACTRC) KSOpenkSirc/*.ui >> rc.cpp $(EXTRACTRC) KSPrefs/*.ui >> rc.cpp $(XGETTEXT) *.cpp */*.cpp -o $(podir)/ksirc.pot @@ -250,137 +250,203 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ -FilterRuleWidget.moc: FilterRuleWidget.h - $(MOC) FilterRuleWidget.h -o FilterRuleWidget.moc ++#>+ 1 ++mocs: iocontroller.moc +#>+ 3 +charSelector.moc: $(srcdir)/charSelector.h + $(MOC) $(srcdir)/charSelector.h -o charSelector.moc ++#>+ 1 ++mocs: charSelector.moc #>+ 3 -ksircprocess.moc: $(srcdir)/ksircprocess.h - $(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc +ioLAG.moc: $(srcdir)/ioLAG.h + $(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc + #>+ 1 +-mocs: ksircprocess.moc ++mocs: ioLAG.moc #>+ 3 -servercontroller.moc: $(srcdir)/servercontroller.h - $(MOC) $(srcdir)/servercontroller.h -o servercontroller.moc +NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h + $(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc + #>+ 1 +-mocs: servercontroller.moc ++mocs: NewWindowDialog.moc #>+ 3 -ioDCC.moc: $(srcdir)/ioDCC.h - $(MOC) $(srcdir)/ioDCC.h -o ioDCC.moc +ssfepromptdata.moc: $(srcdir)/ssfepromptdata.h + $(MOC) $(srcdir)/ssfepromptdata.h -o ssfepromptdata.moc + #>+ 1 +-mocs: ioDCC.moc ++mocs: ssfepromptdata.moc #>+ 3 -ssfeprompt.moc: $(srcdir)/ssfeprompt.h - $(MOC) $(srcdir)/ssfeprompt.h -o ssfeprompt.moc +kstextview.moc: $(srcdir)/kstextview.h + $(MOC) $(srcdir)/kstextview.h -o kstextview.moc + #>+ 1 +-mocs: ssfeprompt.moc ++mocs: kstextview.moc #>+ 3 -FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h - $(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc +ksview.moc: $(srcdir)/ksview.h + $(MOC) $(srcdir)/ksview.h -o ksview.moc + #>+ 1 +-mocs: FilterRuleEditor.moc ++mocs: ksview.moc #>+ 3 -ahistlineedit.moc: $(srcdir)/ahistlineedit.h - $(MOC) $(srcdir)/ahistlineedit.h -o ahistlineedit.moc +objFinder.moc: $(srcdir)/objFinder.h + $(MOC) $(srcdir)/objFinder.h -o objFinder.moc + #>+ 1 +-mocs: ahistlineedit.moc ++mocs: objFinder.moc #>+ 3 chanButtons.moc: $(srcdir)/chanButtons.h $(MOC) $(srcdir)/chanButtons.h -o chanButtons.moc - +@@ -1286,41 +1297,41 @@ chanButtons.moc: $(srcdir)/chanButtons.h + #>+ 1 + mocs: chanButtons.moc #>+ 3 -alistbox.moc: $(srcdir)/alistbox.h - $(MOC) $(srcdir)/alistbox.h -o alistbox.moc +ioDCC.moc: $(srcdir)/ioDCC.h + $(MOC) $(srcdir)/ioDCC.h -o ioDCC.moc + #>+ 1 +-mocs: alistbox.moc ++mocs: ioDCC.moc #>+ 3 -iocontroller.moc: $(srcdir)/iocontroller.h - $(MOC) $(srcdir)/iocontroller.h -o iocontroller.moc +toplevel.moc: $(srcdir)/toplevel.h + $(MOC) $(srcdir)/toplevel.h -o toplevel.moc + #>+ 1 +-mocs: iocontroller.moc ++mocs: toplevel.moc #>+ 3 -dccDialog.moc: $(srcdir)/dccDialog.h - $(MOC) $(srcdir)/dccDialog.h -o dccDialog.moc +displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h + $(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc + #>+ 1 +-mocs: dccDialog.moc ++mocs: displayMgrMDI.moc #>+ 3 -ksview.moc: $(srcdir)/ksview.h - $(MOC) $(srcdir)/ksview.h -o ksview.moc +ksircprocess.moc: $(srcdir)/ksircprocess.h + $(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc + #>+ 1 +-mocs: ksview.moc ++mocs: ksircprocess.moc #>+ 3 -ioLAG.moc: $(srcdir)/ioLAG.h - $(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc +dccDialogData.moc: $(srcdir)/dccDialogData.h + $(MOC) $(srcdir)/dccDialogData.h -o dccDialogData.moc + #>+ 1 +-mocs: ioLAG.moc ++mocs: dccDialogData.moc #>+ 3 -mditoplevel.moc: $(srcdir)/mditoplevel.h - $(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc +ssfeprompt.moc: $(srcdir)/ssfeprompt.h + $(MOC) $(srcdir)/ssfeprompt.h -o ssfeprompt.moc + #>+ 1 +-mocs: mditoplevel.moc ++mocs: ssfeprompt.moc #>+ 3 colorpicker.moc: $(srcdir)/colorpicker.h $(MOC) $(srcdir)/colorpicker.h -o colorpicker.moc - +@@ -1328,68 +1339,71 @@ colorpicker.moc: $(srcdir)/colorpicker.h + #>+ 1 + mocs: colorpicker.moc #>+ 3 +servercontroller.moc: $(srcdir)/servercontroller.h + $(MOC) $(srcdir)/servercontroller.h -o servercontroller.moc + ++#>+ 1 ++mocs: servercontroller.moc +#>+ 3 topic.moc: $(srcdir)/topic.h $(MOC) $(srcdir)/topic.h -o topic.moc + #>+ 1 + mocs: topic.moc #>+ 3 -objFinder.moc: $(srcdir)/objFinder.h - $(MOC) $(srcdir)/objFinder.h -o objFinder.moc +alistbox.moc: $(srcdir)/alistbox.h + $(MOC) $(srcdir)/alistbox.h -o alistbox.moc + #>+ 1 +-mocs: objFinder.moc ++mocs: alistbox.moc #>+ 3 -displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h - $(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc +ioNotify.moc: $(srcdir)/ioNotify.h + $(MOC) $(srcdir)/ioNotify.h -o ioNotify.moc + #>+ 1 +-mocs: displayMgrMDI.moc ++mocs: ioNotify.moc #>+ 3 -dccDialogData.moc: $(srcdir)/dccDialogData.h - $(MOC) $(srcdir)/dccDialogData.h -o dccDialogData.moc +mditoplevel.moc: $(srcdir)/mditoplevel.h + $(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc + #>+ 1 +-mocs: dccDialogData.moc ++mocs: mditoplevel.moc #>+ 3 -ssfepromptdata.moc: $(srcdir)/ssfepromptdata.h - $(MOC) $(srcdir)/ssfepromptdata.h -o ssfepromptdata.moc +FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h + $(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc + #>+ 1 +-mocs: ssfepromptdata.moc ++mocs: FilterRuleEditor.moc #>+ 3 -charSelector.moc: $(srcdir)/charSelector.h - $(MOC) $(srcdir)/charSelector.h -o charSelector.moc +dccDialog.moc: $(srcdir)/dccDialog.h + $(MOC) $(srcdir)/dccDialog.h -o dccDialog.moc + #>+ 1 +-mocs: charSelector.moc ++mocs: dccDialog.moc #>+ 3 -NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h - $(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc +ahistlineedit.moc: $(srcdir)/ahistlineedit.h + $(MOC) $(srcdir)/ahistlineedit.h -o ahistlineedit.moc + #>+ 1 +-mocs: NewWindowDialog.moc -#>+ 3 -toplevel.moc: $(srcdir)/toplevel.h - $(MOC) $(srcdir)/toplevel.h -o toplevel.moc ++mocs: ahistlineedit.moc +#>+ 14 +FilterRuleWidget.cpp: $(srcdir)/FilterRuleWidget.ui FilterRuleWidget.h FilterRuleWidget.moc + rm -f FilterRuleWidget.cpp @@ -390,18 +456,24 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ + rm -f FilterRuleWidget.cpp.temp ;\ + if test "$$ret" = 0; then echo '#include "FilterRuleWidget.moc"' >> FilterRuleWidget.cpp; else rm -f FilterRuleWidget.cpp ; exit $$ret ; fi +-#>+ 1 +-mocs: toplevel.moc -#>+ 3 -kstextview.moc: $(srcdir)/kstextview.h - $(MOC) $(srcdir)/kstextview.h -o kstextview.moc +FilterRuleWidget.h: $(srcdir)/FilterRuleWidget.ui + $(UIC) -o FilterRuleWidget.h $(srcdir)/FilterRuleWidget.ui +-#>+ 1 +-mocs: kstextview.moc -#>+ 3 -ioNotify.moc: $(srcdir)/ioNotify.h - $(MOC) $(srcdir)/ioNotify.h -o ioNotify.moc +FilterRuleWidget.moc: FilterRuleWidget.h + $(MOC) FilterRuleWidget.h -o FilterRuleWidget.moc +-#>+ 1 +-mocs: ioNotify.moc #>+ 3 clean-metasources: - -rm -f ksircprocess.moc servercontroller.moc ioDCC.moc ssfeprompt.moc FilterRuleEditor.moc ahistlineedit.moc chanButtons.moc alistbox.moc iocontroller.moc dccDialog.moc ksview.moc ioLAG.moc mditoplevel.moc colorpicker.moc topic.moc objFinder.moc displayMgrMDI.moc dccDialogData.moc ssfepromptdata.moc charSelector.moc NewWindowDialog.moc toplevel.moc kstextview.moc ioNotify.moc @@ -409,7 +481,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ #>+ 4 clean-ui: -@@ -1464,33 +1478,33 @@ $(srcdir)/colorpicker.cpp: FilterRuleWid +@@ -1513,33 +1527,33 @@ $(srcdir)/colorpicker.cpp: FilterRuleWid FilterRuleWidget.cpp: cdate.h #>+ 11 @@ -456,7 +528,7 @@ $NetBSD: patch-af,v 1.5 2003/05/22 02:53:24 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1500,51 +1514,51 @@ kde-rpo-clean: +@@ -1549,51 +1563,51 @@ kde-rpo-clean: -rm -f *.rpo #>+ 49 diff --git a/net/kdenetwork3/patches/patch-aj b/net/kdenetwork3/patches/patch-aj index 5f4fd4e6f03..bf1b403ae9d 100644 --- a/net/kdenetwork3/patches/patch-aj +++ b/net/kdenetwork3/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.5 2003/05/22 02:53:24 markd Exp $ +$NetBSD: patch-aj,v 1.6 2003/07/30 13:58:38 markd Exp $ ---- kxmlrpc/Makefile.in.orig Thu May 8 00:37:59 2003 +--- kxmlrpc/Makefile.in.orig 2003-07-15 22:08:06.000000000 +1200 +++ kxmlrpc/Makefile.in -@@ -290,18 +290,23 @@ x_libraries = @x_libraries@ +@@ -291,18 +291,23 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kxmlrpcd @@ -32,7 +32,7 @@ $NetBSD: patch-aj,v 1.5 2003/05/22 02:53:24 markd Exp $ #>- kxmlrpcd_la_METASOURCES = AUTO kcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE) -@@ -323,42 +328,50 @@ am_kcm_xmlrpcd_la_OBJECTS = kxmlrpcinit. +@@ -324,42 +329,50 @@ am_kcm_xmlrpcd_la_OBJECTS = kxmlrpcinit. #>- kcm_xmlrpcd_la_OBJECTS = $(am_kcm_xmlrpcd_la_OBJECTS) #>+ 1 kcm_xmlrpcd_la_OBJECTS = kxmlrpcinit.lo @@ -97,7 +97,7 @@ $NetBSD: patch-aj,v 1.5 2003/05/22 02:53:24 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcdaemon.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcinit.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcparser.Plo \ -@@ -384,13 +397,13 @@ CXXLD = $(CXX) +@@ -385,13 +398,13 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(kcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_la_SOURCES) \ @@ -113,7 +113,7 @@ $NetBSD: patch-aj,v 1.5 2003/05/22 02:53:24 markd Exp $ #>- all: all-am #>+ 1 -@@ -470,6 +483,8 @@ clean-libLTLIBRARIES: +@@ -471,6 +484,8 @@ clean-libLTLIBRARIES: $(CXXLINK) -rpath $(kde_moduledir) $(kcm_xmlrpcd_la_LDFLAGS) $(kcm_xmlrpcd_la_OBJECTS) $(kcm_xmlrpcd_la_LIBADD) $(LIBS) kxmlrpcd.la: $(kxmlrpcd_la_OBJECTS) $(kxmlrpcd_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kxmlrpcd_la_LDFLAGS) $(kxmlrpcd_la_OBJECTS) $(kxmlrpcd_la_LIBADD) $(LIBS) @@ -122,7 +122,7 @@ $NetBSD: patch-aj,v 1.5 2003/05/22 02:53:24 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -509,7 +524,8 @@ mostlyclean-compile: +@@ -510,7 +525,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -132,22 +132,24 @@ $NetBSD: patch-aj,v 1.5 2003/05/22 02:53:24 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcdaemon.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcinit.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcparser.Plo@am__quote@ -@@ -635,7 +651,7 @@ distclean-tags: +@@ -636,7 +652,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kxmlrpcd.desktop LICENSE -+KDE_DIST=LICENSE kxmlrpcd.desktop ++KDE_DIST=LICENSE kxmlrpcd.desktop Makefile.in.rej DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -801,8 +817,12 @@ kxmlrpcserver.moc: $(srcdir)/kxmlrpcserv - $(MOC) $(srcdir)/kxmlrpcserver.h -o kxmlrpcserver.moc - +@@ -804,8 +820,14 @@ kxmlrpcserver.moc: $(srcdir)/kxmlrpcserv + #>+ 1 + mocs: kxmlrpcserver.moc #>+ 3 +kxmlrpcserver.moc: $(srcdir)/kxmlrpcserver.h + $(MOC) $(srcdir)/kxmlrpcserver.h -o kxmlrpcserver.moc + ++#>+ 1 ++mocs: kxmlrpcserver.moc +#>+ 3 clean-metasources: - -rm -f kxmlrpcserver.moc @@ -155,7 +157,7 @@ $NetBSD: patch-aj,v 1.5 2003/05/22 02:53:24 markd Exp $ #>+ 3 clean-closures: -@@ -819,33 +839,33 @@ force-reedit: +@@ -822,33 +844,33 @@ force-reedit: #>+ 11 @@ -202,7 +204,7 @@ $NetBSD: patch-aj,v 1.5 2003/05/22 02:53:24 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -855,5 +875,5 @@ kde-rpo-clean: +@@ -858,5 +880,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 |