diff options
362 files changed, 14733 insertions, 1277 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index 42d7e7fffe93..d1ab1df6523f 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeutils -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo index 562818721e98..2a396fa164aa 100644 --- a/archivers/ark/distinfo +++ b/archivers/ark/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5 +MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a diff --git a/archivers/ark/files/patch-portable.cpp b/archivers/ark/files/patch-portable.cpp new file mode 100644 index 000000000000..d6746dc1c282 --- /dev/null +++ b/archivers/ark/files/patch-portable.cpp @@ -0,0 +1,20 @@ +--- klaptopdaemon/portable.cpp- Thu Jun 28 00:08:02 2001 ++++ klaptopdaemon/portable.cpp Thu Jun 28 00:08:22 2001 +@@ -453,7 +453,7 @@ + if (ret == -1) + return 0; + +- return (info.ai_batt_time != 0xffff); ++ return (info.ai_batt_time != -1); + } + + // +@@ -638,7 +638,7 @@ + + p.powered = info.ai_acline; + p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life); +- p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1); ++ p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1); + return(p); + + bad: diff --git a/archivers/ark/pkg-plist b/archivers/ark/pkg-plist index 451d3587f1ef..a26fa72c3a97 100644 --- a/archivers/ark/pkg-plist +++ b/archivers/ark/pkg-plist @@ -251,7 +251,6 @@ share/services/arkpart.desktop @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpm @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/klprfax @@ -308,7 +307,6 @@ share/services/arkpart.desktop @dirrm share/apps/ark/icons/hicolor @dirrm share/apps/ark/icons @dirrm share/apps/ark -@dirrm share/apps @dirrm share/applnk/Utilities @dirrm share/applnk/System @dirrm share/applnk/Settings/PowerControl @@ -316,4 +314,3 @@ share/services/arkpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Editors @dirrm share/applnk -@dirrm lib/kde2 diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile index 8cb9b4b99b3a..06d02616bd07 100644 --- a/audio/kdemultimedia2/Makefile +++ b/audio/kdemultimedia2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdemultimedia -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,14 +14,21 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib + --with-qt-libraries=${X11BASE}/lib \ + --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} @@ -46,9 +53,21 @@ pre-everything:: .endif pre-configure: - ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 - ${PERL} -pi -e 's,kscd_compile=no,kscd_compile=yes,g; \ - s,kde_artsplug_compiles = xno,kde_argsplug_compiles = x,g' ${WRKSRC}/configure.in + ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" \ + ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 + ${PERL} -pi -e \ + 's,kscd_compile=no,kscd_compile=yes,g; \ + s,kde_artsplug_compiles = xno,kde_artsplug_compiles = x,g' \ + ${WRKSRC}/kscd/configure.in.in + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs post-install: @${ECHO_MSG} diff --git a/audio/kdemultimedia2/distinfo b/audio/kdemultimedia2/distinfo index ab43ed67b80f..b2e1bbcb1e21 100644 --- a/audio/kdemultimedia2/distinfo +++ b/audio/kdemultimedia2/distinfo @@ -1 +1 @@ -MD5 (KDE/kdemultimedia-2.2.1.tar.bz2) = c4724c00c6d2c69ccc923de944cf7983 +MD5 (KDE/kdemultimedia-2.2.2.tar.bz2) = 76981ca284663093cd0bc37500e10441 diff --git a/audio/kdemultimedia2/files/patch-cdrom.c b/audio/kdemultimedia2/files/patch-cdrom.c new file mode 100644 index 000000000000..f833b837a051 --- /dev/null +++ b/audio/kdemultimedia2/files/patch-cdrom.c @@ -0,0 +1,163 @@ +--- kscd/libwm/cdrom.c Mon Jun 18 07:01:07 2001 ++++ kscd/libwm/cdrom.c.new Thu Nov 29 21:37:42 2001 +@@ -182,6 +182,13 @@ + struct wm_playlist *l; + int i; + int pos; ++ ++ if(drive.get_trackcount == NULL) ++ { ++ perror("trackcount: function pointer NULL"); ++ return (NULL); ++ } ++ + if ((drive.get_trackcount)(&drive, &thiscd.ntracks) < 0) + { + perror("trackcount"); +@@ -217,6 +224,12 @@ + + for (i = 0; i < thiscd.ntracks; i++) + { ++ if(drive.get_trackinfo == NULL) ++ { ++ perror("CD track info read: function pointer null"); ++ return (NULL); ++ } ++ + if ((drive.get_trackinfo)(&drive, i + 1, &thiscd.trk[i].data, + &thiscd.trk[i].start) < 0) + { +@@ -235,6 +248,12 @@ + thiscd.trk[i].section = 0; + } + ++ if(drive.get_cdlen == NULL) ++ { ++ perror("CD length read: function pointer null"); ++ return (NULL); ++ } ++ + if ((drive.get_cdlen)(&drive, &thiscd.trk[i].start) < 0) + { + perror("CD length read"); +@@ -305,6 +324,12 @@ + if( (cur_cdmode == WM_CDM_STOPPED) || (cur_cdmode == WM_CDM_PLAYING) ) + oldmode = cur_cdmode; + ++ if(drive.get_drive_status == NULL) ++ { ++ perror("CD get drive status: function pointer NULL"); ++ return (-1); ++ } ++ + if( (drive.get_drive_status)(&drive, oldmode, &mode, &cur_frame, + &trackno, &cur_index) < 0) + { +@@ -474,7 +499,8 @@ + right = right < 0 ? 0 : right > 100 ? 100 : right; + /* printf("Left = %d, Right = %d\n", left, right); + */ +- (void) (drive.set_volume)(&drive, left, right); ++ if(drive.set_volume != NULL) ++ (void) (drive.set_volume)(&drive, left, right); + } /* cd_volume() */ + + #else +@@ -513,7 +539,8 @@ + if (right > 100) + right = 100; + +- (void) (drive.set_volume)(&drive, left, right); ++ if(drive.set_volume != NULL) ++ (void) (drive.set_volume)(&drive, left, right); + } /* cd_volume() */ + + #endif /* CLIF_VOL */ +@@ -536,18 +563,20 @@ + switch (cur_cdmode) { + case WM_CDM_PLAYING: /* playing */ + cur_cdmode = WM_CDM_PAUSED; +- (drive.pause)(&drive); +- paused_pos = cur_pos_rel; ++ if(drive.pause != NULL) ++ (drive.pause)(&drive); ++ ++ paused_pos = cur_pos_rel; + break; + + case WM_CDM_PAUSED: /* paused */ + cur_cdmode = WM_CDM_PLAYING; + /* (drive.resume)(&drive); */ +- if ((drive.resume)(&drive) > 0 ) +- { +- wm_cd_play(cur_track, paused_pos, +- playlist[cur_listno-1].end); +- } ++ if(drive.resume != NULL) ++ if ((drive.resume)(&drive) > 0 ) ++ wm_cd_play(cur_track, paused_pos, playlist[cur_listno-1].end); ++ break; ++ + default: /* */ + break; + } +@@ -568,7 +597,10 @@ + { + cur_lasttrack = cur_firsttrack = -1; + cur_cdmode = WM_CDM_STOPPED; +- (drive.stop)(&drive); ++ ++ if(drive.stop != NULL) ++ (drive.stop)(&drive); ++ + cur_track = 1; + } + } /* wm_cd_stop() */ +@@ -595,7 +627,8 @@ + if (start >= end) + start = end-1; + +- (drive.play)(&drive, start, end, realstart); ++ if(drive.play != NULL) ++ (drive.play)(&drive, start, end, realstart); + } + + /* +@@ -681,6 +714,12 @@ + { + int status; + ++ if(drive.eject == NULL) ++ { ++ perror("Could not eject CD: function pointer NULL"); ++ return (1); ++ } ++ + status = (drive.eject)(&drive); + if (status < 0) + { +@@ -705,6 +744,12 @@ + + int wm_cd_closetray(void) + { ++ if(drive.closetray == NULL) ++ { ++ perror("Could not close drive tray: function pointer NULL"); ++ return (1); ++ } ++ + return((drive.closetray)(&drive) ? 0 : wm_cd_status()==2 ? 1 : 0); + } /* wm_cd_closetray() */ + +@@ -785,8 +830,9 @@ + { + int left, right; + +- if ((drive.get_volume)(&drive, &left, &right) < 0 || left == -1) +- return (max); ++ if(drive.get_volume != NULL) ++ if ((drive.get_volume)(&drive, &left, &right) < 0 || left == -1) ++ return (max); + + left = (left * max + 99) / 100; + right = (right * max + 99) / 100; diff --git a/audio/kdemultimedia2/files/patch-kscd.cpp b/audio/kdemultimedia2/files/patch-kscd.cpp new file mode 100644 index 000000000000..905e3b303f9d --- /dev/null +++ b/audio/kdemultimedia2/files/patch-kscd.cpp @@ -0,0 +1,19 @@ +--- kscd/kscd.cpp Sun Dec 2 15:08:44 2001 ++++ kscd/kscd.cpp.new Sun Dec 2 15:10:04 2001 +@@ -1313,7 +1313,6 @@ + /* + * cdMode + * +- * - 'No disc' handling is missing + * - Data discs not recognized as data discs. + * + */ +@@ -1329,7 +1328,7 @@ + if( sss == 2 ) + have_new_cd = true; + +- if(sss < 0) ++ if(sss < 0 || sss == WM_CDS_NO_DISC) + { + if(cddrive_is_ok && (sss != WM_ERR_SCSI_INQUIRY_FAILED)) + { diff --git a/audio/kdemultimedia2/files/patch-plat_freebsd.c b/audio/kdemultimedia2/files/patch-plat_freebsd.c new file mode 100644 index 000000000000..dd6c062ab01d --- /dev/null +++ b/audio/kdemultimedia2/files/patch-plat_freebsd.c @@ -0,0 +1,11 @@ +--- kscd/libwm/plat_freebsd.c Tue Apr 10 13:34:52 2001 ++++ kscd/libwm/plat_freebsd.c.new Thu Nov 29 22:20:56 2001 +@@ -159,6 +159,8 @@ + wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "calling wmcd_open()\n"); + status = wmcd_open( d ); /* open it as usual */ + wm_susleep( 1000 ); ++ if(status == -EACCES || status == 1) ++ return status; + } while ( status != 0 ); + return status; + } /* wmcd_reopen() */ diff --git a/audio/kdemultimedia2/pkg-plist b/audio/kdemultimedia2/pkg-plist index 20b9d083eece..3c765f1e1561 100644 --- a/audio/kdemultimedia2/pkg-plist +++ b/audio/kdemultimedia2/pkg-plist @@ -756,15 +756,9 @@ share/mimelnk/audio/x-karaoke.desktop share/mimelnk/text/xmcd.desktop share/services/kmixctrl_restore.desktop share/servicetypes/audiomidi.desktop -@dirrm share/servicetypes -@dirrm share/services -@dirrm share/mimelnk/text -@dirrm share/mimelnk/audio -@dirrm share/mimelnk/application @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps @dirrm share/icons/hicolor/22x22/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/noatun @dirrm share/doc/HTML/en/kscd @dirrm share/doc/HTML/en/kmix @@ -773,8 +767,6 @@ share/servicetypes/audiomidi.desktop @dirrm share/doc/HTML/en/artsbuilder/images @dirrm share/doc/HTML/en/artsbuilder @dirrm share/doc/HTML/en/aktion -@dirrm share/doc/HTML/en -@dirrm share/config @dirrm share/apps/noatun/skins/kaiman/k9 @dirrm share/apps/noatun/skins/kaiman/circle @dirrm share/apps/noatun/skins/kaiman/car-preset @@ -843,8 +835,6 @@ share/servicetypes/audiomidi.desktop @dirrm share/applnk/Settings/Sound @dirrm share/applnk/Settings @dirrm share/applnk/Multimedia +@dirrm share/applnk @dirrm lib/mcop/Noatun -@dirrm lib/mcop/Arts -@dirrm lib/mcop @dirrm include/noatun -@dirrm include/arts diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile index 8cb9b4b99b3a..06d02616bd07 100644 --- a/audio/kdemultimedia3/Makefile +++ b/audio/kdemultimedia3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdemultimedia -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,14 +14,21 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib + --with-qt-libraries=${X11BASE}/lib \ + --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} @@ -46,9 +53,21 @@ pre-everything:: .endif pre-configure: - ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 - ${PERL} -pi -e 's,kscd_compile=no,kscd_compile=yes,g; \ - s,kde_artsplug_compiles = xno,kde_argsplug_compiles = x,g' ${WRKSRC}/configure.in + ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" \ + ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 + ${PERL} -pi -e \ + 's,kscd_compile=no,kscd_compile=yes,g; \ + s,kde_artsplug_compiles = xno,kde_artsplug_compiles = x,g' \ + ${WRKSRC}/kscd/configure.in.in + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs post-install: @${ECHO_MSG} diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo index ab43ed67b80f..b2e1bbcb1e21 100644 --- a/audio/kdemultimedia3/distinfo +++ b/audio/kdemultimedia3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdemultimedia-2.2.1.tar.bz2) = c4724c00c6d2c69ccc923de944cf7983 +MD5 (KDE/kdemultimedia-2.2.2.tar.bz2) = 76981ca284663093cd0bc37500e10441 diff --git a/audio/kdemultimedia3/files/patch-cdrom.c b/audio/kdemultimedia3/files/patch-cdrom.c new file mode 100644 index 000000000000..f833b837a051 --- /dev/null +++ b/audio/kdemultimedia3/files/patch-cdrom.c @@ -0,0 +1,163 @@ +--- kscd/libwm/cdrom.c Mon Jun 18 07:01:07 2001 ++++ kscd/libwm/cdrom.c.new Thu Nov 29 21:37:42 2001 +@@ -182,6 +182,13 @@ + struct wm_playlist *l; + int i; + int pos; ++ ++ if(drive.get_trackcount == NULL) ++ { ++ perror("trackcount: function pointer NULL"); ++ return (NULL); ++ } ++ + if ((drive.get_trackcount)(&drive, &thiscd.ntracks) < 0) + { + perror("trackcount"); +@@ -217,6 +224,12 @@ + + for (i = 0; i < thiscd.ntracks; i++) + { ++ if(drive.get_trackinfo == NULL) ++ { ++ perror("CD track info read: function pointer null"); ++ return (NULL); ++ } ++ + if ((drive.get_trackinfo)(&drive, i + 1, &thiscd.trk[i].data, + &thiscd.trk[i].start) < 0) + { +@@ -235,6 +248,12 @@ + thiscd.trk[i].section = 0; + } + ++ if(drive.get_cdlen == NULL) ++ { ++ perror("CD length read: function pointer null"); ++ return (NULL); ++ } ++ + if ((drive.get_cdlen)(&drive, &thiscd.trk[i].start) < 0) + { + perror("CD length read"); +@@ -305,6 +324,12 @@ + if( (cur_cdmode == WM_CDM_STOPPED) || (cur_cdmode == WM_CDM_PLAYING) ) + oldmode = cur_cdmode; + ++ if(drive.get_drive_status == NULL) ++ { ++ perror("CD get drive status: function pointer NULL"); ++ return (-1); ++ } ++ + if( (drive.get_drive_status)(&drive, oldmode, &mode, &cur_frame, + &trackno, &cur_index) < 0) + { +@@ -474,7 +499,8 @@ + right = right < 0 ? 0 : right > 100 ? 100 : right; + /* printf("Left = %d, Right = %d\n", left, right); + */ +- (void) (drive.set_volume)(&drive, left, right); ++ if(drive.set_volume != NULL) ++ (void) (drive.set_volume)(&drive, left, right); + } /* cd_volume() */ + + #else +@@ -513,7 +539,8 @@ + if (right > 100) + right = 100; + +- (void) (drive.set_volume)(&drive, left, right); ++ if(drive.set_volume != NULL) ++ (void) (drive.set_volume)(&drive, left, right); + } /* cd_volume() */ + + #endif /* CLIF_VOL */ +@@ -536,18 +563,20 @@ + switch (cur_cdmode) { + case WM_CDM_PLAYING: /* playing */ + cur_cdmode = WM_CDM_PAUSED; +- (drive.pause)(&drive); +- paused_pos = cur_pos_rel; ++ if(drive.pause != NULL) ++ (drive.pause)(&drive); ++ ++ paused_pos = cur_pos_rel; + break; + + case WM_CDM_PAUSED: /* paused */ + cur_cdmode = WM_CDM_PLAYING; + /* (drive.resume)(&drive); */ +- if ((drive.resume)(&drive) > 0 ) +- { +- wm_cd_play(cur_track, paused_pos, +- playlist[cur_listno-1].end); +- } ++ if(drive.resume != NULL) ++ if ((drive.resume)(&drive) > 0 ) ++ wm_cd_play(cur_track, paused_pos, playlist[cur_listno-1].end); ++ break; ++ + default: /* */ + break; + } +@@ -568,7 +597,10 @@ + { + cur_lasttrack = cur_firsttrack = -1; + cur_cdmode = WM_CDM_STOPPED; +- (drive.stop)(&drive); ++ ++ if(drive.stop != NULL) ++ (drive.stop)(&drive); ++ + cur_track = 1; + } + } /* wm_cd_stop() */ +@@ -595,7 +627,8 @@ + if (start >= end) + start = end-1; + +- (drive.play)(&drive, start, end, realstart); ++ if(drive.play != NULL) ++ (drive.play)(&drive, start, end, realstart); + } + + /* +@@ -681,6 +714,12 @@ + { + int status; + ++ if(drive.eject == NULL) ++ { ++ perror("Could not eject CD: function pointer NULL"); ++ return (1); ++ } ++ + status = (drive.eject)(&drive); + if (status < 0) + { +@@ -705,6 +744,12 @@ + + int wm_cd_closetray(void) + { ++ if(drive.closetray == NULL) ++ { ++ perror("Could not close drive tray: function pointer NULL"); ++ return (1); ++ } ++ + return((drive.closetray)(&drive) ? 0 : wm_cd_status()==2 ? 1 : 0); + } /* wm_cd_closetray() */ + +@@ -785,8 +830,9 @@ + { + int left, right; + +- if ((drive.get_volume)(&drive, &left, &right) < 0 || left == -1) +- return (max); ++ if(drive.get_volume != NULL) ++ if ((drive.get_volume)(&drive, &left, &right) < 0 || left == -1) ++ return (max); + + left = (left * max + 99) / 100; + right = (right * max + 99) / 100; diff --git a/audio/kdemultimedia3/files/patch-kscd.cpp b/audio/kdemultimedia3/files/patch-kscd.cpp new file mode 100644 index 000000000000..905e3b303f9d --- /dev/null +++ b/audio/kdemultimedia3/files/patch-kscd.cpp @@ -0,0 +1,19 @@ +--- kscd/kscd.cpp Sun Dec 2 15:08:44 2001 ++++ kscd/kscd.cpp.new Sun Dec 2 15:10:04 2001 +@@ -1313,7 +1313,6 @@ + /* + * cdMode + * +- * - 'No disc' handling is missing + * - Data discs not recognized as data discs. + * + */ +@@ -1329,7 +1328,7 @@ + if( sss == 2 ) + have_new_cd = true; + +- if(sss < 0) ++ if(sss < 0 || sss == WM_CDS_NO_DISC) + { + if(cddrive_is_ok && (sss != WM_ERR_SCSI_INQUIRY_FAILED)) + { diff --git a/audio/kdemultimedia3/files/patch-plat_freebsd.c b/audio/kdemultimedia3/files/patch-plat_freebsd.c new file mode 100644 index 000000000000..dd6c062ab01d --- /dev/null +++ b/audio/kdemultimedia3/files/patch-plat_freebsd.c @@ -0,0 +1,11 @@ +--- kscd/libwm/plat_freebsd.c Tue Apr 10 13:34:52 2001 ++++ kscd/libwm/plat_freebsd.c.new Thu Nov 29 22:20:56 2001 +@@ -159,6 +159,8 @@ + wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "calling wmcd_open()\n"); + status = wmcd_open( d ); /* open it as usual */ + wm_susleep( 1000 ); ++ if(status == -EACCES || status == 1) ++ return status; + } while ( status != 0 ); + return status; + } /* wmcd_reopen() */ diff --git a/audio/kdemultimedia3/pkg-plist b/audio/kdemultimedia3/pkg-plist index 20b9d083eece..3c765f1e1561 100644 --- a/audio/kdemultimedia3/pkg-plist +++ b/audio/kdemultimedia3/pkg-plist @@ -756,15 +756,9 @@ share/mimelnk/audio/x-karaoke.desktop share/mimelnk/text/xmcd.desktop share/services/kmixctrl_restore.desktop share/servicetypes/audiomidi.desktop -@dirrm share/servicetypes -@dirrm share/services -@dirrm share/mimelnk/text -@dirrm share/mimelnk/audio -@dirrm share/mimelnk/application @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps @dirrm share/icons/hicolor/22x22/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/noatun @dirrm share/doc/HTML/en/kscd @dirrm share/doc/HTML/en/kmix @@ -773,8 +767,6 @@ share/servicetypes/audiomidi.desktop @dirrm share/doc/HTML/en/artsbuilder/images @dirrm share/doc/HTML/en/artsbuilder @dirrm share/doc/HTML/en/aktion -@dirrm share/doc/HTML/en -@dirrm share/config @dirrm share/apps/noatun/skins/kaiman/k9 @dirrm share/apps/noatun/skins/kaiman/circle @dirrm share/apps/noatun/skins/kaiman/car-preset @@ -843,8 +835,6 @@ share/servicetypes/audiomidi.desktop @dirrm share/applnk/Settings/Sound @dirrm share/applnk/Settings @dirrm share/applnk/Multimedia +@dirrm share/applnk @dirrm lib/mcop/Noatun -@dirrm lib/mcop/Arts -@dirrm lib/mcop @dirrm include/noatun -@dirrm include/arts diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile index 42d7e7fffe93..d1ab1df6523f 100644 --- a/comms/kremotecontrol/Makefile +++ b/comms/kremotecontrol/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeutils -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/comms/kremotecontrol/distinfo b/comms/kremotecontrol/distinfo index 562818721e98..2a396fa164aa 100644 --- a/comms/kremotecontrol/distinfo +++ b/comms/kremotecontrol/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5 +MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a diff --git a/comms/kremotecontrol/files/patch-portable.cpp b/comms/kremotecontrol/files/patch-portable.cpp new file mode 100644 index 000000000000..d6746dc1c282 --- /dev/null +++ b/comms/kremotecontrol/files/patch-portable.cpp @@ -0,0 +1,20 @@ +--- klaptopdaemon/portable.cpp- Thu Jun 28 00:08:02 2001 ++++ klaptopdaemon/portable.cpp Thu Jun 28 00:08:22 2001 +@@ -453,7 +453,7 @@ + if (ret == -1) + return 0; + +- return (info.ai_batt_time != 0xffff); ++ return (info.ai_batt_time != -1); + } + + // +@@ -638,7 +638,7 @@ + + p.powered = info.ai_acline; + p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life); +- p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1); ++ p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1); + return(p); + + bad: diff --git a/comms/kremotecontrol/pkg-plist b/comms/kremotecontrol/pkg-plist index 451d3587f1ef..a26fa72c3a97 100644 --- a/comms/kremotecontrol/pkg-plist +++ b/comms/kremotecontrol/pkg-plist @@ -251,7 +251,6 @@ share/services/arkpart.desktop @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpm @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/klprfax @@ -308,7 +307,6 @@ share/services/arkpart.desktop @dirrm share/apps/ark/icons/hicolor @dirrm share/apps/ark/icons @dirrm share/apps/ark -@dirrm share/apps @dirrm share/applnk/Utilities @dirrm share/applnk/System @dirrm share/applnk/Settings/PowerControl @@ -316,4 +314,3 @@ share/services/arkpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Editors @dirrm share/applnk -@dirrm lib/kde2 diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index 42d7e7fffe93..d1ab1df6523f 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeutils -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo index 562818721e98..2a396fa164aa 100644 --- a/deskutils/kcharselect/distinfo +++ b/deskutils/kcharselect/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5 +MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a diff --git a/deskutils/kcharselect/files/patch-portable.cpp b/deskutils/kcharselect/files/patch-portable.cpp new file mode 100644 index 000000000000..d6746dc1c282 --- /dev/null +++ b/deskutils/kcharselect/files/patch-portable.cpp @@ -0,0 +1,20 @@ +--- klaptopdaemon/portable.cpp- Thu Jun 28 00:08:02 2001 ++++ klaptopdaemon/portable.cpp Thu Jun 28 00:08:22 2001 +@@ -453,7 +453,7 @@ + if (ret == -1) + return 0; + +- return (info.ai_batt_time != 0xffff); ++ return (info.ai_batt_time != -1); + } + + // +@@ -638,7 +638,7 @@ + + p.powered = info.ai_acline; + p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life); +- p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1); ++ p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1); + return(p); + + bad: diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist index 451d3587f1ef..a26fa72c3a97 100644 --- a/deskutils/kcharselect/pkg-plist +++ b/deskutils/kcharselect/pkg-plist @@ -251,7 +251,6 @@ share/services/arkpart.desktop @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpm @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/klprfax @@ -308,7 +307,6 @@ share/services/arkpart.desktop @dirrm share/apps/ark/icons/hicolor @dirrm share/apps/ark/icons @dirrm share/apps/ark -@dirrm share/apps @dirrm share/applnk/Utilities @dirrm share/applnk/System @dirrm share/applnk/Settings/PowerControl @@ -316,4 +314,3 @@ share/services/arkpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Editors @dirrm share/applnk -@dirrm lib/kde2 diff --git a/deskutils/kdepim/Makefile b/deskutils/kdepim/Makefile index 0e10fb385d36..787e1269838d 100644 --- a/deskutils/kdepim/Makefile +++ b/deskutils/kdepim/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdepim -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= deskutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,14 +14,44 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink +LIB_DEPENDS= pisock:${PORTSDIR}/palm/pilot-link + USE_KDELIBS_VER=2 USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink \ + --with-extra-includes=${LOCALBASE}/pilot/include \ + --with-extra-libs=${LOCALBASE}/pilot/lib +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif +QTCPPFLAGS= -I${LOCALBASE}/pilot/include -L${LOCALBASE}/pilot/lib +QTLDFLAGS= ${QTCPPFLAGS} +CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" +MAKE_ENV= ${CONFIGURE_ENV} USE_GMAKE= yes pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + find ${WRKSRC}/kpilot \( -name Makefile.in -o -name Makefile.am \) | \ + xargs ${PERL} -pi -e \ + "s@LDFLAGS =@LDFLAGS=-L${LOCALBASE}/pilot/lib@g" find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \ "s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g" diff --git a/deskutils/kdepim/distinfo b/deskutils/kdepim/distinfo index 291838009c90..37134e643f7d 100644 --- a/deskutils/kdepim/distinfo +++ b/deskutils/kdepim/distinfo @@ -1 +1 @@ -MD5 (KDE/kdepim-2.2.1.tar.bz2) = 2b72725439279241b75c8048a79ca955 +MD5 (KDE/kdepim-2.2.2.tar.bz2) = 55daf69b90108509895814b96fc8b671 diff --git a/deskutils/kdepim/pkg-plist b/deskutils/kdepim/pkg-plist index c9d488388eb2..6189673215b2 100644 --- a/deskutils/kdepim/pkg-plist +++ b/deskutils/kdepim/pkg-plist @@ -1,8 +1,18 @@ +bin/abbrowser_conduit bin/alarmd +bin/conduitExpense +bin/conduitKNotes bin/ical2vcal bin/kandy bin/kandy_client bin/korganizer +bin/kpilot +bin/kpilotDaemon +bin/null_conduit +bin/pilotListener +bin/popmail_conduit +bin/todoconduit +bin/vcalconduit include/kgantt/KGantt.h include/kgantt/KGanttBarConfig.h include/kgantt/KGanttItem.h @@ -74,6 +84,8 @@ lib/libvcard.so lib/libvcard.so.0 share/applnk/Applications/korganizer.desktop share/applnk/Utilities/kandy.desktop +share/applnk/Utilities/kpilot.desktop +share/applnk/Utilities/kpilotdaemon.desktop share/apps/kandy/default.kandy share/apps/kandy/kandymobileui.rc share/apps/kandy/kandyui.rc @@ -189,6 +201,11 @@ share/apps/korganizer/sounds/lightmag.wav share/apps/korganizer/sounds/onscreen.wav share/apps/korganizer/sounds/spinout.wav share/apps/korganizer/tips +share/apps/kpilot/icons/hicolor/16x16/actions/backup.png +share/apps/kpilot/icons/hicolor/16x16/actions/fastsync.png +share/apps/kpilot/icons/hicolor/16x16/actions/hotsync.png +share/apps/kpilot/icons/hicolor/16x16/actions/restore.png +share/apps/kpilot/kpilotui.rc share/autostart/alarmd.desktop share/config/korganizerrc share/doc/HTML/en/kandy/common @@ -251,17 +268,34 @@ share/doc/HTML/en/kpilot/toolbar_backup.png share/doc/HTML/en/kpilot/toolbar_hotsync.png share/icons/hicolor/16x16/apps/kandy.png share/icons/hicolor/16x16/apps/korganizer.png +share/icons/hicolor/16x16/apps/kpilot.png share/icons/hicolor/32x32/apps/kandy.png share/icons/hicolor/32x32/apps/korganizer.png +share/icons/hicolor/32x32/apps/kpilot.png share/icons/hicolor/48x48/apps/korganizer.png +share/icons/locolor/16x16/apps/kpilot.xpm +share/services/abbrowser_conduit.desktop +share/services/expense-conduit.desktop +share/services/knotes-conduit.desktop +share/services/null-conduit.desktop +share/services/popmail-conduit.desktop +share/services/todo-conduit.desktop +share/services/vcal-conduit.desktop +share/servicetypes/kpilotconduit.desktop +@dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 +@dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpilot @dirrm share/doc/HTML/en/korganizer @dirrm share/doc/HTML/en/kandy -@dirrm share/config @dirrm share/autostart +@dirrm share/apps/kpilot/icons/hicolor/16x16/actions +@dirrm share/apps/kpilot/icons/hicolor/16x16 +@dirrm share/apps/kpilot/icons/hicolor +@dirrm share/apps/kpilot/icons +@dirrm share/apps/kpilot @dirrm share/apps/korganizer/sounds @dirrm share/apps/korganizer/icons/hicolor/32x32/actions @dirrm share/apps/korganizer/icons/hicolor/32x32 @@ -286,5 +320,6 @@ share/icons/hicolor/48x48/apps/korganizer.png @dirrm share/apps/kandy @dirrm share/applnk/Utilities @dirrm share/applnk/Applications +@dirrm share/applnk @dirrm include/rmm @dirrm include/kgantt diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile index 0e10fb385d36..787e1269838d 100644 --- a/deskutils/kdepim3/Makefile +++ b/deskutils/kdepim3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdepim -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= deskutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,14 +14,44 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink +LIB_DEPENDS= pisock:${PORTSDIR}/palm/pilot-link + USE_KDELIBS_VER=2 USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink \ + --with-extra-includes=${LOCALBASE}/pilot/include \ + --with-extra-libs=${LOCALBASE}/pilot/lib +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif +QTCPPFLAGS= -I${LOCALBASE}/pilot/include -L${LOCALBASE}/pilot/lib +QTLDFLAGS= ${QTCPPFLAGS} +CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" +MAKE_ENV= ${CONFIGURE_ENV} USE_GMAKE= yes pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + find ${WRKSRC}/kpilot \( -name Makefile.in -o -name Makefile.am \) | \ + xargs ${PERL} -pi -e \ + "s@LDFLAGS =@LDFLAGS=-L${LOCALBASE}/pilot/lib@g" find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \ "s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g" diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo index 291838009c90..37134e643f7d 100644 --- a/deskutils/kdepim3/distinfo +++ b/deskutils/kdepim3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdepim-2.2.1.tar.bz2) = 2b72725439279241b75c8048a79ca955 +MD5 (KDE/kdepim-2.2.2.tar.bz2) = 55daf69b90108509895814b96fc8b671 diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist index c9d488388eb2..6189673215b2 100644 --- a/deskutils/kdepim3/pkg-plist +++ b/deskutils/kdepim3/pkg-plist @@ -1,8 +1,18 @@ +bin/abbrowser_conduit bin/alarmd +bin/conduitExpense +bin/conduitKNotes bin/ical2vcal bin/kandy bin/kandy_client bin/korganizer +bin/kpilot +bin/kpilotDaemon +bin/null_conduit +bin/pilotListener +bin/popmail_conduit +bin/todoconduit +bin/vcalconduit include/kgantt/KGantt.h include/kgantt/KGanttBarConfig.h include/kgantt/KGanttItem.h @@ -74,6 +84,8 @@ lib/libvcard.so lib/libvcard.so.0 share/applnk/Applications/korganizer.desktop share/applnk/Utilities/kandy.desktop +share/applnk/Utilities/kpilot.desktop +share/applnk/Utilities/kpilotdaemon.desktop share/apps/kandy/default.kandy share/apps/kandy/kandymobileui.rc share/apps/kandy/kandyui.rc @@ -189,6 +201,11 @@ share/apps/korganizer/sounds/lightmag.wav share/apps/korganizer/sounds/onscreen.wav share/apps/korganizer/sounds/spinout.wav share/apps/korganizer/tips +share/apps/kpilot/icons/hicolor/16x16/actions/backup.png +share/apps/kpilot/icons/hicolor/16x16/actions/fastsync.png +share/apps/kpilot/icons/hicolor/16x16/actions/hotsync.png +share/apps/kpilot/icons/hicolor/16x16/actions/restore.png +share/apps/kpilot/kpilotui.rc share/autostart/alarmd.desktop share/config/korganizerrc share/doc/HTML/en/kandy/common @@ -251,17 +268,34 @@ share/doc/HTML/en/kpilot/toolbar_backup.png share/doc/HTML/en/kpilot/toolbar_hotsync.png share/icons/hicolor/16x16/apps/kandy.png share/icons/hicolor/16x16/apps/korganizer.png +share/icons/hicolor/16x16/apps/kpilot.png share/icons/hicolor/32x32/apps/kandy.png share/icons/hicolor/32x32/apps/korganizer.png +share/icons/hicolor/32x32/apps/kpilot.png share/icons/hicolor/48x48/apps/korganizer.png +share/icons/locolor/16x16/apps/kpilot.xpm +share/services/abbrowser_conduit.desktop +share/services/expense-conduit.desktop +share/services/knotes-conduit.desktop +share/services/null-conduit.desktop +share/services/popmail-conduit.desktop +share/services/todo-conduit.desktop +share/services/vcal-conduit.desktop +share/servicetypes/kpilotconduit.desktop +@dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 +@dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpilot @dirrm share/doc/HTML/en/korganizer @dirrm share/doc/HTML/en/kandy -@dirrm share/config @dirrm share/autostart +@dirrm share/apps/kpilot/icons/hicolor/16x16/actions +@dirrm share/apps/kpilot/icons/hicolor/16x16 +@dirrm share/apps/kpilot/icons/hicolor +@dirrm share/apps/kpilot/icons +@dirrm share/apps/kpilot @dirrm share/apps/korganizer/sounds @dirrm share/apps/korganizer/icons/hicolor/32x32/actions @dirrm share/apps/korganizer/icons/hicolor/32x32 @@ -286,5 +320,6 @@ share/icons/hicolor/48x48/apps/korganizer.png @dirrm share/apps/kandy @dirrm share/applnk/Utilities @dirrm share/applnk/Applications +@dirrm share/applnk @dirrm include/rmm @dirrm include/kgantt diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 0e10fb385d36..787e1269838d 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdepim -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= deskutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,14 +14,44 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink +LIB_DEPENDS= pisock:${PORTSDIR}/palm/pilot-link + USE_KDELIBS_VER=2 USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink \ + --with-extra-includes=${LOCALBASE}/pilot/include \ + --with-extra-libs=${LOCALBASE}/pilot/lib +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif +QTCPPFLAGS= -I${LOCALBASE}/pilot/include -L${LOCALBASE}/pilot/lib +QTLDFLAGS= ${QTCPPFLAGS} +CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" +MAKE_ENV= ${CONFIGURE_ENV} USE_GMAKE= yes pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + find ${WRKSRC}/kpilot \( -name Makefile.in -o -name Makefile.am \) | \ + xargs ${PERL} -pi -e \ + "s@LDFLAGS =@LDFLAGS=-L${LOCALBASE}/pilot/lib@g" find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \ "s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g" diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo index 291838009c90..37134e643f7d 100644 --- a/deskutils/kdepim4/distinfo +++ b/deskutils/kdepim4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdepim-2.2.1.tar.bz2) = 2b72725439279241b75c8048a79ca955 +MD5 (KDE/kdepim-2.2.2.tar.bz2) = 55daf69b90108509895814b96fc8b671 diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist index c9d488388eb2..6189673215b2 100644 --- a/deskutils/kdepim4/pkg-plist +++ b/deskutils/kdepim4/pkg-plist @@ -1,8 +1,18 @@ +bin/abbrowser_conduit bin/alarmd +bin/conduitExpense +bin/conduitKNotes bin/ical2vcal bin/kandy bin/kandy_client bin/korganizer +bin/kpilot +bin/kpilotDaemon +bin/null_conduit +bin/pilotListener +bin/popmail_conduit +bin/todoconduit +bin/vcalconduit include/kgantt/KGantt.h include/kgantt/KGanttBarConfig.h include/kgantt/KGanttItem.h @@ -74,6 +84,8 @@ lib/libvcard.so lib/libvcard.so.0 share/applnk/Applications/korganizer.desktop share/applnk/Utilities/kandy.desktop +share/applnk/Utilities/kpilot.desktop +share/applnk/Utilities/kpilotdaemon.desktop share/apps/kandy/default.kandy share/apps/kandy/kandymobileui.rc share/apps/kandy/kandyui.rc @@ -189,6 +201,11 @@ share/apps/korganizer/sounds/lightmag.wav share/apps/korganizer/sounds/onscreen.wav share/apps/korganizer/sounds/spinout.wav share/apps/korganizer/tips +share/apps/kpilot/icons/hicolor/16x16/actions/backup.png +share/apps/kpilot/icons/hicolor/16x16/actions/fastsync.png +share/apps/kpilot/icons/hicolor/16x16/actions/hotsync.png +share/apps/kpilot/icons/hicolor/16x16/actions/restore.png +share/apps/kpilot/kpilotui.rc share/autostart/alarmd.desktop share/config/korganizerrc share/doc/HTML/en/kandy/common @@ -251,17 +268,34 @@ share/doc/HTML/en/kpilot/toolbar_backup.png share/doc/HTML/en/kpilot/toolbar_hotsync.png share/icons/hicolor/16x16/apps/kandy.png share/icons/hicolor/16x16/apps/korganizer.png +share/icons/hicolor/16x16/apps/kpilot.png share/icons/hicolor/32x32/apps/kandy.png share/icons/hicolor/32x32/apps/korganizer.png +share/icons/hicolor/32x32/apps/kpilot.png share/icons/hicolor/48x48/apps/korganizer.png +share/icons/locolor/16x16/apps/kpilot.xpm +share/services/abbrowser_conduit.desktop +share/services/expense-conduit.desktop +share/services/knotes-conduit.desktop +share/services/null-conduit.desktop +share/services/popmail-conduit.desktop +share/services/todo-conduit.desktop +share/services/vcal-conduit.desktop +share/servicetypes/kpilotconduit.desktop +@dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 +@dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpilot @dirrm share/doc/HTML/en/korganizer @dirrm share/doc/HTML/en/kandy -@dirrm share/config @dirrm share/autostart +@dirrm share/apps/kpilot/icons/hicolor/16x16/actions +@dirrm share/apps/kpilot/icons/hicolor/16x16 +@dirrm share/apps/kpilot/icons/hicolor +@dirrm share/apps/kpilot/icons +@dirrm share/apps/kpilot @dirrm share/apps/korganizer/sounds @dirrm share/apps/korganizer/icons/hicolor/32x32/actions @dirrm share/apps/korganizer/icons/hicolor/32x32 @@ -286,5 +320,6 @@ share/icons/hicolor/48x48/apps/korganizer.png @dirrm share/apps/kandy @dirrm share/applnk/Utilities @dirrm share/applnk/Applications +@dirrm share/applnk @dirrm include/rmm @dirrm include/kgantt diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index 0e10fb385d36..787e1269838d 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdepim -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= deskutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,14 +14,44 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink +LIB_DEPENDS= pisock:${PORTSDIR}/palm/pilot-link + USE_KDELIBS_VER=2 USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink \ + --with-extra-includes=${LOCALBASE}/pilot/include \ + --with-extra-libs=${LOCALBASE}/pilot/lib +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif +QTCPPFLAGS= -I${LOCALBASE}/pilot/include -L${LOCALBASE}/pilot/lib +QTLDFLAGS= ${QTCPPFLAGS} +CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" +MAKE_ENV= ${CONFIGURE_ENV} USE_GMAKE= yes pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + find ${WRKSRC}/kpilot \( -name Makefile.in -o -name Makefile.am \) | \ + xargs ${PERL} -pi -e \ + "s@LDFLAGS =@LDFLAGS=-L${LOCALBASE}/pilot/lib@g" find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \ "s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g" diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo index 291838009c90..37134e643f7d 100644 --- a/deskutils/kdepim44/distinfo +++ b/deskutils/kdepim44/distinfo @@ -1 +1 @@ -MD5 (KDE/kdepim-2.2.1.tar.bz2) = 2b72725439279241b75c8048a79ca955 +MD5 (KDE/kdepim-2.2.2.tar.bz2) = 55daf69b90108509895814b96fc8b671 diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist index c9d488388eb2..6189673215b2 100644 --- a/deskutils/kdepim44/pkg-plist +++ b/deskutils/kdepim44/pkg-plist @@ -1,8 +1,18 @@ +bin/abbrowser_conduit bin/alarmd +bin/conduitExpense +bin/conduitKNotes bin/ical2vcal bin/kandy bin/kandy_client bin/korganizer +bin/kpilot +bin/kpilotDaemon +bin/null_conduit +bin/pilotListener +bin/popmail_conduit +bin/todoconduit +bin/vcalconduit include/kgantt/KGantt.h include/kgantt/KGanttBarConfig.h include/kgantt/KGanttItem.h @@ -74,6 +84,8 @@ lib/libvcard.so lib/libvcard.so.0 share/applnk/Applications/korganizer.desktop share/applnk/Utilities/kandy.desktop +share/applnk/Utilities/kpilot.desktop +share/applnk/Utilities/kpilotdaemon.desktop share/apps/kandy/default.kandy share/apps/kandy/kandymobileui.rc share/apps/kandy/kandyui.rc @@ -189,6 +201,11 @@ share/apps/korganizer/sounds/lightmag.wav share/apps/korganizer/sounds/onscreen.wav share/apps/korganizer/sounds/spinout.wav share/apps/korganizer/tips +share/apps/kpilot/icons/hicolor/16x16/actions/backup.png +share/apps/kpilot/icons/hicolor/16x16/actions/fastsync.png +share/apps/kpilot/icons/hicolor/16x16/actions/hotsync.png +share/apps/kpilot/icons/hicolor/16x16/actions/restore.png +share/apps/kpilot/kpilotui.rc share/autostart/alarmd.desktop share/config/korganizerrc share/doc/HTML/en/kandy/common @@ -251,17 +268,34 @@ share/doc/HTML/en/kpilot/toolbar_backup.png share/doc/HTML/en/kpilot/toolbar_hotsync.png share/icons/hicolor/16x16/apps/kandy.png share/icons/hicolor/16x16/apps/korganizer.png +share/icons/hicolor/16x16/apps/kpilot.png share/icons/hicolor/32x32/apps/kandy.png share/icons/hicolor/32x32/apps/korganizer.png +share/icons/hicolor/32x32/apps/kpilot.png share/icons/hicolor/48x48/apps/korganizer.png +share/icons/locolor/16x16/apps/kpilot.xpm +share/services/abbrowser_conduit.desktop +share/services/expense-conduit.desktop +share/services/knotes-conduit.desktop +share/services/null-conduit.desktop +share/services/popmail-conduit.desktop +share/services/todo-conduit.desktop +share/services/vcal-conduit.desktop +share/servicetypes/kpilotconduit.desktop +@dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 +@dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpilot @dirrm share/doc/HTML/en/korganizer @dirrm share/doc/HTML/en/kandy -@dirrm share/config @dirrm share/autostart +@dirrm share/apps/kpilot/icons/hicolor/16x16/actions +@dirrm share/apps/kpilot/icons/hicolor/16x16 +@dirrm share/apps/kpilot/icons/hicolor +@dirrm share/apps/kpilot/icons +@dirrm share/apps/kpilot @dirrm share/apps/korganizer/sounds @dirrm share/apps/korganizer/icons/hicolor/32x32/actions @dirrm share/apps/korganizer/icons/hicolor/32x32 @@ -286,5 +320,6 @@ share/icons/hicolor/48x48/apps/korganizer.png @dirrm share/apps/kandy @dirrm share/applnk/Utilities @dirrm share/applnk/Applications +@dirrm share/applnk @dirrm include/rmm @dirrm include/kgantt diff --git a/devel/kdesdk/Makefile b/devel/kdesdk/Makefile index 520bb4d9af75..4a70fd498429 100644 --- a/devel/kdesdk/Makefile +++ b/devel/kdesdk/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdesdk -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= devel kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,15 +14,36 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db USE_KDEBASE_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde2 MAN1= cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/devel/kdesdk/distinfo b/devel/kdesdk/distinfo index f0b1583dfcda..91704129044c 100644 --- a/devel/kdesdk/distinfo +++ b/devel/kdesdk/distinfo @@ -1 +1 @@ -MD5 (KDE/kdesdk-2.2.1.tar.bz2) = 1744ab2c6d1708530de53547eb95f28a +MD5 (KDE/kdesdk-2.2.2.tar.bz2) = f8080a3269a99f0c22a55ad9cab0682d diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index 520bb4d9af75..4a70fd498429 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdesdk -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= devel kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,15 +14,36 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db USE_KDEBASE_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde2 MAN1= cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo index f0b1583dfcda..91704129044c 100644 --- a/devel/kdesdk3/distinfo +++ b/devel/kdesdk3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdesdk-2.2.1.tar.bz2) = 1744ab2c6d1708530de53547eb95f28a +MD5 (KDE/kdesdk-2.2.2.tar.bz2) = f8080a3269a99f0c22a55ad9cab0682d diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index 520bb4d9af75..4a70fd498429 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdesdk -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= devel kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,15 +14,36 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db USE_KDEBASE_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde2 MAN1= cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo index f0b1583dfcda..91704129044c 100644 --- a/devel/kdesdk4/distinfo +++ b/devel/kdesdk4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdesdk-2.2.1.tar.bz2) = 1744ab2c6d1708530de53547eb95f28a +MD5 (KDE/kdesdk-2.2.2.tar.bz2) = f8080a3269a99f0c22a55ad9cab0682d diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 76dba19e0f0e..7f59f84a6aa7 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -6,15 +6,18 @@ # PORTNAME= kdevelop -PORTVERSION= 2.0.1 +PORTVERSION= 2.0.2 CATEGORIES?= devel kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/2.2.1/src +MASTER_SITE_SUBDIR= stable/2.2.2/src DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org -BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext +BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext \ + autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake .if defined(WITH_OPTIONAL_DEPENDS) RUN_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf \ @@ -33,9 +36,15 @@ RUN_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf \ USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOCONF= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-qtdoc-dir=${X11BASE}/share/doc/qt2/html +CONFIGURE_ARGS+= --with-qtdoc-dir=${X11BASE}/share/doc/qt2/html \ + --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif pre-everything:: .if !defined(WITH_OPTIONAL_DEPENDS) @@ -45,6 +54,17 @@ pre-everything:: @${ECHO_MSG} .endif +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + pre-build: ${PERL} -pi -e "s@libkdeui.so.3@libkdeui.so@g" ${WRKSRC}/kdevelop/main.cpp diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo index aa02412303e4..7e3a9f5448f1 100644 --- a/devel/kdevelop/distinfo +++ b/devel/kdevelop/distinfo @@ -1 +1 @@ -MD5 (KDE/kdevelop-2.0.1.tar.bz2) = f64d135ee64715ffe75c81106a39d934 +MD5 (KDE/kdevelop-2.0.2.tar.bz2) = ba97e043cd6819c8bd77e342ee0af6fc diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist index 66490d8acfa6..489dd3fdd5cf 100644 --- a/devel/kdevelop/pkg-plist +++ b/devel/kdevelop/pkg-plist @@ -246,10 +246,8 @@ share/icons/hicolor/16x16/apps/kdevelop.png share/icons/hicolor/32x32/apps/kdevelop.png share/icons/hicolor/48x48/apps/kdevelop.png share/mimelnk/application/x-kdevelop-project.desktop -@dirrm share/mimelnk/application @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kdevelop/tutorial @dirrm share/doc/HTML/en/kdevelop/reference/C @dirrm share/doc/HTML/en/kdevelop/reference @@ -257,7 +255,6 @@ share/mimelnk/application/x-kdevelop-project.desktop @dirrm share/doc/HTML/en/kdevelop/kde_libref @dirrm share/doc/HTML/en/kdevelop/about @dirrm share/doc/HTML/en/kdevelop -@dirrm share/doc/HTML/en @dirrm share/apps/kdevelop/tools @dirrm share/apps/kdevelop/templates @dirrm share/apps/kdevelop/pics @@ -268,5 +265,5 @@ share/mimelnk/application/x-kdevelop-project.desktop @dirrm share/apps/kdevelop/icons/hicolor @dirrm share/apps/kdevelop/icons @dirrm share/apps/kdevelop -@dirrm share/apps/kconf_update @dirrm share/applnk/Development +@dirrm share/applnk diff --git a/devel/qt-designer/Makefile b/devel/qt-designer/Makefile index 0ca0b97b5d70..d862aa6c16ae 100644 --- a/devel/qt-designer/Makefile +++ b/devel/qt-designer/Makefile @@ -16,12 +16,22 @@ post-patch: do-build: (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) +qt-pre-configure: + ${PERL} -pi -e 's@DESTDIR = \$$\(QTDIR\)/bin@DESTDIR = ../../../bin@g' \ + ${WRKSRC}/tools/designer/designer/Makefile.in + ${PERL} -pi -e 's@sub-tools: sub-src @sub-tools: @g' ${WRKSRC}/Makefile + ${PERL} -pi -e "s@\$$(MAKE) util@@g; s@\$$(MAKE) uic@@g; \ + s@util \\\@designer@g; s@uic \\\@@g; \ + s@\t\tdesigner@@g" ${WRKSRC}/tools/designer/Makefile.in + ${PERL} -pi -e "s@getenv\( \"QTDIR\" \)@QT_PREFIX@g; \ + s@/tools/designer/templates@/share/qt2/designer/templates@g" \ + ${WRKSRC}/tools/designer/designer/newformimpl.cpp + .include "${MASTERDIR}/Makefile" LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 WRKSRC= ${WRKDIR}/qt-${PORTVERSION} -PATCHDIR= ${.CURDIR}/files PATCH_WRKSRC= ${WRKSRC} PKGDIR= ${.CURDIR} MAKE_ENV= QTDIR=${PREFIX} LD_LIBRARY_PATH=${PREFIX}/lib PREFIX=${PREFIX} diff --git a/devel/qt-designer/files/patch-Makefile b/devel/qt-designer/files/patch-Makefile deleted file mode 100644 index 3d93c0866277..000000000000 --- a/devel/qt-designer/files/patch-Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile Mon Aug 6 01:55:43 2001 -+++ Makefile.new Mon Aug 6 01:56:45 2001 -@@ -25,11 +25,11 @@ - -rm -f bin/moc - cp src/moc/moc bin/moc - --sub-tools: sub-src FORCE -+sub-tools: FORCE - cd tools; $(MAKE) - - symlinks: .buildopts -- @cd include; rm -f q*.h; for i in $(QTDIR)/src/*/q*.h $(QTDIR)/extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h -+ @cd include; rm -f q*.h; for i in ../src/*/q*.h ../extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h - - sub-src: src-moc src-mt .buildopts FORCE - cd src; $(MAKE) diff --git a/devel/qt-designer/files/patch-aa b/devel/qt-designer/files/patch-aa deleted file mode 100644 index a58966744e42..000000000000 --- a/devel/qt-designer/files/patch-aa +++ /dev/null @@ -1,52 +0,0 @@ ---- configs/freebsd-g++-shared Sun Dec 24 02:41:35 2000 -+++ configs/freebsd-g++-shared.new Sun Dec 24 02:42:49 2000 -@@ -6,7 +6,7 @@ - - # Compiling with support libraries - SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include --SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include -+SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD) - SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include - - # Compiling YACC output -@@ -23,7 +23,7 @@ - SYSCONF_LIBS_X11 = -lXext -lX11 -lm - # Qt, Qt+OpenGL - SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib --SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) -+SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD) - SYSCONF_LIBS_QT_OPENGL = - # OpenGL - SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -@@ -46,7 +46,7 @@ - SYSCONF_LIBS_THREAD = - - # Meta-object compiler --SYSCONF_MOC = $(QTDIR)/bin/moc -+SYSCONF_MOC = $(QTDIR)/bin/moc2 - - # UI compiler - SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -60,1 +60,1 @@ --SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) -+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) -@@ -65,6 +65,4 @@ - cd $(DESTDIR) && \ -- rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ -- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ -- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \ -- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) -+ rm -f lib$(TARGET).so;\ -+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so - -@@ -77,8 +75,8 @@ - SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ - $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) - # Compiling application source --SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 --SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions - # Default link type (static linking is still be used where required) - SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) - SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/devel/qt-designer/files/patch-ag b/devel/qt-designer/files/patch-ag deleted file mode 100644 index 0347913d3a31..000000000000 --- a/devel/qt-designer/files/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ ---- tools/designer/designer/help.cpp 2000/11/18 17:43:54 1.1 -+++ tools/designer/designer/help.cpp 2000/11/18 17:46:09 -@@ -84,8 +84,8 @@ - browser = new TextBrowser( this ); - browser->mimeSourceFactory()->setFilePath( home ); - browser->setFrameStyle( QFrame::Panel | QFrame::Sunken ); -- browser->mimeSourceFactory()->addFilePath( QString( getenv( "QTDIR" ) ) + "/tools/designer/manual" ); -- browser->mimeSourceFactory()->addFilePath( QString( getenv( "QTDIR" ) ) + "/doc/html/designer" ); -+ browser->mimeSourceFactory()->addFilePath( QT_PREFIX "/share/qt2/designer/manual" ); -+ browser->mimeSourceFactory()->addFilePath( QT_PREFIX "/share/doc/qt2/html/designer" ); - browser->mimeSourceFactory()->addFilePath( parent->documentationPath() ); - connect( browser, SIGNAL( textChanged() ), - this, SLOT( textChanged() ) ); diff --git a/devel/qt-designer/files/patch-ah b/devel/qt-designer/files/patch-ah deleted file mode 100644 index 1bf90ba1c6f2..000000000000 --- a/devel/qt-designer/files/patch-ah +++ /dev/null @@ -1,14 +0,0 @@ ---- tools/designer/designer/helpdialogimpl.cpp 2000/11/18 19:37:35 1.1 -+++ tools/designer/designer/helpdialogimpl.cpp 2000/11/18 19:38:57 -@@ -569,9 +569,9 @@ - delete lst; - - -- QString manualdir = QString( getenv( "QTDIR" ) ) + "/tools/designer/manual/book1.html"; -+ QString manualdir = QT_PREFIX "/share/qt2/designer/manual/book1.html"; - if ( !QFile::exists( manualdir ) ) -- manualdir = QString( getenv( "QTDIR" ) ) + "/doc/html/designer/book1.html"; -+ manualdir = QT_PREFIX "/share/doc/qt2/html/designer/book1.html"; - QFile file( manualdir ); - if ( !file.open( IO_ReadOnly ) ) - return; diff --git a/devel/qt-designer/files/patch-ai b/devel/qt-designer/files/patch-ai deleted file mode 100644 index 8ba1cf2ee470..000000000000 --- a/devel/qt-designer/files/patch-ai +++ /dev/null @@ -1,15 +0,0 @@ ---- tools/designer/designer/newformimpl.cpp 2000/11/18 17:43:54 1.1 -+++ tools/designer/designer/newformimpl.cpp 2000/11/18 17:48:49 -@@ -33,9 +33,9 @@ - { - if ( QFileInfo( "../templates" ).exists() ) - return "../templates"; -- QString qtdir = getenv( "QTDIR" ); -- if ( QFileInfo( qtdir + "/tools/designer/templates" ).exists() ) -- return qtdir + "/tools/designer/templates"; -+ QString qtdir = QT_PREFIX; -+ if ( QFileInfo( qtdir + "/share/qt2/designer/templates" ).exists() ) -+ return qtdir + "/share/qt2/designer/templates"; - return t; - } - diff --git a/devel/qt-designer/files/patch-designer::Makefile.in b/devel/qt-designer/files/patch-designer::Makefile.in deleted file mode 100644 index 52f3cca45258..000000000000 --- a/devel/qt-designer/files/patch-designer::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/designer/designer/Makefile.in Wed Jan 31 21:29:50 2001 -+++ tools/designer/designer/Makefile.in.new Sat Feb 3 20:41:04 2001 -@@ -14,7 +14,7 @@ - - ####### Target - --DESTDIR = $(QTDIR)/bin/ -+DESTDIR = ../../../bin/ - VER_MAJ = 1 - VER_MIN = 0 - VER_PATCH = 0 diff --git a/devel/qt-designer/files/patch-designer:Makefile.in b/devel/qt-designer/files/patch-designer:Makefile.in deleted file mode 100644 index 498cff3955af..000000000000 --- a/devel/qt-designer/files/patch-designer:Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ ---- tools/designer/Makefile.in Wed Jan 31 21:29:47 2001 -+++ tools/designer/Makefile.in.new Sat Feb 3 20:04:32 2001 -@@ -5,13 +5,9 @@ - # Template: subdirs - ############################################################################# - --SUBDIRS = util \ -- uic \ -- designer -+SUBDIRS = designer - - all: -- $(MAKE) util -- $(MAKE) uic - $(MAKE) designer - - diff --git a/devel/qt-designer/pkg-plist b/devel/qt-designer/pkg-plist index 2e4183356173..c4612f2176b3 100644 --- a/devel/qt-designer/pkg-plist +++ b/devel/qt-designer/pkg-plist @@ -1,165 +1,164 @@ -bin/designer -share/doc/qt2/html/designer/arrows/home.png -share/doc/qt2/html/designer/arrows/left.png -share/doc/qt2/html/designer/arrows/right.png -share/doc/qt2/html/designer/arrows/up.png -share/doc/qt2/html/designer/book1.html -share/doc/qt2/html/designer/chap10_1.html -share/doc/qt2/html/designer/chap1_1.html -share/doc/qt2/html/designer/chap2_1.html -share/doc/qt2/html/designer/chap2_2.html -share/doc/qt2/html/designer/chap2_3.html -share/doc/qt2/html/designer/chap2_4.html -share/doc/qt2/html/designer/chap3_1.html -share/doc/qt2/html/designer/chap3_2.html -share/doc/qt2/html/designer/chap3_3.html -share/doc/qt2/html/designer/chap3_4.html -share/doc/qt2/html/designer/chap4_1.html -share/doc/qt2/html/designer/chap4_2.html -share/doc/qt2/html/designer/chap5_1.html -share/doc/qt2/html/designer/chap5_2.html -share/doc/qt2/html/designer/chap5_3.html -share/doc/qt2/html/designer/chap5_4.html -share/doc/qt2/html/designer/chap5_5.html -share/doc/qt2/html/designer/chap5_6.html -share/doc/qt2/html/designer/chap6_1.html -share/doc/qt2/html/designer/chap6_2.html -share/doc/qt2/html/designer/chap6_3.html -share/doc/qt2/html/designer/chap6_4.html -share/doc/qt2/html/designer/chap6_5.html -share/doc/qt2/html/designer/chap6_6.html -share/doc/qt2/html/designer/chap6_7.html -share/doc/qt2/html/designer/chap7_1.html -share/doc/qt2/html/designer/chap7_10.html -share/doc/qt2/html/designer/chap7_11.html -share/doc/qt2/html/designer/chap7_12.html -share/doc/qt2/html/designer/chap7_13.html -share/doc/qt2/html/designer/chap7_14.html -share/doc/qt2/html/designer/chap7_15.html -share/doc/qt2/html/designer/chap7_16.html -share/doc/qt2/html/designer/chap7_2.html -share/doc/qt2/html/designer/chap7_3.html -share/doc/qt2/html/designer/chap7_4.html -share/doc/qt2/html/designer/chap7_5.html -share/doc/qt2/html/designer/chap7_6.html -share/doc/qt2/html/designer/chap7_7.html -share/doc/qt2/html/designer/chap7_8.html -share/doc/qt2/html/designer/chap7_9.html -share/doc/qt2/html/designer/chap8_1.html -share/doc/qt2/html/designer/chap9_1.html -share/doc/qt2/html/designer/chap9_2.html -share/doc/qt2/html/designer/chap9_3.html -share/doc/qt2/html/designer/chap9_4.html -share/doc/qt2/html/designer/chap9_5.html -share/doc/qt2/html/designer/chap9_6.html -share/doc/qt2/html/designer/colophon.html -share/doc/qt2/html/designer/feedback.html -share/doc/qt2/html/designer/figures/aboutdialog.png -share/doc/qt2/html/designer/figures/adjustsize.png -share/doc/qt2/html/designer/figures/breaklayout.png -share/doc/qt2/html/designer/figures/buttongroup.png -share/doc/qt2/html/designer/figures/buttongroupovercheckboxes.png -share/doc/qt2/html/designer/figures/checkbox.png -share/doc/qt2/html/designer/figures/combobox.png -share/doc/qt2/html/designer/figures/connectionedit.png -share/doc/qt2/html/designer/figures/connections.png -share/doc/qt2/html/designer/figures/connectionviewer.png -share/doc/qt2/html/designer/figures/connecttool.png -share/doc/qt2/html/designer/figures/customwidget.png -share/doc/qt2/html/designer/figures/customwidgets.png -share/doc/qt2/html/designer/figures/editcopy.png -share/doc/qt2/html/designer/figures/editcustomwidgets.png -share/doc/qt2/html/designer/figures/editcut.png -share/doc/qt2/html/designer/figures/editdelete.png -share/doc/qt2/html/designer/figures/editgrid.png -share/doc/qt2/html/designer/figures/edithlayout.png -share/doc/qt2/html/designer/figures/editiconview.png -share/doc/qt2/html/designer/figures/editlistbox.png -share/doc/qt2/html/designer/figures/editlistview.png -share/doc/qt2/html/designer/figures/editlower.png -share/doc/qt2/html/designer/figures/editmultiline.png -share/doc/qt2/html/designer/figures/editpaste.png -share/doc/qt2/html/designer/figures/editraise.png -share/doc/qt2/html/designer/figures/editslots.png -share/doc/qt2/html/designer/figures/emptydialog.png -share/doc/qt2/html/designer/figures/f001.png -share/doc/qt2/html/designer/figures/filenew.png -share/doc/qt2/html/designer/figures/filesave.png -share/doc/qt2/html/designer/figures/firstdialog.png -share/doc/qt2/html/designer/figures/form.png -share/doc/qt2/html/designer/figures/formsettings.png -share/doc/qt2/html/designer/figures/fourcheckboxes.png -share/doc/qt2/html/designer/figures/frame.png -share/doc/qt2/html/designer/figures/groupbox.png -share/doc/qt2/html/designer/figures/help.png -share/doc/qt2/html/designer/figures/helpdialog.png -share/doc/qt2/html/designer/figures/home.png -share/doc/qt2/html/designer/figures/iconview.png -share/doc/qt2/html/designer/figures/image.png -share/doc/qt2/html/designer/figures/label.png -share/doc/qt2/html/designer/figures/layout.png -share/doc/qt2/html/designer/figures/layouttutstep1.png -share/doc/qt2/html/designer/figures/layouttutstep10.png -share/doc/qt2/html/designer/figures/layouttutstep11.png -share/doc/qt2/html/designer/figures/layouttutstep2.png -share/doc/qt2/html/designer/figures/layouttutstep3.png -share/doc/qt2/html/designer/figures/layouttutstep4.png -share/doc/qt2/html/designer/figures/layouttutstep5.png -share/doc/qt2/html/designer/figures/layouttutstep6.png -share/doc/qt2/html/designer/figures/layouttutstep7.png -share/doc/qt2/html/designer/figures/layouttutstep9.png -share/doc/qt2/html/designer/figures/lcdnumber.png -share/doc/qt2/html/designer/figures/left.png -share/doc/qt2/html/designer/figures/line.png -share/doc/qt2/html/designer/figures/lineedit.png -share/doc/qt2/html/designer/figures/listbox.png -share/doc/qt2/html/designer/figures/listview.png -share/doc/qt2/html/designer/figures/load.png -share/doc/qt2/html/designer/figures/multilineedit.png -share/doc/qt2/html/designer/figures/newform.png -share/doc/qt2/html/designer/figures/newformdialog.png -share/doc/qt2/html/designer/figures/objecthierarchy.png -share/doc/qt2/html/designer/figures/onecheckbox.png -share/doc/qt2/html/designer/figures/ordertool.png -share/doc/qt2/html/designer/figures/paletteeditor.png -share/doc/qt2/html/designer/figures/pixlabel.png -share/doc/qt2/html/designer/figures/pizza1screenshot.png -share/doc/qt2/html/designer/figures/pointer.png -share/doc/qt2/html/designer/figures/preferences.png -share/doc/qt2/html/designer/figures/print.png -share/doc/qt2/html/designer/figures/progress.png -share/doc/qt2/html/designer/figures/pushbutton.png -share/doc/qt2/html/designer/figures/qtlogo.png -share/doc/qt2/html/designer/figures/radiobutton.png -share/doc/qt2/html/designer/figures/redo.png -share/doc/qt2/html/designer/figures/right.png -share/doc/qt2/html/designer/figures/slider.png -share/doc/qt2/html/designer/figures/slots.png -share/doc/qt2/html/designer/figures/spacer.png -share/doc/qt2/html/designer/figures/spinbox.png -share/doc/qt2/html/designer/figures/startup.png -share/doc/qt2/html/designer/figures/taborderform.png -share/doc/qt2/html/designer/figures/tabwidget.png -share/doc/qt2/html/designer/figures/testmode.png -share/doc/qt2/html/designer/figures/textbrowser.png -share/doc/qt2/html/designer/figures/textview.png -share/doc/qt2/html/designer/figures/title.png -share/doc/qt2/html/designer/figures/toolbutton.png -share/doc/qt2/html/designer/figures/topicchooser.png -share/doc/qt2/html/designer/figures/undo.png -share/doc/qt2/html/designer/figures/vlayout.png -share/doc/qt2/html/designer/figures/whatsthis.png -share/doc/qt2/html/designer/part1index.html -share/doc/qt2/html/designer/part2index.html -share/doc/qt2/html/designer/preface.html -share/qt2/designer/templates/Configuration_Dialog.ui -share/qt2/designer/templates/Dialog_with_Buttons_(Bottom).ui -share/qt2/designer/templates/Dialog_with_Buttons_(Right).ui share/qt2/designer/templates/Tab-Dialog.ui +share/qt2/designer/templates/Dialog_with_Buttons_(Right).ui +share/qt2/designer/templates/Dialog_with_Buttons_(Bottom).ui +share/qt2/designer/templates/Configuration_Dialog.ui +share/doc/qt2/html/designer/preface.html +share/doc/qt2/html/designer/part2index.html +share/doc/qt2/html/designer/part1index.html +share/doc/qt2/html/designer/figures/whatsthis.png +share/doc/qt2/html/designer/figures/vlayout.png +share/doc/qt2/html/designer/figures/undo.png +share/doc/qt2/html/designer/figures/topicchooser.png +share/doc/qt2/html/designer/figures/toolbutton.png +share/doc/qt2/html/designer/figures/title.png +share/doc/qt2/html/designer/figures/textview.png +share/doc/qt2/html/designer/figures/textbrowser.png +share/doc/qt2/html/designer/figures/testmode.png +share/doc/qt2/html/designer/figures/tabwidget.png +share/doc/qt2/html/designer/figures/taborderform.png +share/doc/qt2/html/designer/figures/startup.png +share/doc/qt2/html/designer/figures/spinbox.png +share/doc/qt2/html/designer/figures/spacer.png +share/doc/qt2/html/designer/figures/slots.png +share/doc/qt2/html/designer/figures/slider.png +share/doc/qt2/html/designer/figures/right.png +share/doc/qt2/html/designer/figures/redo.png +share/doc/qt2/html/designer/figures/radiobutton.png +share/doc/qt2/html/designer/figures/qtlogo.png +share/doc/qt2/html/designer/figures/pushbutton.png +share/doc/qt2/html/designer/figures/progress.png +share/doc/qt2/html/designer/figures/print.png +share/doc/qt2/html/designer/figures/preferences.png +share/doc/qt2/html/designer/figures/pointer.png +share/doc/qt2/html/designer/figures/pizza1screenshot.png +share/doc/qt2/html/designer/figures/pixlabel.png +share/doc/qt2/html/designer/figures/paletteeditor.png +share/doc/qt2/html/designer/figures/ordertool.png +share/doc/qt2/html/designer/figures/onecheckbox.png +share/doc/qt2/html/designer/figures/objecthierarchy.png +share/doc/qt2/html/designer/figures/newformdialog.png +share/doc/qt2/html/designer/figures/newform.png +share/doc/qt2/html/designer/figures/multilineedit.png +share/doc/qt2/html/designer/figures/load.png +share/doc/qt2/html/designer/figures/listview.png +share/doc/qt2/html/designer/figures/listbox.png +share/doc/qt2/html/designer/figures/lineedit.png +share/doc/qt2/html/designer/figures/line.png +share/doc/qt2/html/designer/figures/left.png +share/doc/qt2/html/designer/figures/lcdnumber.png +share/doc/qt2/html/designer/figures/layouttutstep9.png +share/doc/qt2/html/designer/figures/layouttutstep7.png +share/doc/qt2/html/designer/figures/layouttutstep6.png +share/doc/qt2/html/designer/figures/layouttutstep5.png +share/doc/qt2/html/designer/figures/layouttutstep4.png +share/doc/qt2/html/designer/figures/layouttutstep3.png +share/doc/qt2/html/designer/figures/layouttutstep2.png +share/doc/qt2/html/designer/figures/layouttutstep11.png +share/doc/qt2/html/designer/figures/layouttutstep10.png +share/doc/qt2/html/designer/figures/layouttutstep1.png +share/doc/qt2/html/designer/figures/layout.png +share/doc/qt2/html/designer/figures/label.png +share/doc/qt2/html/designer/figures/image.png +share/doc/qt2/html/designer/figures/iconview.png +share/doc/qt2/html/designer/figures/home.png +share/doc/qt2/html/designer/figures/helpdialog.png +share/doc/qt2/html/designer/figures/help.png +share/doc/qt2/html/designer/figures/groupbox.png +share/doc/qt2/html/designer/figures/frame.png +share/doc/qt2/html/designer/figures/fourcheckboxes.png +share/doc/qt2/html/designer/figures/formsettings.png +share/doc/qt2/html/designer/figures/form.png +share/doc/qt2/html/designer/figures/firstdialog.png +share/doc/qt2/html/designer/figures/filesave.png +share/doc/qt2/html/designer/figures/filenew.png +share/doc/qt2/html/designer/figures/f001.png +share/doc/qt2/html/designer/figures/emptydialog.png +share/doc/qt2/html/designer/figures/editslots.png +share/doc/qt2/html/designer/figures/editraise.png +share/doc/qt2/html/designer/figures/editpaste.png +share/doc/qt2/html/designer/figures/editmultiline.png +share/doc/qt2/html/designer/figures/editlower.png +share/doc/qt2/html/designer/figures/editlistview.png +share/doc/qt2/html/designer/figures/editlistbox.png +share/doc/qt2/html/designer/figures/editiconview.png +share/doc/qt2/html/designer/figures/edithlayout.png +share/doc/qt2/html/designer/figures/editgrid.png +share/doc/qt2/html/designer/figures/editdelete.png +share/doc/qt2/html/designer/figures/editcut.png +share/doc/qt2/html/designer/figures/editcustomwidgets.png +share/doc/qt2/html/designer/figures/editcopy.png +share/doc/qt2/html/designer/figures/customwidgets.png +share/doc/qt2/html/designer/figures/customwidget.png +share/doc/qt2/html/designer/figures/connecttool.png +share/doc/qt2/html/designer/figures/connectionviewer.png +share/doc/qt2/html/designer/figures/connections.png +share/doc/qt2/html/designer/figures/connectionedit.png +share/doc/qt2/html/designer/figures/combobox.png +share/doc/qt2/html/designer/figures/checkbox.png +share/doc/qt2/html/designer/figures/buttongroupovercheckboxes.png +share/doc/qt2/html/designer/figures/buttongroup.png +share/doc/qt2/html/designer/figures/breaklayout.png +share/doc/qt2/html/designer/figures/adjustsize.png +share/doc/qt2/html/designer/figures/aboutdialog.png +share/doc/qt2/html/designer/feedback.html +share/doc/qt2/html/designer/colophon.html +share/doc/qt2/html/designer/chap9_6.html +share/doc/qt2/html/designer/chap9_5.html +share/doc/qt2/html/designer/chap9_4.html +share/doc/qt2/html/designer/chap9_3.html +share/doc/qt2/html/designer/chap9_2.html +share/doc/qt2/html/designer/chap9_1.html +share/doc/qt2/html/designer/chap8_1.html +share/doc/qt2/html/designer/chap7_9.html +share/doc/qt2/html/designer/chap7_8.html +share/doc/qt2/html/designer/chap7_7.html +share/doc/qt2/html/designer/chap7_6.html +share/doc/qt2/html/designer/chap7_5.html +share/doc/qt2/html/designer/chap7_4.html +share/doc/qt2/html/designer/chap7_3.html +share/doc/qt2/html/designer/chap7_2.html +share/doc/qt2/html/designer/chap7_16.html +share/doc/qt2/html/designer/chap7_15.html +share/doc/qt2/html/designer/chap7_14.html +share/doc/qt2/html/designer/chap7_13.html +share/doc/qt2/html/designer/chap7_12.html +share/doc/qt2/html/designer/chap7_11.html +share/doc/qt2/html/designer/chap7_10.html +share/doc/qt2/html/designer/chap7_1.html +share/doc/qt2/html/designer/chap6_7.html +share/doc/qt2/html/designer/chap6_6.html +share/doc/qt2/html/designer/chap6_5.html +share/doc/qt2/html/designer/chap6_4.html +share/doc/qt2/html/designer/chap6_3.html +share/doc/qt2/html/designer/chap6_2.html +share/doc/qt2/html/designer/chap6_1.html +share/doc/qt2/html/designer/chap5_6.html +share/doc/qt2/html/designer/chap5_5.html +share/doc/qt2/html/designer/chap5_4.html +share/doc/qt2/html/designer/chap5_3.html +share/doc/qt2/html/designer/chap5_2.html +share/doc/qt2/html/designer/chap5_1.html +share/doc/qt2/html/designer/chap4_2.html +share/doc/qt2/html/designer/chap4_1.html +share/doc/qt2/html/designer/chap3_4.html +share/doc/qt2/html/designer/chap3_3.html +share/doc/qt2/html/designer/chap3_2.html +share/doc/qt2/html/designer/chap3_1.html +share/doc/qt2/html/designer/chap2_4.html +share/doc/qt2/html/designer/chap2_3.html +share/doc/qt2/html/designer/chap2_2.html +share/doc/qt2/html/designer/chap2_1.html +share/doc/qt2/html/designer/chap1_1.html +share/doc/qt2/html/designer/chap10_1.html +share/doc/qt2/html/designer/book1.html +share/doc/qt2/html/designer/arrows/up.png +share/doc/qt2/html/designer/arrows/right.png +share/doc/qt2/html/designer/arrows/left.png +share/doc/qt2/html/designer/arrows/home.png +bin/designer +@dirrm share/qt2/designer/templates +@dirrm share/qt2/designer +@dirrm share/qt2 @dirrm share/doc/qt2/html/designer/figures @dirrm share/doc/qt2/html/designer/arrows @dirrm share/doc/qt2/html/designer -@dirrm share/qt2/designer/templates -@dirrm share/qt2/designer -@unexec /sbin/rm -rf %D/share/doc/qt2/html 2>/dev/null || true -@unexec /sbin/rm -rf %D/share/doc/qt2 2>/dev/null || true diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 94c0250b3b98..cc3b3fbaf9b4 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -15,6 +15,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv USE_KDELIBS_VER=2 @@ -22,7 +24,13 @@ USE_PYTHON= yes PYTHON_VERSION= python2.1 USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes post-patch: @@ -32,6 +40,15 @@ post-patch: ${WRKSRC}/templates/Illustration.desktop pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ "s@LIBPYTHON =@LIBPYTHON= ${PTHREAD_LIBS}@g" ${PERL} -pi -e "s@la_LIBADD =@la_LIBADD= ${PTHREAD_LIBS}@g" \ diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist index edf5a89b87f8..92d9870a8a02 100644 --- a/editors/calligra/pkg-plist +++ b/editors/calligra/pkg-plist @@ -1535,23 +1535,19 @@ share/templates/Illustration.desktop share/templates/Presentation.desktop share/templates/SpreadSheet.desktop share/templates/TextDocument.desktop +@dirrm share/templates/.source +@dirrm share/templates @dirrm share/icons/locolor/32x32/apps +@dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/22x22/apps @dirrm share/icons/locolor/22x22 @dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/mimetypes @dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/mimetypes @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32/actions @dirrm share/icons/hicolor/22x22/mimetypes @dirrm share/icons/hicolor/22x22/apps -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/22x22 -@dirrm share/icons/hicolor/16x16/mimetypes -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/doc/HTML/en/kword @dirrm share/doc/HTML/en/kugar @dirrm share/doc/HTML/en/kspread @@ -1680,4 +1676,4 @@ share/templates/TextDocument.desktop @dirrm share/apps/kchart/icons @dirrm share/apps/kchart @dirrm share/applnk/Office -@dirrm lib/kde2 +@dirrm share/applnk diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index 94c0250b3b98..cc3b3fbaf9b4 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -15,6 +15,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv USE_KDELIBS_VER=2 @@ -22,7 +24,13 @@ USE_PYTHON= yes PYTHON_VERSION= python2.1 USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes post-patch: @@ -32,6 +40,15 @@ post-patch: ${WRKSRC}/templates/Illustration.desktop pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ "s@LIBPYTHON =@LIBPYTHON= ${PTHREAD_LIBS}@g" ${PERL} -pi -e "s@la_LIBADD =@la_LIBADD= ${PTHREAD_LIBS}@g" \ diff --git a/editors/koffice-kde3/pkg-plist b/editors/koffice-kde3/pkg-plist index edf5a89b87f8..92d9870a8a02 100644 --- a/editors/koffice-kde3/pkg-plist +++ b/editors/koffice-kde3/pkg-plist @@ -1535,23 +1535,19 @@ share/templates/Illustration.desktop share/templates/Presentation.desktop share/templates/SpreadSheet.desktop share/templates/TextDocument.desktop +@dirrm share/templates/.source +@dirrm share/templates @dirrm share/icons/locolor/32x32/apps +@dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/22x22/apps @dirrm share/icons/locolor/22x22 @dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/mimetypes @dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/mimetypes @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32/actions @dirrm share/icons/hicolor/22x22/mimetypes @dirrm share/icons/hicolor/22x22/apps -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/22x22 -@dirrm share/icons/hicolor/16x16/mimetypes -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/doc/HTML/en/kword @dirrm share/doc/HTML/en/kugar @dirrm share/doc/HTML/en/kspread @@ -1680,4 +1676,4 @@ share/templates/TextDocument.desktop @dirrm share/apps/kchart/icons @dirrm share/apps/kchart @dirrm share/applnk/Office -@dirrm lib/kde2 +@dirrm share/applnk diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index 94c0250b3b98..cc3b3fbaf9b4 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -15,6 +15,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv USE_KDELIBS_VER=2 @@ -22,7 +24,13 @@ USE_PYTHON= yes PYTHON_VERSION= python2.1 USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes post-patch: @@ -32,6 +40,15 @@ post-patch: ${WRKSRC}/templates/Illustration.desktop pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ "s@LIBPYTHON =@LIBPYTHON= ${PTHREAD_LIBS}@g" ${PERL} -pi -e "s@la_LIBADD =@la_LIBADD= ${PTHREAD_LIBS}@g" \ diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist index edf5a89b87f8..92d9870a8a02 100644 --- a/editors/koffice-kde4/pkg-plist +++ b/editors/koffice-kde4/pkg-plist @@ -1535,23 +1535,19 @@ share/templates/Illustration.desktop share/templates/Presentation.desktop share/templates/SpreadSheet.desktop share/templates/TextDocument.desktop +@dirrm share/templates/.source +@dirrm share/templates @dirrm share/icons/locolor/32x32/apps +@dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/22x22/apps @dirrm share/icons/locolor/22x22 @dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/mimetypes @dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/mimetypes @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32/actions @dirrm share/icons/hicolor/22x22/mimetypes @dirrm share/icons/hicolor/22x22/apps -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/22x22 -@dirrm share/icons/hicolor/16x16/mimetypes -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/doc/HTML/en/kword @dirrm share/doc/HTML/en/kugar @dirrm share/doc/HTML/en/kspread @@ -1680,4 +1676,4 @@ share/templates/TextDocument.desktop @dirrm share/apps/kchart/icons @dirrm share/apps/kchart @dirrm share/applnk/Office -@dirrm lib/kde2 +@dirrm share/applnk diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile index 94c0250b3b98..cc3b3fbaf9b4 100644 --- a/editors/koffice/Makefile +++ b/editors/koffice/Makefile @@ -15,6 +15,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv USE_KDELIBS_VER=2 @@ -22,7 +24,13 @@ USE_PYTHON= yes PYTHON_VERSION= python2.1 USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes post-patch: @@ -32,6 +40,15 @@ post-patch: ${WRKSRC}/templates/Illustration.desktop pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ "s@LIBPYTHON =@LIBPYTHON= ${PTHREAD_LIBS}@g" ${PERL} -pi -e "s@la_LIBADD =@la_LIBADD= ${PTHREAD_LIBS}@g" \ diff --git a/editors/koffice/pkg-plist b/editors/koffice/pkg-plist index edf5a89b87f8..92d9870a8a02 100644 --- a/editors/koffice/pkg-plist +++ b/editors/koffice/pkg-plist @@ -1535,23 +1535,19 @@ share/templates/Illustration.desktop share/templates/Presentation.desktop share/templates/SpreadSheet.desktop share/templates/TextDocument.desktop +@dirrm share/templates/.source +@dirrm share/templates @dirrm share/icons/locolor/32x32/apps +@dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/22x22/apps @dirrm share/icons/locolor/22x22 @dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/mimetypes @dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/mimetypes @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32/actions @dirrm share/icons/hicolor/22x22/mimetypes @dirrm share/icons/hicolor/22x22/apps -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/22x22 -@dirrm share/icons/hicolor/16x16/mimetypes -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/doc/HTML/en/kword @dirrm share/doc/HTML/en/kugar @dirrm share/doc/HTML/en/kspread @@ -1680,4 +1676,4 @@ share/templates/TextDocument.desktop @dirrm share/apps/kchart/icons @dirrm share/apps/kchart @dirrm share/applnk/Office -@dirrm lib/kde2 +@dirrm share/applnk diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile index 76634e064635..e58fb841d4a1 100644 --- a/games/kdegames2/Makefile +++ b/games/kdegames2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdegames -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= games kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,9 +14,31 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/games/kdegames2/distinfo b/games/kdegames2/distinfo index 43ac9dfc756b..cdb47166df8e 100644 --- a/games/kdegames2/distinfo +++ b/games/kdegames2/distinfo @@ -1 +1 @@ -MD5 (KDE/kdegames-2.2.1.tar.bz2) = ddfb22843331f548bac51dc6a167958f +MD5 (KDE/kdegames-2.2.2.tar.bz2) = 65b1e9885bdda64597e6e3cdf129cee3 diff --git a/games/kdegames2/pkg-plist b/games/kdegames2/pkg-plist index 491c60bbff18..ec246f8e9c31 100644 --- a/games/kdegames2/pkg-plist +++ b/games/kdegames2/pkg-plist @@ -1897,7 +1897,6 @@ share/icons/locolor/32x32/apps/lskat.png @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/lskat @dirrm share/doc/HTML/en/kwin4 @dirrm share/doc/HTML/en/ktuberling @@ -2027,3 +2026,4 @@ share/icons/locolor/32x32/apps/lskat.png @dirrm share/applnk/Games/Board @dirrm share/applnk/Games/Arcade @dirrm share/applnk/Games +@dirrm share/applnk diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 76634e064635..e58fb841d4a1 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdegames -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= games kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,9 +14,31 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo index 43ac9dfc756b..cdb47166df8e 100644 --- a/games/kdegames3/distinfo +++ b/games/kdegames3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdegames-2.2.1.tar.bz2) = ddfb22843331f548bac51dc6a167958f +MD5 (KDE/kdegames-2.2.2.tar.bz2) = 65b1e9885bdda64597e6e3cdf129cee3 diff --git a/games/kdegames3/pkg-plist b/games/kdegames3/pkg-plist index 491c60bbff18..ec246f8e9c31 100644 --- a/games/kdegames3/pkg-plist +++ b/games/kdegames3/pkg-plist @@ -1897,7 +1897,6 @@ share/icons/locolor/32x32/apps/lskat.png @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/lskat @dirrm share/doc/HTML/en/kwin4 @dirrm share/doc/HTML/en/ktuberling @@ -2027,3 +2026,4 @@ share/icons/locolor/32x32/apps/lskat.png @dirrm share/applnk/Games/Board @dirrm share/applnk/Games/Arcade @dirrm share/applnk/Games +@dirrm share/applnk diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index 76634e064635..e58fb841d4a1 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdegames -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= games kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,9 +14,31 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo index 43ac9dfc756b..cdb47166df8e 100644 --- a/games/kdegames4/distinfo +++ b/games/kdegames4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdegames-2.2.1.tar.bz2) = ddfb22843331f548bac51dc6a167958f +MD5 (KDE/kdegames-2.2.2.tar.bz2) = 65b1e9885bdda64597e6e3cdf129cee3 diff --git a/games/kdegames4/pkg-plist b/games/kdegames4/pkg-plist index 491c60bbff18..ec246f8e9c31 100644 --- a/games/kdegames4/pkg-plist +++ b/games/kdegames4/pkg-plist @@ -1897,7 +1897,6 @@ share/icons/locolor/32x32/apps/lskat.png @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/lskat @dirrm share/doc/HTML/en/kwin4 @dirrm share/doc/HTML/en/ktuberling @@ -2027,3 +2026,4 @@ share/icons/locolor/32x32/apps/lskat.png @dirrm share/applnk/Games/Board @dirrm share/applnk/Games/Arcade @dirrm share/applnk/Games +@dirrm share/applnk diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile index 1d8715cd58ea..7a180c62b099 100644 --- a/graphics/kdegraphics2/Makefile +++ b/graphics/kdegraphics2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdegraphics -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,7 +14,10 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -BUILD_DEPENDS= dvips:${PORTSDIR}/print/teTeX +BUILD_DEPENDS= dvips:${PORTSDIR}/print/teTeX \ + autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink RUN_DEPENDS= dvips:${PORTSDIR}/print/teTeX USE_KDELIBS_VER=2 @@ -22,7 +25,13 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS+=--without-kamera +CONFIGURE_ARGS+=--without-kamera --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif .include <bsd.port.pre.mk> @@ -48,6 +57,15 @@ pre-everything:: .endif pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@libkscan_la_LIBADD =@libkscan_la_LIBADD= -lintl@g" ${WRKSRC}/libkscan/Makefile.in ${PERL} -pi -e "s@libkcm_kamera_la_LIBADD =@libkcm_kamera_la_LIBADD= -lintl@g" ${WKRSRC}/kamera/kcontrol/Makefile.in ${PERL} -pi -e "s@name = item@name=(char*)item@g" ${WRKSRC}/kamera/kcontrol/kamera.cpp diff --git a/graphics/kdegraphics2/distinfo b/graphics/kdegraphics2/distinfo index 594b94dcf295..2369e2cdb937 100644 --- a/graphics/kdegraphics2/distinfo +++ b/graphics/kdegraphics2/distinfo @@ -1 +1 @@ -MD5 (KDE/kdegraphics-2.2.1.tar.bz2) = a2d0b9242f20264167f8b96a8ba3a5c7 +MD5 (KDE/kdegraphics-2.2.2.tar.bz2) = b9341505c6b9de8f018dd9d1896356e9 diff --git a/graphics/kdegraphics2/pkg-plist b/graphics/kdegraphics2/pkg-plist index 5a05b0df8381..9e4307a74b95 100644 --- a/graphics/kdegraphics2/pkg-plist +++ b/graphics/kdegraphics2/pkg-plist @@ -5,7 +5,7 @@ bin/kfax bin/kfract bin/kghostview bin/kiconedit -%%SANE%%bin/kooka +bin/kooka bin/kpaint bin/kruler bin/ksnapshot @@ -224,8 +224,6 @@ share/icons/locolor/32x32/apps/kcoloredit.png @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/doc/HTML/en/kview @dirrm share/doc/HTML/en/ksnapshot @dirrm share/doc/HTML/en/kruler @@ -253,5 +251,5 @@ share/icons/locolor/32x32/apps/kcoloredit.png @dirrm share/apps/kdvi/toolbar @dirrm share/apps/kdvi @dirrm share/applnk/Utilities -@dirrm share/applnk/Settings/Peripherals @dirrm share/applnk/Graphics +@dirrm share/applnk diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 1d8715cd58ea..7a180c62b099 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdegraphics -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,7 +14,10 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -BUILD_DEPENDS= dvips:${PORTSDIR}/print/teTeX +BUILD_DEPENDS= dvips:${PORTSDIR}/print/teTeX \ + autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink RUN_DEPENDS= dvips:${PORTSDIR}/print/teTeX USE_KDELIBS_VER=2 @@ -22,7 +25,13 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS+=--without-kamera +CONFIGURE_ARGS+=--without-kamera --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif .include <bsd.port.pre.mk> @@ -48,6 +57,15 @@ pre-everything:: .endif pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@libkscan_la_LIBADD =@libkscan_la_LIBADD= -lintl@g" ${WRKSRC}/libkscan/Makefile.in ${PERL} -pi -e "s@libkcm_kamera_la_LIBADD =@libkcm_kamera_la_LIBADD= -lintl@g" ${WKRSRC}/kamera/kcontrol/Makefile.in ${PERL} -pi -e "s@name = item@name=(char*)item@g" ${WRKSRC}/kamera/kcontrol/kamera.cpp diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index 594b94dcf295..2369e2cdb937 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdegraphics-2.2.1.tar.bz2) = a2d0b9242f20264167f8b96a8ba3a5c7 +MD5 (KDE/kdegraphics-2.2.2.tar.bz2) = b9341505c6b9de8f018dd9d1896356e9 diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist index 5a05b0df8381..9e4307a74b95 100644 --- a/graphics/kdegraphics3/pkg-plist +++ b/graphics/kdegraphics3/pkg-plist @@ -5,7 +5,7 @@ bin/kfax bin/kfract bin/kghostview bin/kiconedit -%%SANE%%bin/kooka +bin/kooka bin/kpaint bin/kruler bin/ksnapshot @@ -224,8 +224,6 @@ share/icons/locolor/32x32/apps/kcoloredit.png @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/doc/HTML/en/kview @dirrm share/doc/HTML/en/ksnapshot @dirrm share/doc/HTML/en/kruler @@ -253,5 +251,5 @@ share/icons/locolor/32x32/apps/kcoloredit.png @dirrm share/apps/kdvi/toolbar @dirrm share/apps/kdvi @dirrm share/applnk/Utilities -@dirrm share/applnk/Settings/Peripherals @dirrm share/applnk/Graphics +@dirrm share/applnk diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index 1d8715cd58ea..7a180c62b099 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdegraphics -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,7 +14,10 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -BUILD_DEPENDS= dvips:${PORTSDIR}/print/teTeX +BUILD_DEPENDS= dvips:${PORTSDIR}/print/teTeX \ + autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink RUN_DEPENDS= dvips:${PORTSDIR}/print/teTeX USE_KDELIBS_VER=2 @@ -22,7 +25,13 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS+=--without-kamera +CONFIGURE_ARGS+=--without-kamera --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif .include <bsd.port.pre.mk> @@ -48,6 +57,15 @@ pre-everything:: .endif pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@libkscan_la_LIBADD =@libkscan_la_LIBADD= -lintl@g" ${WRKSRC}/libkscan/Makefile.in ${PERL} -pi -e "s@libkcm_kamera_la_LIBADD =@libkcm_kamera_la_LIBADD= -lintl@g" ${WKRSRC}/kamera/kcontrol/Makefile.in ${PERL} -pi -e "s@name = item@name=(char*)item@g" ${WRKSRC}/kamera/kcontrol/kamera.cpp diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo index 594b94dcf295..2369e2cdb937 100644 --- a/graphics/kdegraphics4/distinfo +++ b/graphics/kdegraphics4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdegraphics-2.2.1.tar.bz2) = a2d0b9242f20264167f8b96a8ba3a5c7 +MD5 (KDE/kdegraphics-2.2.2.tar.bz2) = b9341505c6b9de8f018dd9d1896356e9 diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist index 5a05b0df8381..9e4307a74b95 100644 --- a/graphics/kdegraphics4/pkg-plist +++ b/graphics/kdegraphics4/pkg-plist @@ -5,7 +5,7 @@ bin/kfax bin/kfract bin/kghostview bin/kiconedit -%%SANE%%bin/kooka +bin/kooka bin/kpaint bin/kruler bin/ksnapshot @@ -224,8 +224,6 @@ share/icons/locolor/32x32/apps/kcoloredit.png @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/doc/HTML/en/kview @dirrm share/doc/HTML/en/ksnapshot @dirrm share/doc/HTML/en/kruler @@ -253,5 +251,5 @@ share/icons/locolor/32x32/apps/kcoloredit.png @dirrm share/apps/kdvi/toolbar @dirrm share/apps/kdvi @dirrm share/applnk/Utilities -@dirrm share/applnk/Settings/Peripherals @dirrm share/applnk/Graphics +@dirrm share/applnk diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile index 42d7e7fffe93..d1ab1df6523f 100644 --- a/math/kcalc/Makefile +++ b/math/kcalc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeutils -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo index 562818721e98..2a396fa164aa 100644 --- a/math/kcalc/distinfo +++ b/math/kcalc/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5 +MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a diff --git a/math/kcalc/files/patch-portable.cpp b/math/kcalc/files/patch-portable.cpp new file mode 100644 index 000000000000..d6746dc1c282 --- /dev/null +++ b/math/kcalc/files/patch-portable.cpp @@ -0,0 +1,20 @@ +--- klaptopdaemon/portable.cpp- Thu Jun 28 00:08:02 2001 ++++ klaptopdaemon/portable.cpp Thu Jun 28 00:08:22 2001 +@@ -453,7 +453,7 @@ + if (ret == -1) + return 0; + +- return (info.ai_batt_time != 0xffff); ++ return (info.ai_batt_time != -1); + } + + // +@@ -638,7 +638,7 @@ + + p.powered = info.ai_acline; + p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life); +- p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1); ++ p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1); + return(p); + + bad: diff --git a/math/kcalc/pkg-plist b/math/kcalc/pkg-plist index 451d3587f1ef..a26fa72c3a97 100644 --- a/math/kcalc/pkg-plist +++ b/math/kcalc/pkg-plist @@ -251,7 +251,6 @@ share/services/arkpart.desktop @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpm @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/klprfax @@ -308,7 +307,6 @@ share/services/arkpart.desktop @dirrm share/apps/ark/icons/hicolor @dirrm share/apps/ark/icons @dirrm share/apps/ark -@dirrm share/apps @dirrm share/applnk/Utilities @dirrm share/applnk/System @dirrm share/applnk/Settings/PowerControl @@ -316,4 +314,3 @@ share/services/arkpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Editors @dirrm share/applnk -@dirrm lib/kde2 diff --git a/misc/kdeaddons/Makefile b/misc/kdeaddons/Makefile index 26fe58557c84..18fe7500dff1 100644 --- a/misc/kdeaddons/Makefile +++ b/misc/kdeaddons/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeaddons -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,30 +14,40 @@ DIST_SUBDIR= KDE MAINTAINER?= ports@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink +LIB_DEPENDS+= noatun.0:${PORTSDIR}/audio/kdemultimedia2 \ + SDL-1.1.3:${PORTSDIR}/devel/sdl12 + +WITH_SDL= yes USE_KDEBASE_VER=2 -LIB_DEPENDS+= noatun.0:${PORTSDIR}/audio/kdemultimedia2 USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes PLIST_SUB+= RM=${RM} +CONFIGURE_ENV+= SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/include/SDL11/SDL.h) -WITH_SDL= yes -.endif - -.if defined(WITH_SDL) && ${WITH_SDL} == yes -LIB_DEPENDS+= SDL-1.1.3:${PORTSDIR}/devel/sdl12 -CONFIGURE_ENV+= SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" -PLIST_SUB+= SDL="" -.else -PLIST_SUB+= SDL="@comment " -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with SDL support," - @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_SDL=yes\"" - @${ECHO_MSG} -.endif +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ + "s@sdl-config@${LOCALBASE}/bin/sdl11-config@g" .include <bsd.port.post.mk> diff --git a/misc/kdeaddons/distinfo b/misc/kdeaddons/distinfo index 54bc41edca3c..40c40c31dea5 100644 --- a/misc/kdeaddons/distinfo +++ b/misc/kdeaddons/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeaddons-2.2.1.tar.bz2) = 034f35ed3cd575b65f8ccc6110590d20 +MD5 (KDE/kdeaddons-2.2.2.tar.bz2) = 9392da0992f4aede5f6a86840e47fef6 diff --git a/misc/kdeaddons/pkg-plist b/misc/kdeaddons/pkg-plist index 3eca8d5c45a4..de49b3f8b00c 100644 --- a/misc/kdeaddons/pkg-plist +++ b/misc/kdeaddons/pkg-plist @@ -1,11 +1,7 @@ -@unexec %%RM%% -f %D/lib/libkolourpicker.so -@unexec %%RM%% -f %D/lib/libktimemon.so -@unexec %%RM%% -f %D/share/doc/HTML/en/kate-plugins/common -@unexec %%RM%% -f %D/share/doc/HTML/en/kicker-applets/common bin/dcop_kate -%%SDL%%bin/noatunsynaescope.bin -%%SDL%%bin/noatuntippecanoe.bin -%%SDL%%bin/noatuntyler.bin +bin/noatunsynaescope.bin +bin/noatuntippecanoe.bin +bin/noatuntyler.bin bin/testor lib/kde2/libbabelfishplugin.la lib/kde2/libbabelfishplugin.so @@ -41,30 +37,30 @@ lib/libkolourpicker.so.1 lib/libktimemon.la lib/libktimemon.so lib/libktimemon.so.1 -%%SDL%%lib/libnoatunblurscope.la -%%SDL%%lib/libnoatunblurscope.so +lib/libnoatunblurscope.la +lib/libnoatunblurscope.so lib/libnoatunluckytag.la lib/libnoatunluckytag.so lib/libnoatunmadness.la lib/libnoatunmadness.so -%%SDL%%lib/libnoatunsynaescope.la -%%SDL%%lib/libnoatunsynaescope.so -%%SDL%%lib/libnoatuntippecanoe.la -%%SDL%%lib/libnoatuntippecanoe.so -%%SDL%%lib/libnoatuntyler.la -%%SDL%%lib/libnoatuntyler.so +lib/libnoatunsynaescope.la +lib/libnoatunsynaescope.so +lib/libnoatuntippecanoe.la +lib/libnoatuntippecanoe.so +lib/libnoatuntyler.la +lib/libnoatuntyler.so lib/libnoatunwakeup.la lib/libnoatunwakeup.so -share/apps/kate/plugins/katehtmltools/ui.rc share/apps/kate/plugins/katehtmltools.desktop -share/apps/kate/plugins/kateinsertcommand/ui.rc +share/apps/kate/plugins/katehtmltools/ui.rc share/apps/kate/plugins/kateinsertcommand.desktop -share/apps/kate/plugins/kateopenheader/ui.rc +share/apps/kate/plugins/kateinsertcommand/ui.rc share/apps/kate/plugins/kateopenheader.desktop -share/apps/kate/plugins/kateprojectmanager/ui.rc +share/apps/kate/plugins/kateopenheader/ui.rc share/apps/kate/plugins/kateprojectmanager.desktop -share/apps/kate/plugins/katetextfilter/ui.rc +share/apps/kate/plugins/kateprojectmanager/ui.rc share/apps/kate/plugins/katetextfilter.desktop +share/apps/kate/plugins/katetextfilter/ui.rc share/apps/khtml/kpartplugins/khtmlsettingsplugin.rc share/apps/khtml/kpartplugins/plugin_babelfish.rc share/apps/khtml/kpartplugins/plugin_domtreeviewer.rc @@ -84,13 +80,13 @@ share/apps/konqiconview/kpartplugins/dirfilterplugin.rc share/apps/konqiconview/kpartplugins/kimgalleryplugin.rc share/apps/konqlistview/kpartplugins/dirfilterplugin.rc share/apps/konqlistview/kpartplugins/kimgalleryplugin.rc -%%SDL%%share/apps/noatun/blurscope.plugin +share/apps/noatun/blurscope.plugin share/apps/noatun/luckytag.plugin share/apps/noatun/madness.plugin -%%SDL%%share/apps/noatun/synaescope.plugin -%%SDL%%share/apps/noatun/tippecanoe.plugin -%%SDL%%share/apps/noatun/tyler.plugin -%%SDL%%share/apps/noatun/tylerstates +share/apps/noatun/synaescope.plugin +share/apps/noatun/tippecanoe.plugin +share/apps/noatun/tyler.plugin +share/apps/noatun/tylerstates share/apps/noatun/wakeup.plugin share/doc/HTML/en/kate-plugins/common share/doc/HTML/en/kate-plugins/helloworld.docbook @@ -124,28 +120,14 @@ share/icons/locolor/16x16/apps/ktimemon.png share/icons/locolor/32x32/apps/ktimemon.png share/mimelnk/application/x-webarchive.desktop share/services/webarchivethumbnail.desktop -@dirrm share/services -@dirrm share/mimelnk/application -@dirrm share/icons/locolor/32x32/apps -@dirrm share/icons/locolor/16x16/apps -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/16x16/actions @dirrm share/doc/HTML/en/kicker-applets @dirrm share/doc/HTML/en/kate-plugins -@dirrm share/doc/HTML/en -@dirrm share/apps/noatun -@dirrm share/apps/konqlistview/kpartplugins -@dirrm share/apps/konqiconview/kpartplugins @dirrm share/apps/knewsticker/scripts @dirrm share/apps/knewsticker -@dirrm share/apps/kicker/applets @dirrm share/apps/khtml/kpartplugins -@dirrm share/apps/khtml @dirrm share/apps/kate/plugins/katetextfilter @dirrm share/apps/kate/plugins/kateprojectmanager @dirrm share/apps/kate/plugins/kateopenheader @dirrm share/apps/kate/plugins/kateinsertcommand @dirrm share/apps/kate/plugins/katehtmltools @dirrm share/apps/kate/plugins -@dirrm share/apps/kate -@dirrm lib/kde2 diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile index 26fe58557c84..18fe7500dff1 100644 --- a/misc/kdeaddons3/Makefile +++ b/misc/kdeaddons3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeaddons -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,30 +14,40 @@ DIST_SUBDIR= KDE MAINTAINER?= ports@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink +LIB_DEPENDS+= noatun.0:${PORTSDIR}/audio/kdemultimedia2 \ + SDL-1.1.3:${PORTSDIR}/devel/sdl12 + +WITH_SDL= yes USE_KDEBASE_VER=2 -LIB_DEPENDS+= noatun.0:${PORTSDIR}/audio/kdemultimedia2 USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes PLIST_SUB+= RM=${RM} +CONFIGURE_ENV+= SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/include/SDL11/SDL.h) -WITH_SDL= yes -.endif - -.if defined(WITH_SDL) && ${WITH_SDL} == yes -LIB_DEPENDS+= SDL-1.1.3:${PORTSDIR}/devel/sdl12 -CONFIGURE_ENV+= SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" -PLIST_SUB+= SDL="" -.else -PLIST_SUB+= SDL="@comment " -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with SDL support," - @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_SDL=yes\"" - @${ECHO_MSG} -.endif +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ + "s@sdl-config@${LOCALBASE}/bin/sdl11-config@g" .include <bsd.port.post.mk> diff --git a/misc/kdeaddons3/distinfo b/misc/kdeaddons3/distinfo index 54bc41edca3c..40c40c31dea5 100644 --- a/misc/kdeaddons3/distinfo +++ b/misc/kdeaddons3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeaddons-2.2.1.tar.bz2) = 034f35ed3cd575b65f8ccc6110590d20 +MD5 (KDE/kdeaddons-2.2.2.tar.bz2) = 9392da0992f4aede5f6a86840e47fef6 diff --git a/misc/kdeaddons3/pkg-plist b/misc/kdeaddons3/pkg-plist index 3eca8d5c45a4..de49b3f8b00c 100644 --- a/misc/kdeaddons3/pkg-plist +++ b/misc/kdeaddons3/pkg-plist @@ -1,11 +1,7 @@ -@unexec %%RM%% -f %D/lib/libkolourpicker.so -@unexec %%RM%% -f %D/lib/libktimemon.so -@unexec %%RM%% -f %D/share/doc/HTML/en/kate-plugins/common -@unexec %%RM%% -f %D/share/doc/HTML/en/kicker-applets/common bin/dcop_kate -%%SDL%%bin/noatunsynaescope.bin -%%SDL%%bin/noatuntippecanoe.bin -%%SDL%%bin/noatuntyler.bin +bin/noatunsynaescope.bin +bin/noatuntippecanoe.bin +bin/noatuntyler.bin bin/testor lib/kde2/libbabelfishplugin.la lib/kde2/libbabelfishplugin.so @@ -41,30 +37,30 @@ lib/libkolourpicker.so.1 lib/libktimemon.la lib/libktimemon.so lib/libktimemon.so.1 -%%SDL%%lib/libnoatunblurscope.la -%%SDL%%lib/libnoatunblurscope.so +lib/libnoatunblurscope.la +lib/libnoatunblurscope.so lib/libnoatunluckytag.la lib/libnoatunluckytag.so lib/libnoatunmadness.la lib/libnoatunmadness.so -%%SDL%%lib/libnoatunsynaescope.la -%%SDL%%lib/libnoatunsynaescope.so -%%SDL%%lib/libnoatuntippecanoe.la -%%SDL%%lib/libnoatuntippecanoe.so -%%SDL%%lib/libnoatuntyler.la -%%SDL%%lib/libnoatuntyler.so +lib/libnoatunsynaescope.la +lib/libnoatunsynaescope.so +lib/libnoatuntippecanoe.la +lib/libnoatuntippecanoe.so +lib/libnoatuntyler.la +lib/libnoatuntyler.so lib/libnoatunwakeup.la lib/libnoatunwakeup.so -share/apps/kate/plugins/katehtmltools/ui.rc share/apps/kate/plugins/katehtmltools.desktop -share/apps/kate/plugins/kateinsertcommand/ui.rc +share/apps/kate/plugins/katehtmltools/ui.rc share/apps/kate/plugins/kateinsertcommand.desktop -share/apps/kate/plugins/kateopenheader/ui.rc +share/apps/kate/plugins/kateinsertcommand/ui.rc share/apps/kate/plugins/kateopenheader.desktop -share/apps/kate/plugins/kateprojectmanager/ui.rc +share/apps/kate/plugins/kateopenheader/ui.rc share/apps/kate/plugins/kateprojectmanager.desktop -share/apps/kate/plugins/katetextfilter/ui.rc +share/apps/kate/plugins/kateprojectmanager/ui.rc share/apps/kate/plugins/katetextfilter.desktop +share/apps/kate/plugins/katetextfilter/ui.rc share/apps/khtml/kpartplugins/khtmlsettingsplugin.rc share/apps/khtml/kpartplugins/plugin_babelfish.rc share/apps/khtml/kpartplugins/plugin_domtreeviewer.rc @@ -84,13 +80,13 @@ share/apps/konqiconview/kpartplugins/dirfilterplugin.rc share/apps/konqiconview/kpartplugins/kimgalleryplugin.rc share/apps/konqlistview/kpartplugins/dirfilterplugin.rc share/apps/konqlistview/kpartplugins/kimgalleryplugin.rc -%%SDL%%share/apps/noatun/blurscope.plugin +share/apps/noatun/blurscope.plugin share/apps/noatun/luckytag.plugin share/apps/noatun/madness.plugin -%%SDL%%share/apps/noatun/synaescope.plugin -%%SDL%%share/apps/noatun/tippecanoe.plugin -%%SDL%%share/apps/noatun/tyler.plugin -%%SDL%%share/apps/noatun/tylerstates +share/apps/noatun/synaescope.plugin +share/apps/noatun/tippecanoe.plugin +share/apps/noatun/tyler.plugin +share/apps/noatun/tylerstates share/apps/noatun/wakeup.plugin share/doc/HTML/en/kate-plugins/common share/doc/HTML/en/kate-plugins/helloworld.docbook @@ -124,28 +120,14 @@ share/icons/locolor/16x16/apps/ktimemon.png share/icons/locolor/32x32/apps/ktimemon.png share/mimelnk/application/x-webarchive.desktop share/services/webarchivethumbnail.desktop -@dirrm share/services -@dirrm share/mimelnk/application -@dirrm share/icons/locolor/32x32/apps -@dirrm share/icons/locolor/16x16/apps -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/16x16/actions @dirrm share/doc/HTML/en/kicker-applets @dirrm share/doc/HTML/en/kate-plugins -@dirrm share/doc/HTML/en -@dirrm share/apps/noatun -@dirrm share/apps/konqlistview/kpartplugins -@dirrm share/apps/konqiconview/kpartplugins @dirrm share/apps/knewsticker/scripts @dirrm share/apps/knewsticker -@dirrm share/apps/kicker/applets @dirrm share/apps/khtml/kpartplugins -@dirrm share/apps/khtml @dirrm share/apps/kate/plugins/katetextfilter @dirrm share/apps/kate/plugins/kateprojectmanager @dirrm share/apps/kate/plugins/kateopenheader @dirrm share/apps/kate/plugins/kateinsertcommand @dirrm share/apps/kate/plugins/katehtmltools @dirrm share/apps/kate/plugins -@dirrm share/apps/kate -@dirrm lib/kde2 diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile index 42d7e7fffe93..d1ab1df6523f 100644 --- a/misc/kdeutils2/Makefile +++ b/misc/kdeutils2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeutils -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/misc/kdeutils2/distinfo b/misc/kdeutils2/distinfo index 562818721e98..2a396fa164aa 100644 --- a/misc/kdeutils2/distinfo +++ b/misc/kdeutils2/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5 +MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a diff --git a/misc/kdeutils2/files/patch-portable.cpp b/misc/kdeutils2/files/patch-portable.cpp new file mode 100644 index 000000000000..d6746dc1c282 --- /dev/null +++ b/misc/kdeutils2/files/patch-portable.cpp @@ -0,0 +1,20 @@ +--- klaptopdaemon/portable.cpp- Thu Jun 28 00:08:02 2001 ++++ klaptopdaemon/portable.cpp Thu Jun 28 00:08:22 2001 +@@ -453,7 +453,7 @@ + if (ret == -1) + return 0; + +- return (info.ai_batt_time != 0xffff); ++ return (info.ai_batt_time != -1); + } + + // +@@ -638,7 +638,7 @@ + + p.powered = info.ai_acline; + p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life); +- p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1); ++ p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1); + return(p); + + bad: diff --git a/misc/kdeutils2/pkg-plist b/misc/kdeutils2/pkg-plist index 451d3587f1ef..a26fa72c3a97 100644 --- a/misc/kdeutils2/pkg-plist +++ b/misc/kdeutils2/pkg-plist @@ -251,7 +251,6 @@ share/services/arkpart.desktop @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpm @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/klprfax @@ -308,7 +307,6 @@ share/services/arkpart.desktop @dirrm share/apps/ark/icons/hicolor @dirrm share/apps/ark/icons @dirrm share/apps/ark -@dirrm share/apps @dirrm share/applnk/Utilities @dirrm share/applnk/System @dirrm share/applnk/Settings/PowerControl @@ -316,4 +314,3 @@ share/services/arkpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Editors @dirrm share/applnk -@dirrm lib/kde2 diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 42d7e7fffe93..d1ab1df6523f 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeutils -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo index 562818721e98..2a396fa164aa 100644 --- a/misc/kdeutils3/distinfo +++ b/misc/kdeutils3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5 +MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a diff --git a/misc/kdeutils3/files/patch-portable.cpp b/misc/kdeutils3/files/patch-portable.cpp new file mode 100644 index 000000000000..d6746dc1c282 --- /dev/null +++ b/misc/kdeutils3/files/patch-portable.cpp @@ -0,0 +1,20 @@ +--- klaptopdaemon/portable.cpp- Thu Jun 28 00:08:02 2001 ++++ klaptopdaemon/portable.cpp Thu Jun 28 00:08:22 2001 +@@ -453,7 +453,7 @@ + if (ret == -1) + return 0; + +- return (info.ai_batt_time != 0xffff); ++ return (info.ai_batt_time != -1); + } + + // +@@ -638,7 +638,7 @@ + + p.powered = info.ai_acline; + p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life); +- p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1); ++ p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1); + return(p); + + bad: diff --git a/misc/kdeutils3/pkg-plist b/misc/kdeutils3/pkg-plist index 451d3587f1ef..a26fa72c3a97 100644 --- a/misc/kdeutils3/pkg-plist +++ b/misc/kdeutils3/pkg-plist @@ -251,7 +251,6 @@ share/services/arkpart.desktop @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpm @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/klprfax @@ -308,7 +307,6 @@ share/services/arkpart.desktop @dirrm share/apps/ark/icons/hicolor @dirrm share/apps/ark/icons @dirrm share/apps/ark -@dirrm share/apps @dirrm share/applnk/Utilities @dirrm share/applnk/System @dirrm share/applnk/Settings/PowerControl @@ -316,4 +314,3 @@ share/services/arkpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Editors @dirrm share/applnk -@dirrm lib/kde2 diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile index 42d7e7fffe93..d1ab1df6523f 100644 --- a/misc/kdeutils4/Makefile +++ b/misc/kdeutils4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeutils -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo index 562818721e98..2a396fa164aa 100644 --- a/misc/kdeutils4/distinfo +++ b/misc/kdeutils4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5 +MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a diff --git a/misc/kdeutils4/files/patch-portable.cpp b/misc/kdeutils4/files/patch-portable.cpp new file mode 100644 index 000000000000..d6746dc1c282 --- /dev/null +++ b/misc/kdeutils4/files/patch-portable.cpp @@ -0,0 +1,20 @@ +--- klaptopdaemon/portable.cpp- Thu Jun 28 00:08:02 2001 ++++ klaptopdaemon/portable.cpp Thu Jun 28 00:08:22 2001 +@@ -453,7 +453,7 @@ + if (ret == -1) + return 0; + +- return (info.ai_batt_time != 0xffff); ++ return (info.ai_batt_time != -1); + } + + // +@@ -638,7 +638,7 @@ + + p.powered = info.ai_acline; + p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life); +- p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1); ++ p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1); + return(p); + + bad: diff --git a/misc/kdeutils4/pkg-plist b/misc/kdeutils4/pkg-plist index 451d3587f1ef..a26fa72c3a97 100644 --- a/misc/kdeutils4/pkg-plist +++ b/misc/kdeutils4/pkg-plist @@ -251,7 +251,6 @@ share/services/arkpart.desktop @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpm @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/klprfax @@ -308,7 +307,6 @@ share/services/arkpart.desktop @dirrm share/apps/ark/icons/hicolor @dirrm share/apps/ark/icons @dirrm share/apps/ark -@dirrm share/apps @dirrm share/applnk/Utilities @dirrm share/applnk/System @dirrm share/applnk/Settings/PowerControl @@ -316,4 +314,3 @@ share/services/arkpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Editors @dirrm share/applnk -@dirrm lib/kde2 diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 8cb9b4b99b3a..06d02616bd07 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdemultimedia -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,14 +14,21 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib + --with-qt-libraries=${X11BASE}/lib \ + --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} @@ -46,9 +53,21 @@ pre-everything:: .endif pre-configure: - ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 - ${PERL} -pi -e 's,kscd_compile=no,kscd_compile=yes,g; \ - s,kde_artsplug_compiles = xno,kde_argsplug_compiles = x,g' ${WRKSRC}/configure.in + ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" \ + ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 + ${PERL} -pi -e \ + 's,kscd_compile=no,kscd_compile=yes,g; \ + s,kde_artsplug_compiles = xno,kde_artsplug_compiles = x,g' \ + ${WRKSRC}/kscd/configure.in.in + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs post-install: @${ECHO_MSG} diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index ab43ed67b80f..b2e1bbcb1e21 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdemultimedia-2.2.1.tar.bz2) = c4724c00c6d2c69ccc923de944cf7983 +MD5 (KDE/kdemultimedia-2.2.2.tar.bz2) = 76981ca284663093cd0bc37500e10441 diff --git a/multimedia/kdemultimedia3/files/patch-cdrom.c b/multimedia/kdemultimedia3/files/patch-cdrom.c new file mode 100644 index 000000000000..f833b837a051 --- /dev/null +++ b/multimedia/kdemultimedia3/files/patch-cdrom.c @@ -0,0 +1,163 @@ +--- kscd/libwm/cdrom.c Mon Jun 18 07:01:07 2001 ++++ kscd/libwm/cdrom.c.new Thu Nov 29 21:37:42 2001 +@@ -182,6 +182,13 @@ + struct wm_playlist *l; + int i; + int pos; ++ ++ if(drive.get_trackcount == NULL) ++ { ++ perror("trackcount: function pointer NULL"); ++ return (NULL); ++ } ++ + if ((drive.get_trackcount)(&drive, &thiscd.ntracks) < 0) + { + perror("trackcount"); +@@ -217,6 +224,12 @@ + + for (i = 0; i < thiscd.ntracks; i++) + { ++ if(drive.get_trackinfo == NULL) ++ { ++ perror("CD track info read: function pointer null"); ++ return (NULL); ++ } ++ + if ((drive.get_trackinfo)(&drive, i + 1, &thiscd.trk[i].data, + &thiscd.trk[i].start) < 0) + { +@@ -235,6 +248,12 @@ + thiscd.trk[i].section = 0; + } + ++ if(drive.get_cdlen == NULL) ++ { ++ perror("CD length read: function pointer null"); ++ return (NULL); ++ } ++ + if ((drive.get_cdlen)(&drive, &thiscd.trk[i].start) < 0) + { + perror("CD length read"); +@@ -305,6 +324,12 @@ + if( (cur_cdmode == WM_CDM_STOPPED) || (cur_cdmode == WM_CDM_PLAYING) ) + oldmode = cur_cdmode; + ++ if(drive.get_drive_status == NULL) ++ { ++ perror("CD get drive status: function pointer NULL"); ++ return (-1); ++ } ++ + if( (drive.get_drive_status)(&drive, oldmode, &mode, &cur_frame, + &trackno, &cur_index) < 0) + { +@@ -474,7 +499,8 @@ + right = right < 0 ? 0 : right > 100 ? 100 : right; + /* printf("Left = %d, Right = %d\n", left, right); + */ +- (void) (drive.set_volume)(&drive, left, right); ++ if(drive.set_volume != NULL) ++ (void) (drive.set_volume)(&drive, left, right); + } /* cd_volume() */ + + #else +@@ -513,7 +539,8 @@ + if (right > 100) + right = 100; + +- (void) (drive.set_volume)(&drive, left, right); ++ if(drive.set_volume != NULL) ++ (void) (drive.set_volume)(&drive, left, right); + } /* cd_volume() */ + + #endif /* CLIF_VOL */ +@@ -536,18 +563,20 @@ + switch (cur_cdmode) { + case WM_CDM_PLAYING: /* playing */ + cur_cdmode = WM_CDM_PAUSED; +- (drive.pause)(&drive); +- paused_pos = cur_pos_rel; ++ if(drive.pause != NULL) ++ (drive.pause)(&drive); ++ ++ paused_pos = cur_pos_rel; + break; + + case WM_CDM_PAUSED: /* paused */ + cur_cdmode = WM_CDM_PLAYING; + /* (drive.resume)(&drive); */ +- if ((drive.resume)(&drive) > 0 ) +- { +- wm_cd_play(cur_track, paused_pos, +- playlist[cur_listno-1].end); +- } ++ if(drive.resume != NULL) ++ if ((drive.resume)(&drive) > 0 ) ++ wm_cd_play(cur_track, paused_pos, playlist[cur_listno-1].end); ++ break; ++ + default: /* */ + break; + } +@@ -568,7 +597,10 @@ + { + cur_lasttrack = cur_firsttrack = -1; + cur_cdmode = WM_CDM_STOPPED; +- (drive.stop)(&drive); ++ ++ if(drive.stop != NULL) ++ (drive.stop)(&drive); ++ + cur_track = 1; + } + } /* wm_cd_stop() */ +@@ -595,7 +627,8 @@ + if (start >= end) + start = end-1; + +- (drive.play)(&drive, start, end, realstart); ++ if(drive.play != NULL) ++ (drive.play)(&drive, start, end, realstart); + } + + /* +@@ -681,6 +714,12 @@ + { + int status; + ++ if(drive.eject == NULL) ++ { ++ perror("Could not eject CD: function pointer NULL"); ++ return (1); ++ } ++ + status = (drive.eject)(&drive); + if (status < 0) + { +@@ -705,6 +744,12 @@ + + int wm_cd_closetray(void) + { ++ if(drive.closetray == NULL) ++ { ++ perror("Could not close drive tray: function pointer NULL"); ++ return (1); ++ } ++ + return((drive.closetray)(&drive) ? 0 : wm_cd_status()==2 ? 1 : 0); + } /* wm_cd_closetray() */ + +@@ -785,8 +830,9 @@ + { + int left, right; + +- if ((drive.get_volume)(&drive, &left, &right) < 0 || left == -1) +- return (max); ++ if(drive.get_volume != NULL) ++ if ((drive.get_volume)(&drive, &left, &right) < 0 || left == -1) ++ return (max); + + left = (left * max + 99) / 100; + right = (right * max + 99) / 100; diff --git a/multimedia/kdemultimedia3/files/patch-kscd.cpp b/multimedia/kdemultimedia3/files/patch-kscd.cpp new file mode 100644 index 000000000000..905e3b303f9d --- /dev/null +++ b/multimedia/kdemultimedia3/files/patch-kscd.cpp @@ -0,0 +1,19 @@ +--- kscd/kscd.cpp Sun Dec 2 15:08:44 2001 ++++ kscd/kscd.cpp.new Sun Dec 2 15:10:04 2001 +@@ -1313,7 +1313,6 @@ + /* + * cdMode + * +- * - 'No disc' handling is missing + * - Data discs not recognized as data discs. + * + */ +@@ -1329,7 +1328,7 @@ + if( sss == 2 ) + have_new_cd = true; + +- if(sss < 0) ++ if(sss < 0 || sss == WM_CDS_NO_DISC) + { + if(cddrive_is_ok && (sss != WM_ERR_SCSI_INQUIRY_FAILED)) + { diff --git a/multimedia/kdemultimedia3/files/patch-plat_freebsd.c b/multimedia/kdemultimedia3/files/patch-plat_freebsd.c new file mode 100644 index 000000000000..dd6c062ab01d --- /dev/null +++ b/multimedia/kdemultimedia3/files/patch-plat_freebsd.c @@ -0,0 +1,11 @@ +--- kscd/libwm/plat_freebsd.c Tue Apr 10 13:34:52 2001 ++++ kscd/libwm/plat_freebsd.c.new Thu Nov 29 22:20:56 2001 +@@ -159,6 +159,8 @@ + wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "calling wmcd_open()\n"); + status = wmcd_open( d ); /* open it as usual */ + wm_susleep( 1000 ); ++ if(status == -EACCES || status == 1) ++ return status; + } while ( status != 0 ); + return status; + } /* wmcd_reopen() */ diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist index 20b9d083eece..3c765f1e1561 100644 --- a/multimedia/kdemultimedia3/pkg-plist +++ b/multimedia/kdemultimedia3/pkg-plist @@ -756,15 +756,9 @@ share/mimelnk/audio/x-karaoke.desktop share/mimelnk/text/xmcd.desktop share/services/kmixctrl_restore.desktop share/servicetypes/audiomidi.desktop -@dirrm share/servicetypes -@dirrm share/services -@dirrm share/mimelnk/text -@dirrm share/mimelnk/audio -@dirrm share/mimelnk/application @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps @dirrm share/icons/hicolor/22x22/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/noatun @dirrm share/doc/HTML/en/kscd @dirrm share/doc/HTML/en/kmix @@ -773,8 +767,6 @@ share/servicetypes/audiomidi.desktop @dirrm share/doc/HTML/en/artsbuilder/images @dirrm share/doc/HTML/en/artsbuilder @dirrm share/doc/HTML/en/aktion -@dirrm share/doc/HTML/en -@dirrm share/config @dirrm share/apps/noatun/skins/kaiman/k9 @dirrm share/apps/noatun/skins/kaiman/circle @dirrm share/apps/noatun/skins/kaiman/car-preset @@ -843,8 +835,6 @@ share/servicetypes/audiomidi.desktop @dirrm share/applnk/Settings/Sound @dirrm share/applnk/Settings @dirrm share/applnk/Multimedia +@dirrm share/applnk @dirrm lib/mcop/Noatun -@dirrm lib/mcop/Arts -@dirrm lib/mcop @dirrm include/noatun -@dirrm include/arts diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 8cb9b4b99b3a..06d02616bd07 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdemultimedia -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,14 +14,21 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib + --with-qt-libraries=${X11BASE}/lib \ + --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} @@ -46,9 +53,21 @@ pre-everything:: .endif pre-configure: - ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 - ${PERL} -pi -e 's,kscd_compile=no,kscd_compile=yes,g; \ - s,kde_artsplug_compiles = xno,kde_argsplug_compiles = x,g' ${WRKSRC}/configure.in + ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" \ + ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 + ${PERL} -pi -e \ + 's,kscd_compile=no,kscd_compile=yes,g; \ + s,kde_artsplug_compiles = xno,kde_artsplug_compiles = x,g' \ + ${WRKSRC}/kscd/configure.in.in + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs post-install: @${ECHO_MSG} diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo index ab43ed67b80f..b2e1bbcb1e21 100644 --- a/multimedia/kdemultimedia4/distinfo +++ b/multimedia/kdemultimedia4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdemultimedia-2.2.1.tar.bz2) = c4724c00c6d2c69ccc923de944cf7983 +MD5 (KDE/kdemultimedia-2.2.2.tar.bz2) = 76981ca284663093cd0bc37500e10441 diff --git a/multimedia/kdemultimedia4/files/patch-cdrom.c b/multimedia/kdemultimedia4/files/patch-cdrom.c new file mode 100644 index 000000000000..f833b837a051 --- /dev/null +++ b/multimedia/kdemultimedia4/files/patch-cdrom.c @@ -0,0 +1,163 @@ +--- kscd/libwm/cdrom.c Mon Jun 18 07:01:07 2001 ++++ kscd/libwm/cdrom.c.new Thu Nov 29 21:37:42 2001 +@@ -182,6 +182,13 @@ + struct wm_playlist *l; + int i; + int pos; ++ ++ if(drive.get_trackcount == NULL) ++ { ++ perror("trackcount: function pointer NULL"); ++ return (NULL); ++ } ++ + if ((drive.get_trackcount)(&drive, &thiscd.ntracks) < 0) + { + perror("trackcount"); +@@ -217,6 +224,12 @@ + + for (i = 0; i < thiscd.ntracks; i++) + { ++ if(drive.get_trackinfo == NULL) ++ { ++ perror("CD track info read: function pointer null"); ++ return (NULL); ++ } ++ + if ((drive.get_trackinfo)(&drive, i + 1, &thiscd.trk[i].data, + &thiscd.trk[i].start) < 0) + { +@@ -235,6 +248,12 @@ + thiscd.trk[i].section = 0; + } + ++ if(drive.get_cdlen == NULL) ++ { ++ perror("CD length read: function pointer null"); ++ return (NULL); ++ } ++ + if ((drive.get_cdlen)(&drive, &thiscd.trk[i].start) < 0) + { + perror("CD length read"); +@@ -305,6 +324,12 @@ + if( (cur_cdmode == WM_CDM_STOPPED) || (cur_cdmode == WM_CDM_PLAYING) ) + oldmode = cur_cdmode; + ++ if(drive.get_drive_status == NULL) ++ { ++ perror("CD get drive status: function pointer NULL"); ++ return (-1); ++ } ++ + if( (drive.get_drive_status)(&drive, oldmode, &mode, &cur_frame, + &trackno, &cur_index) < 0) + { +@@ -474,7 +499,8 @@ + right = right < 0 ? 0 : right > 100 ? 100 : right; + /* printf("Left = %d, Right = %d\n", left, right); + */ +- (void) (drive.set_volume)(&drive, left, right); ++ if(drive.set_volume != NULL) ++ (void) (drive.set_volume)(&drive, left, right); + } /* cd_volume() */ + + #else +@@ -513,7 +539,8 @@ + if (right > 100) + right = 100; + +- (void) (drive.set_volume)(&drive, left, right); ++ if(drive.set_volume != NULL) ++ (void) (drive.set_volume)(&drive, left, right); + } /* cd_volume() */ + + #endif /* CLIF_VOL */ +@@ -536,18 +563,20 @@ + switch (cur_cdmode) { + case WM_CDM_PLAYING: /* playing */ + cur_cdmode = WM_CDM_PAUSED; +- (drive.pause)(&drive); +- paused_pos = cur_pos_rel; ++ if(drive.pause != NULL) ++ (drive.pause)(&drive); ++ ++ paused_pos = cur_pos_rel; + break; + + case WM_CDM_PAUSED: /* paused */ + cur_cdmode = WM_CDM_PLAYING; + /* (drive.resume)(&drive); */ +- if ((drive.resume)(&drive) > 0 ) +- { +- wm_cd_play(cur_track, paused_pos, +- playlist[cur_listno-1].end); +- } ++ if(drive.resume != NULL) ++ if ((drive.resume)(&drive) > 0 ) ++ wm_cd_play(cur_track, paused_pos, playlist[cur_listno-1].end); ++ break; ++ + default: /* */ + break; + } +@@ -568,7 +597,10 @@ + { + cur_lasttrack = cur_firsttrack = -1; + cur_cdmode = WM_CDM_STOPPED; +- (drive.stop)(&drive); ++ ++ if(drive.stop != NULL) ++ (drive.stop)(&drive); ++ + cur_track = 1; + } + } /* wm_cd_stop() */ +@@ -595,7 +627,8 @@ + if (start >= end) + start = end-1; + +- (drive.play)(&drive, start, end, realstart); ++ if(drive.play != NULL) ++ (drive.play)(&drive, start, end, realstart); + } + + /* +@@ -681,6 +714,12 @@ + { + int status; + ++ if(drive.eject == NULL) ++ { ++ perror("Could not eject CD: function pointer NULL"); ++ return (1); ++ } ++ + status = (drive.eject)(&drive); + if (status < 0) + { +@@ -705,6 +744,12 @@ + + int wm_cd_closetray(void) + { ++ if(drive.closetray == NULL) ++ { ++ perror("Could not close drive tray: function pointer NULL"); ++ return (1); ++ } ++ + return((drive.closetray)(&drive) ? 0 : wm_cd_status()==2 ? 1 : 0); + } /* wm_cd_closetray() */ + +@@ -785,8 +830,9 @@ + { + int left, right; + +- if ((drive.get_volume)(&drive, &left, &right) < 0 || left == -1) +- return (max); ++ if(drive.get_volume != NULL) ++ if ((drive.get_volume)(&drive, &left, &right) < 0 || left == -1) ++ return (max); + + left = (left * max + 99) / 100; + right = (right * max + 99) / 100; diff --git a/multimedia/kdemultimedia4/files/patch-kscd.cpp b/multimedia/kdemultimedia4/files/patch-kscd.cpp new file mode 100644 index 000000000000..905e3b303f9d --- /dev/null +++ b/multimedia/kdemultimedia4/files/patch-kscd.cpp @@ -0,0 +1,19 @@ +--- kscd/kscd.cpp Sun Dec 2 15:08:44 2001 ++++ kscd/kscd.cpp.new Sun Dec 2 15:10:04 2001 +@@ -1313,7 +1313,6 @@ + /* + * cdMode + * +- * - 'No disc' handling is missing + * - Data discs not recognized as data discs. + * + */ +@@ -1329,7 +1328,7 @@ + if( sss == 2 ) + have_new_cd = true; + +- if(sss < 0) ++ if(sss < 0 || sss == WM_CDS_NO_DISC) + { + if(cddrive_is_ok && (sss != WM_ERR_SCSI_INQUIRY_FAILED)) + { diff --git a/multimedia/kdemultimedia4/files/patch-plat_freebsd.c b/multimedia/kdemultimedia4/files/patch-plat_freebsd.c new file mode 100644 index 000000000000..dd6c062ab01d --- /dev/null +++ b/multimedia/kdemultimedia4/files/patch-plat_freebsd.c @@ -0,0 +1,11 @@ +--- kscd/libwm/plat_freebsd.c Tue Apr 10 13:34:52 2001 ++++ kscd/libwm/plat_freebsd.c.new Thu Nov 29 22:20:56 2001 +@@ -159,6 +159,8 @@ + wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "calling wmcd_open()\n"); + status = wmcd_open( d ); /* open it as usual */ + wm_susleep( 1000 ); ++ if(status == -EACCES || status == 1) ++ return status; + } while ( status != 0 ); + return status; + } /* wmcd_reopen() */ diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist index 20b9d083eece..3c765f1e1561 100644 --- a/multimedia/kdemultimedia4/pkg-plist +++ b/multimedia/kdemultimedia4/pkg-plist @@ -756,15 +756,9 @@ share/mimelnk/audio/x-karaoke.desktop share/mimelnk/text/xmcd.desktop share/services/kmixctrl_restore.desktop share/servicetypes/audiomidi.desktop -@dirrm share/servicetypes -@dirrm share/services -@dirrm share/mimelnk/text -@dirrm share/mimelnk/audio -@dirrm share/mimelnk/application @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps @dirrm share/icons/hicolor/22x22/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/noatun @dirrm share/doc/HTML/en/kscd @dirrm share/doc/HTML/en/kmix @@ -773,8 +767,6 @@ share/servicetypes/audiomidi.desktop @dirrm share/doc/HTML/en/artsbuilder/images @dirrm share/doc/HTML/en/artsbuilder @dirrm share/doc/HTML/en/aktion -@dirrm share/doc/HTML/en -@dirrm share/config @dirrm share/apps/noatun/skins/kaiman/k9 @dirrm share/apps/noatun/skins/kaiman/circle @dirrm share/apps/noatun/skins/kaiman/car-preset @@ -843,8 +835,6 @@ share/servicetypes/audiomidi.desktop @dirrm share/applnk/Settings/Sound @dirrm share/applnk/Settings @dirrm share/applnk/Multimedia +@dirrm share/applnk @dirrm lib/mcop/Noatun -@dirrm lib/mcop/Arts -@dirrm lib/mcop @dirrm include/noatun -@dirrm include/arts diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile index e801946d2bc4..cc7b590ecb18 100644 --- a/net/kdenetwork2/Makefile +++ b/net/kdenetwork2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdenetwork -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= net news kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,15 +14,35 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes +MAKE_ENV= ${CONFIGURE_ENV} pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s:-lpthread:${PTHREAD_LIBS}:g" ${WRKSRC}/knode/Makefile.in ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${PERL} -pi -e "s@^AC_CHECK_UTMP_FILE@# AC_CHECK_UTMP_FILE@g" ${WRKSRC}/configure.in diff --git a/net/kdenetwork2/distinfo b/net/kdenetwork2/distinfo index 617f016bad1a..75566415e106 100644 --- a/net/kdenetwork2/distinfo +++ b/net/kdenetwork2/distinfo @@ -1 +1 @@ -MD5 (KDE/kdenetwork-2.2.1.tar.bz2) = 39c731ada7e3b898ee5596babb35e7db +MD5 (KDE/kdenetwork-2.2.2.tar.bz2) = ef664b35f9d8ab083855ac5118b9c7b2 diff --git a/net/kdenetwork2/files/patch-controller.cpp b/net/kdenetwork2/files/patch-controller.cpp new file mode 100644 index 000000000000..e59b20f37766 --- /dev/null +++ b/net/kdenetwork2/files/patch-controller.cpp @@ -0,0 +1,11 @@ +--- ksirc/puke/controller.cpp.orig Sat Nov 17 09:54:46 2001 ++++ ksirc/puke/controller.cpp Sat Nov 17 09:55:03 2001 +@@ -81,7 +81,7 @@ + unix_addr.sun_family = AF_UNIX; + strcpy(unix_addr.sun_path, qsPukeSocket); + len = sizeof(unix_addr.sun_family) + qsPukeSocket.length(); +- if( bind(iListenFd, (struct sockaddr *) &unix_addr, len) < 0){ ++ if( bind(iListenFd, (struct sockaddr *) &unix_addr, len + 1) < 0){ + perror("PUKE: Could not bind to Unix Domain Socket"); + return; + } diff --git a/net/kdenetwork2/pkg-plist b/net/kdenetwork2/pkg-plist index 8a8857bc528b..f7ad44102787 100644 --- a/net/kdenetwork2/pkg-plist +++ b/net/kdenetwork2/pkg-plist @@ -6,15 +6,11 @@ bin/kmailcvt bin/knewstickerstub bin/knode bin/korn -bin/kotalkd bin/kppp bin/kppplogview bin/ksirc bin/ksticker -bin/ktalkd -bin/ktalkdlg bin/lisa -bin/mail.local bin/reslisa include/kmailIface.h include/mimelib/address.h @@ -51,8 +47,6 @@ include/mimelib/text.h include/mimelib/token.h include/mimelib/utility.h include/mimelib/uuencode.h -lib/kde2/libkcm_ktalkd.la -lib/kde2/libkcm_ktalkd.so lib/kio_lan.la lib/kio_lan.so lib/ksirc.la @@ -82,7 +76,6 @@ share/applnk/Internet/Kppp.desktop share/applnk/Internet/kit.desktop share/applnk/Internet/kppplogview.desktop share/applnk/Internet/ksirc.desktop -share/applnk/Settings/Network/kcmktalkd.desktop share/applnk/Settings/Network/kcmnewsticker.desktop share/applnk/Settings/Network/lanbrowser.desktop share/applnk/Settings/Personalization/kcmnewsticker.desktop @@ -369,6 +362,7 @@ share/apps/kppp/Rules/Germany/Addcom.rst share/apps/kppp/Rules/Germany/CallOkaynet.rst share/apps/kppp/Rules/Germany/Callino_Surf_Basic.rst share/apps/kppp/Rules/Germany/Callino_Surf_Plus.rst +share/apps/kppp/Rules/Germany/Callisa_City.rst share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst share/apps/kppp/Rules/Germany/Cityweb.rst share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst @@ -462,11 +456,17 @@ share/apps/kppp/Rules/Netherlands/NedpointBasis_Lokaal.rst share/apps/kppp/Rules/Netherlands/NedpointBelBespaar_Lokaal.rst share/apps/kppp/Rules/Norway/Local_Area.rst share/apps/kppp/Rules/Norway/Long_Distance.rst +share/apps/kppp/Rules/Poland/Dialog_Atut.rst +share/apps/kppp/Rules/Poland/Dialog_Atut_020.rst +share/apps/kppp/Rules/Poland/Dialog_Efekt.rst +share/apps/kppp/Rules/Poland/Dialog_Profit.rst share/apps/kppp/Rules/Poland/Internetia.rst share/apps/kppp/Rules/Poland/Netia_100km_Niebieska.rst share/apps/kppp/Rules/Poland/Netia_100km_Zielona.rst share/apps/kppp/Rules/Poland/Netia_Lokalne_Niebieska.rst share/apps/kppp/Rules/Poland/Netia_Lokalne_Zielona.rst +share/apps/kppp/Rules/Poland/Netia_Niebieska.rst +share/apps/kppp/Rules/Poland/Netia_Zielona.rst share/apps/kppp/Rules/Poland/TPSA.rst share/apps/kppp/Rules/Poland/TP_100km.rst share/apps/kppp/Rules/Poland/TP_Lokalne.rst @@ -479,6 +479,9 @@ share/apps/kppp/Rules/Portugal/PT_YesNET_Ilhas.rst share/apps/kppp/Rules/Romania/Telecom_GSM.rst share/apps/kppp/Rules/Romania/Telecom_Interurban.rst share/apps/kppp/Rules/Romania/Telecom_Local.rst +share/apps/kppp/Rules/Russia/TEMPLATE.ru +share/apps/kppp/Rules/Russia/Yamalelectroliaison.rst +share/apps/kppp/Rules/Russia/mtu-intel_standart.rst share/apps/kppp/Rules/Singapore/SingTel_Local.rst share/apps/kppp/Rules/Slovakia/Internetovy_tarif_019XY.rst share/apps/kppp/Rules/Slovakia/ST_medzimesto.rst @@ -604,7 +607,6 @@ share/apps/ksirc/test.pl share/apps/ksirc/tester.pl share/apps/lisa/README share/config/ksircrc -share/config/ktalkdrc share/doc/HTML/en/kdict/applet.png share/doc/HTML/en/kdict/common share/doc/HTML/en/kdict/conf.png @@ -724,7 +726,6 @@ share/icons/hicolor/16x16/apps/knode.png share/icons/hicolor/16x16/apps/korn.png share/icons/hicolor/16x16/apps/kppp.png share/icons/hicolor/16x16/apps/ksirc.png -share/icons/hicolor/16x16/apps/ktalkd.png share/icons/hicolor/32x32/apps/kdict.png share/icons/hicolor/32x32/apps/kit.png share/icons/hicolor/32x32/apps/kmail.png @@ -734,7 +735,6 @@ share/icons/hicolor/32x32/apps/knode.png share/icons/hicolor/32x32/apps/korn.png share/icons/hicolor/32x32/apps/kppp.png share/icons/hicolor/32x32/apps/ksirc.png -share/icons/hicolor/32x32/apps/ktalkd.png share/icons/hicolor/48x48/apps/kdict.png share/icons/hicolor/48x48/apps/kit.png share/icons/hicolor/48x48/apps/kmail.png @@ -744,15 +744,12 @@ share/icons/hicolor/48x48/apps/knode.png share/icons/hicolor/48x48/apps/korn.png share/icons/hicolor/48x48/apps/kppp.png share/icons/hicolor/48x48/apps/ksirc.png -share/icons/hicolor/48x48/apps/ktalkd.png share/services/knewsservice.protocol share/services/kntsrcfilepropsdlg.desktop share/services/lan.protocol share/services/rlan.protocol -share/sounds/ktalkd.wav @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/lisa @dirrm share/doc/HTML/en/ktalkd @dirrm share/doc/HTML/en/ksirc @@ -763,8 +760,6 @@ share/sounds/ktalkd.wav @dirrm share/doc/HTML/en/kmail @dirrm share/doc/HTML/en/kit @dirrm share/doc/HTML/en/kdict -@dirrm share/doc/HTML/en -@dirrm share/config @dirrm share/apps/lisa @dirrm share/apps/ksirc/pics @dirrm share/apps/ksirc @@ -778,6 +773,7 @@ share/sounds/ktalkd.wav @dirrm share/apps/kppp/Rules/South_Afrika @dirrm share/apps/kppp/Rules/Slovakia @dirrm share/apps/kppp/Rules/Singapore +@dirrm share/apps/kppp/Rules/Russia @dirrm share/apps/kppp/Rules/Romania @dirrm share/apps/kppp/Rules/Portugal @dirrm share/apps/kppp/Rules/Poland @@ -864,7 +860,6 @@ share/sounds/ktalkd.wav @dirrm share/apps/kdict/icons/hicolor @dirrm share/apps/kdict/icons @dirrm share/apps/kdict -@dirrm share/apps/kconf_update @dirrm share/applnk/Utilities @dirrm share/applnk/Settings/Personalization @dirrm share/applnk/Settings/Network @@ -872,5 +867,4 @@ share/sounds/ktalkd.wav @dirrm share/applnk/Internet @dirrm share/applnk/.hidden @dirrm share/applnk -@dirrm lib/kde2 @dirrm include/mimelib diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index e801946d2bc4..cc7b590ecb18 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdenetwork -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= net news kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,15 +14,35 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes +MAKE_ENV= ${CONFIGURE_ENV} pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s:-lpthread:${PTHREAD_LIBS}:g" ${WRKSRC}/knode/Makefile.in ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${PERL} -pi -e "s@^AC_CHECK_UTMP_FILE@# AC_CHECK_UTMP_FILE@g" ${WRKSRC}/configure.in diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index 617f016bad1a..75566415e106 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdenetwork-2.2.1.tar.bz2) = 39c731ada7e3b898ee5596babb35e7db +MD5 (KDE/kdenetwork-2.2.2.tar.bz2) = ef664b35f9d8ab083855ac5118b9c7b2 diff --git a/net/kdenetwork3/files/patch-controller.cpp b/net/kdenetwork3/files/patch-controller.cpp new file mode 100644 index 000000000000..e59b20f37766 --- /dev/null +++ b/net/kdenetwork3/files/patch-controller.cpp @@ -0,0 +1,11 @@ +--- ksirc/puke/controller.cpp.orig Sat Nov 17 09:54:46 2001 ++++ ksirc/puke/controller.cpp Sat Nov 17 09:55:03 2001 +@@ -81,7 +81,7 @@ + unix_addr.sun_family = AF_UNIX; + strcpy(unix_addr.sun_path, qsPukeSocket); + len = sizeof(unix_addr.sun_family) + qsPukeSocket.length(); +- if( bind(iListenFd, (struct sockaddr *) &unix_addr, len) < 0){ ++ if( bind(iListenFd, (struct sockaddr *) &unix_addr, len + 1) < 0){ + perror("PUKE: Could not bind to Unix Domain Socket"); + return; + } diff --git a/net/kdenetwork3/pkg-plist b/net/kdenetwork3/pkg-plist index 8a8857bc528b..f7ad44102787 100644 --- a/net/kdenetwork3/pkg-plist +++ b/net/kdenetwork3/pkg-plist @@ -6,15 +6,11 @@ bin/kmailcvt bin/knewstickerstub bin/knode bin/korn -bin/kotalkd bin/kppp bin/kppplogview bin/ksirc bin/ksticker -bin/ktalkd -bin/ktalkdlg bin/lisa -bin/mail.local bin/reslisa include/kmailIface.h include/mimelib/address.h @@ -51,8 +47,6 @@ include/mimelib/text.h include/mimelib/token.h include/mimelib/utility.h include/mimelib/uuencode.h -lib/kde2/libkcm_ktalkd.la -lib/kde2/libkcm_ktalkd.so lib/kio_lan.la lib/kio_lan.so lib/ksirc.la @@ -82,7 +76,6 @@ share/applnk/Internet/Kppp.desktop share/applnk/Internet/kit.desktop share/applnk/Internet/kppplogview.desktop share/applnk/Internet/ksirc.desktop -share/applnk/Settings/Network/kcmktalkd.desktop share/applnk/Settings/Network/kcmnewsticker.desktop share/applnk/Settings/Network/lanbrowser.desktop share/applnk/Settings/Personalization/kcmnewsticker.desktop @@ -369,6 +362,7 @@ share/apps/kppp/Rules/Germany/Addcom.rst share/apps/kppp/Rules/Germany/CallOkaynet.rst share/apps/kppp/Rules/Germany/Callino_Surf_Basic.rst share/apps/kppp/Rules/Germany/Callino_Surf_Plus.rst +share/apps/kppp/Rules/Germany/Callisa_City.rst share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst share/apps/kppp/Rules/Germany/Cityweb.rst share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst @@ -462,11 +456,17 @@ share/apps/kppp/Rules/Netherlands/NedpointBasis_Lokaal.rst share/apps/kppp/Rules/Netherlands/NedpointBelBespaar_Lokaal.rst share/apps/kppp/Rules/Norway/Local_Area.rst share/apps/kppp/Rules/Norway/Long_Distance.rst +share/apps/kppp/Rules/Poland/Dialog_Atut.rst +share/apps/kppp/Rules/Poland/Dialog_Atut_020.rst +share/apps/kppp/Rules/Poland/Dialog_Efekt.rst +share/apps/kppp/Rules/Poland/Dialog_Profit.rst share/apps/kppp/Rules/Poland/Internetia.rst share/apps/kppp/Rules/Poland/Netia_100km_Niebieska.rst share/apps/kppp/Rules/Poland/Netia_100km_Zielona.rst share/apps/kppp/Rules/Poland/Netia_Lokalne_Niebieska.rst share/apps/kppp/Rules/Poland/Netia_Lokalne_Zielona.rst +share/apps/kppp/Rules/Poland/Netia_Niebieska.rst +share/apps/kppp/Rules/Poland/Netia_Zielona.rst share/apps/kppp/Rules/Poland/TPSA.rst share/apps/kppp/Rules/Poland/TP_100km.rst share/apps/kppp/Rules/Poland/TP_Lokalne.rst @@ -479,6 +479,9 @@ share/apps/kppp/Rules/Portugal/PT_YesNET_Ilhas.rst share/apps/kppp/Rules/Romania/Telecom_GSM.rst share/apps/kppp/Rules/Romania/Telecom_Interurban.rst share/apps/kppp/Rules/Romania/Telecom_Local.rst +share/apps/kppp/Rules/Russia/TEMPLATE.ru +share/apps/kppp/Rules/Russia/Yamalelectroliaison.rst +share/apps/kppp/Rules/Russia/mtu-intel_standart.rst share/apps/kppp/Rules/Singapore/SingTel_Local.rst share/apps/kppp/Rules/Slovakia/Internetovy_tarif_019XY.rst share/apps/kppp/Rules/Slovakia/ST_medzimesto.rst @@ -604,7 +607,6 @@ share/apps/ksirc/test.pl share/apps/ksirc/tester.pl share/apps/lisa/README share/config/ksircrc -share/config/ktalkdrc share/doc/HTML/en/kdict/applet.png share/doc/HTML/en/kdict/common share/doc/HTML/en/kdict/conf.png @@ -724,7 +726,6 @@ share/icons/hicolor/16x16/apps/knode.png share/icons/hicolor/16x16/apps/korn.png share/icons/hicolor/16x16/apps/kppp.png share/icons/hicolor/16x16/apps/ksirc.png -share/icons/hicolor/16x16/apps/ktalkd.png share/icons/hicolor/32x32/apps/kdict.png share/icons/hicolor/32x32/apps/kit.png share/icons/hicolor/32x32/apps/kmail.png @@ -734,7 +735,6 @@ share/icons/hicolor/32x32/apps/knode.png share/icons/hicolor/32x32/apps/korn.png share/icons/hicolor/32x32/apps/kppp.png share/icons/hicolor/32x32/apps/ksirc.png -share/icons/hicolor/32x32/apps/ktalkd.png share/icons/hicolor/48x48/apps/kdict.png share/icons/hicolor/48x48/apps/kit.png share/icons/hicolor/48x48/apps/kmail.png @@ -744,15 +744,12 @@ share/icons/hicolor/48x48/apps/knode.png share/icons/hicolor/48x48/apps/korn.png share/icons/hicolor/48x48/apps/kppp.png share/icons/hicolor/48x48/apps/ksirc.png -share/icons/hicolor/48x48/apps/ktalkd.png share/services/knewsservice.protocol share/services/kntsrcfilepropsdlg.desktop share/services/lan.protocol share/services/rlan.protocol -share/sounds/ktalkd.wav @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/lisa @dirrm share/doc/HTML/en/ktalkd @dirrm share/doc/HTML/en/ksirc @@ -763,8 +760,6 @@ share/sounds/ktalkd.wav @dirrm share/doc/HTML/en/kmail @dirrm share/doc/HTML/en/kit @dirrm share/doc/HTML/en/kdict -@dirrm share/doc/HTML/en -@dirrm share/config @dirrm share/apps/lisa @dirrm share/apps/ksirc/pics @dirrm share/apps/ksirc @@ -778,6 +773,7 @@ share/sounds/ktalkd.wav @dirrm share/apps/kppp/Rules/South_Afrika @dirrm share/apps/kppp/Rules/Slovakia @dirrm share/apps/kppp/Rules/Singapore +@dirrm share/apps/kppp/Rules/Russia @dirrm share/apps/kppp/Rules/Romania @dirrm share/apps/kppp/Rules/Portugal @dirrm share/apps/kppp/Rules/Poland @@ -864,7 +860,6 @@ share/sounds/ktalkd.wav @dirrm share/apps/kdict/icons/hicolor @dirrm share/apps/kdict/icons @dirrm share/apps/kdict -@dirrm share/apps/kconf_update @dirrm share/applnk/Utilities @dirrm share/applnk/Settings/Personalization @dirrm share/applnk/Settings/Network @@ -872,5 +867,4 @@ share/sounds/ktalkd.wav @dirrm share/applnk/Internet @dirrm share/applnk/.hidden @dirrm share/applnk -@dirrm lib/kde2 @dirrm include/mimelib diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index e801946d2bc4..cc7b590ecb18 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdenetwork -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= net news kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,15 +14,35 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes +MAKE_ENV= ${CONFIGURE_ENV} pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s:-lpthread:${PTHREAD_LIBS}:g" ${WRKSRC}/knode/Makefile.in ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${PERL} -pi -e "s@^AC_CHECK_UTMP_FILE@# AC_CHECK_UTMP_FILE@g" ${WRKSRC}/configure.in diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo index 617f016bad1a..75566415e106 100644 --- a/net/kdenetwork4/distinfo +++ b/net/kdenetwork4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdenetwork-2.2.1.tar.bz2) = 39c731ada7e3b898ee5596babb35e7db +MD5 (KDE/kdenetwork-2.2.2.tar.bz2) = ef664b35f9d8ab083855ac5118b9c7b2 diff --git a/net/kdenetwork4/files/patch-controller.cpp b/net/kdenetwork4/files/patch-controller.cpp new file mode 100644 index 000000000000..e59b20f37766 --- /dev/null +++ b/net/kdenetwork4/files/patch-controller.cpp @@ -0,0 +1,11 @@ +--- ksirc/puke/controller.cpp.orig Sat Nov 17 09:54:46 2001 ++++ ksirc/puke/controller.cpp Sat Nov 17 09:55:03 2001 +@@ -81,7 +81,7 @@ + unix_addr.sun_family = AF_UNIX; + strcpy(unix_addr.sun_path, qsPukeSocket); + len = sizeof(unix_addr.sun_family) + qsPukeSocket.length(); +- if( bind(iListenFd, (struct sockaddr *) &unix_addr, len) < 0){ ++ if( bind(iListenFd, (struct sockaddr *) &unix_addr, len + 1) < 0){ + perror("PUKE: Could not bind to Unix Domain Socket"); + return; + } diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist index 8a8857bc528b..f7ad44102787 100644 --- a/net/kdenetwork4/pkg-plist +++ b/net/kdenetwork4/pkg-plist @@ -6,15 +6,11 @@ bin/kmailcvt bin/knewstickerstub bin/knode bin/korn -bin/kotalkd bin/kppp bin/kppplogview bin/ksirc bin/ksticker -bin/ktalkd -bin/ktalkdlg bin/lisa -bin/mail.local bin/reslisa include/kmailIface.h include/mimelib/address.h @@ -51,8 +47,6 @@ include/mimelib/text.h include/mimelib/token.h include/mimelib/utility.h include/mimelib/uuencode.h -lib/kde2/libkcm_ktalkd.la -lib/kde2/libkcm_ktalkd.so lib/kio_lan.la lib/kio_lan.so lib/ksirc.la @@ -82,7 +76,6 @@ share/applnk/Internet/Kppp.desktop share/applnk/Internet/kit.desktop share/applnk/Internet/kppplogview.desktop share/applnk/Internet/ksirc.desktop -share/applnk/Settings/Network/kcmktalkd.desktop share/applnk/Settings/Network/kcmnewsticker.desktop share/applnk/Settings/Network/lanbrowser.desktop share/applnk/Settings/Personalization/kcmnewsticker.desktop @@ -369,6 +362,7 @@ share/apps/kppp/Rules/Germany/Addcom.rst share/apps/kppp/Rules/Germany/CallOkaynet.rst share/apps/kppp/Rules/Germany/Callino_Surf_Basic.rst share/apps/kppp/Rules/Germany/Callino_Surf_Plus.rst +share/apps/kppp/Rules/Germany/Callisa_City.rst share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst share/apps/kppp/Rules/Germany/Cityweb.rst share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst @@ -462,11 +456,17 @@ share/apps/kppp/Rules/Netherlands/NedpointBasis_Lokaal.rst share/apps/kppp/Rules/Netherlands/NedpointBelBespaar_Lokaal.rst share/apps/kppp/Rules/Norway/Local_Area.rst share/apps/kppp/Rules/Norway/Long_Distance.rst +share/apps/kppp/Rules/Poland/Dialog_Atut.rst +share/apps/kppp/Rules/Poland/Dialog_Atut_020.rst +share/apps/kppp/Rules/Poland/Dialog_Efekt.rst +share/apps/kppp/Rules/Poland/Dialog_Profit.rst share/apps/kppp/Rules/Poland/Internetia.rst share/apps/kppp/Rules/Poland/Netia_100km_Niebieska.rst share/apps/kppp/Rules/Poland/Netia_100km_Zielona.rst share/apps/kppp/Rules/Poland/Netia_Lokalne_Niebieska.rst share/apps/kppp/Rules/Poland/Netia_Lokalne_Zielona.rst +share/apps/kppp/Rules/Poland/Netia_Niebieska.rst +share/apps/kppp/Rules/Poland/Netia_Zielona.rst share/apps/kppp/Rules/Poland/TPSA.rst share/apps/kppp/Rules/Poland/TP_100km.rst share/apps/kppp/Rules/Poland/TP_Lokalne.rst @@ -479,6 +479,9 @@ share/apps/kppp/Rules/Portugal/PT_YesNET_Ilhas.rst share/apps/kppp/Rules/Romania/Telecom_GSM.rst share/apps/kppp/Rules/Romania/Telecom_Interurban.rst share/apps/kppp/Rules/Romania/Telecom_Local.rst +share/apps/kppp/Rules/Russia/TEMPLATE.ru +share/apps/kppp/Rules/Russia/Yamalelectroliaison.rst +share/apps/kppp/Rules/Russia/mtu-intel_standart.rst share/apps/kppp/Rules/Singapore/SingTel_Local.rst share/apps/kppp/Rules/Slovakia/Internetovy_tarif_019XY.rst share/apps/kppp/Rules/Slovakia/ST_medzimesto.rst @@ -604,7 +607,6 @@ share/apps/ksirc/test.pl share/apps/ksirc/tester.pl share/apps/lisa/README share/config/ksircrc -share/config/ktalkdrc share/doc/HTML/en/kdict/applet.png share/doc/HTML/en/kdict/common share/doc/HTML/en/kdict/conf.png @@ -724,7 +726,6 @@ share/icons/hicolor/16x16/apps/knode.png share/icons/hicolor/16x16/apps/korn.png share/icons/hicolor/16x16/apps/kppp.png share/icons/hicolor/16x16/apps/ksirc.png -share/icons/hicolor/16x16/apps/ktalkd.png share/icons/hicolor/32x32/apps/kdict.png share/icons/hicolor/32x32/apps/kit.png share/icons/hicolor/32x32/apps/kmail.png @@ -734,7 +735,6 @@ share/icons/hicolor/32x32/apps/knode.png share/icons/hicolor/32x32/apps/korn.png share/icons/hicolor/32x32/apps/kppp.png share/icons/hicolor/32x32/apps/ksirc.png -share/icons/hicolor/32x32/apps/ktalkd.png share/icons/hicolor/48x48/apps/kdict.png share/icons/hicolor/48x48/apps/kit.png share/icons/hicolor/48x48/apps/kmail.png @@ -744,15 +744,12 @@ share/icons/hicolor/48x48/apps/knode.png share/icons/hicolor/48x48/apps/korn.png share/icons/hicolor/48x48/apps/kppp.png share/icons/hicolor/48x48/apps/ksirc.png -share/icons/hicolor/48x48/apps/ktalkd.png share/services/knewsservice.protocol share/services/kntsrcfilepropsdlg.desktop share/services/lan.protocol share/services/rlan.protocol -share/sounds/ktalkd.wav @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/lisa @dirrm share/doc/HTML/en/ktalkd @dirrm share/doc/HTML/en/ksirc @@ -763,8 +760,6 @@ share/sounds/ktalkd.wav @dirrm share/doc/HTML/en/kmail @dirrm share/doc/HTML/en/kit @dirrm share/doc/HTML/en/kdict -@dirrm share/doc/HTML/en -@dirrm share/config @dirrm share/apps/lisa @dirrm share/apps/ksirc/pics @dirrm share/apps/ksirc @@ -778,6 +773,7 @@ share/sounds/ktalkd.wav @dirrm share/apps/kppp/Rules/South_Afrika @dirrm share/apps/kppp/Rules/Slovakia @dirrm share/apps/kppp/Rules/Singapore +@dirrm share/apps/kppp/Rules/Russia @dirrm share/apps/kppp/Rules/Romania @dirrm share/apps/kppp/Rules/Portugal @dirrm share/apps/kppp/Rules/Poland @@ -864,7 +860,6 @@ share/sounds/ktalkd.wav @dirrm share/apps/kdict/icons/hicolor @dirrm share/apps/kdict/icons @dirrm share/apps/kdict -@dirrm share/apps/kconf_update @dirrm share/applnk/Utilities @dirrm share/applnk/Settings/Personalization @dirrm share/applnk/Settings/Network @@ -872,5 +867,4 @@ share/sounds/ktalkd.wav @dirrm share/applnk/Internet @dirrm share/applnk/.hidden @dirrm share/applnk -@dirrm lib/kde2 @dirrm include/mimelib diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile index 42d7e7fffe93..d1ab1df6523f 100644 --- a/security/kgpg-kde4/Makefile +++ b/security/kgpg-kde4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeutils -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo index 562818721e98..2a396fa164aa 100644 --- a/security/kgpg-kde4/distinfo +++ b/security/kgpg-kde4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5 +MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a diff --git a/security/kgpg-kde4/files/patch-portable.cpp b/security/kgpg-kde4/files/patch-portable.cpp new file mode 100644 index 000000000000..d6746dc1c282 --- /dev/null +++ b/security/kgpg-kde4/files/patch-portable.cpp @@ -0,0 +1,20 @@ +--- klaptopdaemon/portable.cpp- Thu Jun 28 00:08:02 2001 ++++ klaptopdaemon/portable.cpp Thu Jun 28 00:08:22 2001 +@@ -453,7 +453,7 @@ + if (ret == -1) + return 0; + +- return (info.ai_batt_time != 0xffff); ++ return (info.ai_batt_time != -1); + } + + // +@@ -638,7 +638,7 @@ + + p.powered = info.ai_acline; + p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life); +- p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1); ++ p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1); + return(p); + + bad: diff --git a/security/kgpg-kde4/pkg-plist b/security/kgpg-kde4/pkg-plist index 451d3587f1ef..a26fa72c3a97 100644 --- a/security/kgpg-kde4/pkg-plist +++ b/security/kgpg-kde4/pkg-plist @@ -251,7 +251,6 @@ share/services/arkpart.desktop @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpm @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/klprfax @@ -308,7 +307,6 @@ share/services/arkpart.desktop @dirrm share/apps/ark/icons/hicolor @dirrm share/apps/ark/icons @dirrm share/apps/ark -@dirrm share/apps @dirrm share/applnk/Utilities @dirrm share/applnk/System @dirrm share/applnk/Settings/PowerControl @@ -316,4 +314,3 @@ share/services/arkpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Editors @dirrm share/applnk -@dirrm lib/kde2 diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile index 42d7e7fffe93..d1ab1df6523f 100644 --- a/security/kwallet/Makefile +++ b/security/kwallet/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeutils -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo index 562818721e98..2a396fa164aa 100644 --- a/security/kwallet/distinfo +++ b/security/kwallet/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5 +MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a diff --git a/security/kwallet/files/patch-portable.cpp b/security/kwallet/files/patch-portable.cpp new file mode 100644 index 000000000000..d6746dc1c282 --- /dev/null +++ b/security/kwallet/files/patch-portable.cpp @@ -0,0 +1,20 @@ +--- klaptopdaemon/portable.cpp- Thu Jun 28 00:08:02 2001 ++++ klaptopdaemon/portable.cpp Thu Jun 28 00:08:22 2001 +@@ -453,7 +453,7 @@ + if (ret == -1) + return 0; + +- return (info.ai_batt_time != 0xffff); ++ return (info.ai_batt_time != -1); + } + + // +@@ -638,7 +638,7 @@ + + p.powered = info.ai_acline; + p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life); +- p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1); ++ p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1); + return(p); + + bad: diff --git a/security/kwallet/pkg-plist b/security/kwallet/pkg-plist index 451d3587f1ef..a26fa72c3a97 100644 --- a/security/kwallet/pkg-plist +++ b/security/kwallet/pkg-plist @@ -251,7 +251,6 @@ share/services/arkpart.desktop @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpm @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/klprfax @@ -308,7 +307,6 @@ share/services/arkpart.desktop @dirrm share/apps/ark/icons/hicolor @dirrm share/apps/ark/icons @dirrm share/apps/ark -@dirrm share/apps @dirrm share/applnk/Utilities @dirrm share/applnk/System @dirrm share/applnk/Settings/PowerControl @@ -316,4 +314,3 @@ share/services/arkpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Editors @dirrm share/applnk -@dirrm lib/kde2 diff --git a/sysutils/kdeadmin/Makefile b/sysutils/kdeadmin/Makefile index 46501eeaad4e..98b2edb3d56f 100644 --- a/sysutils/kdeadmin/Makefile +++ b/sysutils/kdeadmin/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeadmin -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= sysutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,13 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@DO_NOT_COMPILE qt@DO_NOT_COMPILE kuser qt@g" ${WRKSRC}/configure find ${WRKSRC}/kpackage -name "*.cpp" -or -name "*.c" -or -name "*.h" \ | xargs ${PERL} -pi -e "s#typedef __off64_t off64_t;##g" diff --git a/sysutils/kdeadmin/distinfo b/sysutils/kdeadmin/distinfo index f4e6a311c053..a4523451c489 100644 --- a/sysutils/kdeadmin/distinfo +++ b/sysutils/kdeadmin/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeadmin-2.2.1.tar.bz2) = 8ad5e9b7bdca7b294b42f61359f70020 +MD5 (KDE/kdeadmin-2.2.2.tar.bz2) = 5f97fe83d9a2efe3bfb679a679693a45 diff --git a/sysutils/kdeadmin/pkg-plist b/sysutils/kdeadmin/pkg-plist index 0fafa91e4c89..f8499b354419 100644 --- a/sysutils/kdeadmin/pkg-plist +++ b/sysutils/kdeadmin/pkg-plist @@ -63,17 +63,15 @@ share/icons/hicolor/32x32/apps/kcron.png share/icons/hicolor/32x32/apps/kpackage.png share/icons/hicolor/48x48/apps/kpackage.png share/mimelnk/application/x-debian-package.desktop -@dirrm share/mimelnk/application @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kwuftpd @dirrm share/doc/HTML/en/kuser @dirrm share/doc/HTML/en/ksysv @dirrm share/doc/HTML/en/kpackage @dirrm share/doc/HTML/en/kcron -@dirrm share/doc/HTML/en @dirrm share/apps/kpackage/toolbar @dirrm share/apps/kpackage/pics @dirrm share/apps/kpackage @dirrm share/applnk/System +@dirrm share/applnk diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile index 46501eeaad4e..98b2edb3d56f 100644 --- a/sysutils/kdeadmin3/Makefile +++ b/sysutils/kdeadmin3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeadmin -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= sysutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,13 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@DO_NOT_COMPILE qt@DO_NOT_COMPILE kuser qt@g" ${WRKSRC}/configure find ${WRKSRC}/kpackage -name "*.cpp" -or -name "*.c" -or -name "*.h" \ | xargs ${PERL} -pi -e "s#typedef __off64_t off64_t;##g" diff --git a/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo index f4e6a311c053..a4523451c489 100644 --- a/sysutils/kdeadmin3/distinfo +++ b/sysutils/kdeadmin3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeadmin-2.2.1.tar.bz2) = 8ad5e9b7bdca7b294b42f61359f70020 +MD5 (KDE/kdeadmin-2.2.2.tar.bz2) = 5f97fe83d9a2efe3bfb679a679693a45 diff --git a/sysutils/kdeadmin3/pkg-plist b/sysutils/kdeadmin3/pkg-plist index 0fafa91e4c89..f8499b354419 100644 --- a/sysutils/kdeadmin3/pkg-plist +++ b/sysutils/kdeadmin3/pkg-plist @@ -63,17 +63,15 @@ share/icons/hicolor/32x32/apps/kcron.png share/icons/hicolor/32x32/apps/kpackage.png share/icons/hicolor/48x48/apps/kpackage.png share/mimelnk/application/x-debian-package.desktop -@dirrm share/mimelnk/application @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kwuftpd @dirrm share/doc/HTML/en/kuser @dirrm share/doc/HTML/en/ksysv @dirrm share/doc/HTML/en/kpackage @dirrm share/doc/HTML/en/kcron -@dirrm share/doc/HTML/en @dirrm share/apps/kpackage/toolbar @dirrm share/apps/kpackage/pics @dirrm share/apps/kpackage @dirrm share/applnk/System +@dirrm share/applnk diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile index 46501eeaad4e..98b2edb3d56f 100644 --- a/sysutils/kdeadmin4/Makefile +++ b/sysutils/kdeadmin4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeadmin -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= sysutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,13 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@DO_NOT_COMPILE qt@DO_NOT_COMPILE kuser qt@g" ${WRKSRC}/configure find ${WRKSRC}/kpackage -name "*.cpp" -or -name "*.c" -or -name "*.h" \ | xargs ${PERL} -pi -e "s#typedef __off64_t off64_t;##g" diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo index f4e6a311c053..a4523451c489 100644 --- a/sysutils/kdeadmin4/distinfo +++ b/sysutils/kdeadmin4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeadmin-2.2.1.tar.bz2) = 8ad5e9b7bdca7b294b42f61359f70020 +MD5 (KDE/kdeadmin-2.2.2.tar.bz2) = 5f97fe83d9a2efe3bfb679a679693a45 diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist index 0fafa91e4c89..f8499b354419 100644 --- a/sysutils/kdeadmin4/pkg-plist +++ b/sysutils/kdeadmin4/pkg-plist @@ -63,17 +63,15 @@ share/icons/hicolor/32x32/apps/kcron.png share/icons/hicolor/32x32/apps/kpackage.png share/icons/hicolor/48x48/apps/kpackage.png share/mimelnk/application/x-debian-package.desktop -@dirrm share/mimelnk/application @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kwuftpd @dirrm share/doc/HTML/en/kuser @dirrm share/doc/HTML/en/ksysv @dirrm share/doc/HTML/en/kpackage @dirrm share/doc/HTML/en/kcron -@dirrm share/doc/HTML/en @dirrm share/apps/kpackage/toolbar @dirrm share/apps/kpackage/pics @dirrm share/apps/kpackage @dirrm share/applnk/System +@dirrm share/applnk diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 42d7e7fffe93..d1ab1df6523f 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeutils -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo index 562818721e98..2a396fa164aa 100644 --- a/sysutils/kdf/distinfo +++ b/sysutils/kdf/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5 +MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a diff --git a/sysutils/kdf/files/patch-portable.cpp b/sysutils/kdf/files/patch-portable.cpp new file mode 100644 index 000000000000..d6746dc1c282 --- /dev/null +++ b/sysutils/kdf/files/patch-portable.cpp @@ -0,0 +1,20 @@ +--- klaptopdaemon/portable.cpp- Thu Jun 28 00:08:02 2001 ++++ klaptopdaemon/portable.cpp Thu Jun 28 00:08:22 2001 +@@ -453,7 +453,7 @@ + if (ret == -1) + return 0; + +- return (info.ai_batt_time != 0xffff); ++ return (info.ai_batt_time != -1); + } + + // +@@ -638,7 +638,7 @@ + + p.powered = info.ai_acline; + p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life); +- p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1); ++ p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1); + return(p); + + bad: diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist index 451d3587f1ef..a26fa72c3a97 100644 --- a/sysutils/kdf/pkg-plist +++ b/sysutils/kdf/pkg-plist @@ -251,7 +251,6 @@ share/services/arkpart.desktop @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpm @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/klprfax @@ -308,7 +307,6 @@ share/services/arkpart.desktop @dirrm share/apps/ark/icons/hicolor @dirrm share/apps/ark/icons @dirrm share/apps/ark -@dirrm share/apps @dirrm share/applnk/Utilities @dirrm share/applnk/System @dirrm share/applnk/Settings/PowerControl @@ -316,4 +314,3 @@ share/services/arkpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Editors @dirrm share/applnk -@dirrm lib/kde2 diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile index 42d7e7fffe93..d1ab1df6523f 100644 --- a/sysutils/kfloppy/Makefile +++ b/sysutils/kfloppy/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeutils -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo index 562818721e98..2a396fa164aa 100644 --- a/sysutils/kfloppy/distinfo +++ b/sysutils/kfloppy/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5 +MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a diff --git a/sysutils/kfloppy/files/patch-portable.cpp b/sysutils/kfloppy/files/patch-portable.cpp new file mode 100644 index 000000000000..d6746dc1c282 --- /dev/null +++ b/sysutils/kfloppy/files/patch-portable.cpp @@ -0,0 +1,20 @@ +--- klaptopdaemon/portable.cpp- Thu Jun 28 00:08:02 2001 ++++ klaptopdaemon/portable.cpp Thu Jun 28 00:08:22 2001 +@@ -453,7 +453,7 @@ + if (ret == -1) + return 0; + +- return (info.ai_batt_time != 0xffff); ++ return (info.ai_batt_time != -1); + } + + // +@@ -638,7 +638,7 @@ + + p.powered = info.ai_acline; + p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life); +- p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1); ++ p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1); + return(p); + + bad: diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist index 451d3587f1ef..a26fa72c3a97 100644 --- a/sysutils/kfloppy/pkg-plist +++ b/sysutils/kfloppy/pkg-plist @@ -251,7 +251,6 @@ share/services/arkpart.desktop @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpm @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/klprfax @@ -308,7 +307,6 @@ share/services/arkpart.desktop @dirrm share/apps/ark/icons/hicolor @dirrm share/apps/ark/icons @dirrm share/apps/ark -@dirrm share/apps @dirrm share/applnk/Utilities @dirrm share/applnk/System @dirrm share/applnk/Settings/PowerControl @@ -316,4 +314,3 @@ share/services/arkpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Editors @dirrm share/applnk -@dirrm lib/kde2 diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile index 42d7e7fffe93..d1ab1df6523f 100644 --- a/sysutils/sweeper/Makefile +++ b/sysutils/sweeper/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeutils -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,33 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo index 562818721e98..2a396fa164aa 100644 --- a/sysutils/sweeper/distinfo +++ b/sysutils/sweeper/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5 +MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a diff --git a/sysutils/sweeper/files/patch-portable.cpp b/sysutils/sweeper/files/patch-portable.cpp new file mode 100644 index 000000000000..d6746dc1c282 --- /dev/null +++ b/sysutils/sweeper/files/patch-portable.cpp @@ -0,0 +1,20 @@ +--- klaptopdaemon/portable.cpp- Thu Jun 28 00:08:02 2001 ++++ klaptopdaemon/portable.cpp Thu Jun 28 00:08:22 2001 +@@ -453,7 +453,7 @@ + if (ret == -1) + return 0; + +- return (info.ai_batt_time != 0xffff); ++ return (info.ai_batt_time != -1); + } + + // +@@ -638,7 +638,7 @@ + + p.powered = info.ai_acline; + p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life); +- p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1); ++ p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1); + return(p); + + bad: diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist index 451d3587f1ef..a26fa72c3a97 100644 --- a/sysutils/sweeper/pkg-plist +++ b/sysutils/sweeper/pkg-plist @@ -251,7 +251,6 @@ share/services/arkpart.desktop @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kpm @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/klprfax @@ -308,7 +307,6 @@ share/services/arkpart.desktop @dirrm share/apps/ark/icons/hicolor @dirrm share/apps/ark/icons @dirrm share/apps/ark -@dirrm share/apps @dirrm share/applnk/Utilities @dirrm share/applnk/System @dirrm share/applnk/Settings/PowerControl @@ -316,4 +314,3 @@ share/services/arkpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Editors @dirrm share/applnk -@dirrm lib/kde2 diff --git a/textproc/kdoc/Makefile b/textproc/kdoc/Makefile index aa72e178e62a..b864145c4553 100644 --- a/textproc/kdoc/Makefile +++ b/textproc/kdoc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdoc -PORTVERSION= 2.1 +PORTVERSION= 2.2.2 CATEGORIES= textproc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src @@ -15,16 +15,13 @@ MAINTAINER= demon@FreeBSD.org USE_BZIP2= yes -.include <bsd.port.pre.mk> -.if ${OSVERSION} < 500007 -BROKEN= "Requires Perl version 5.6.0" -.endif - USE_GMAKE= yes GNU_CONFIGURE= yes MAN1= kdoc.1 qt2kdoc.1 makekdedoc.1 + pre-configure: - ${PERL} -pi -e "s#share/kdoc#lib/perl5/site_perl/${PERL_VER}#" ${WRKSRC}/Makefile.in + ${PERL} -pi -e "s#share/kdoc#lib/perl5/site_perl/${PERL_VER}#" \ + ${WRKSRC}/Makefile.in -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/kdoc/distinfo b/textproc/kdoc/distinfo index 74eed6aff11a..e99414a429af 100644 --- a/textproc/kdoc/distinfo +++ b/textproc/kdoc/distinfo @@ -1 +1 @@ -MD5 (kdoc-2.1.tar.bz2) = 7a485b33aa7e460381462a33a28b6302 +MD5 (kdoc-2.2.2.tar.bz2) = 8837d2c767c8043bc7e526b75be79561 diff --git a/textproc/kdoc/files/patch-findperl b/textproc/kdoc/files/patch-findperl new file mode 100644 index 000000000000..9bf58fa3f3b7 --- /dev/null +++ b/textproc/kdoc/files/patch-findperl @@ -0,0 +1,11 @@ +--- findperl Sun Feb 18 10:46:08 2001 ++++ findperl.new Fri Nov 30 18:26:10 2001 +@@ -6,7 +6,7 @@ + do + if [ -x $p/perl ] + then +- if $p/perl -e 'require 5.6.0;' ++ if $p/perl -e 'require 5.005;' + then + echo $p/perl > perlbin + exit 0 diff --git a/textproc/kdoc/pkg-plist b/textproc/kdoc/pkg-plist index 214a6341c700..4dcc50ab6555 100644 --- a/textproc/kdoc/pkg-plist +++ b/textproc/kdoc/pkg-plist @@ -1,23 +1,25 @@ bin/kdoc -bin/qt2kdoc bin/makekdedoc -lib/perl5/site_perl/%%PERL_VER%%/kdocUtil.pm +bin/qt2kdoc +lib/perl5/site_perl/%%PERL_VER%%/Ast.pm +lib/perl5/site_perl/%%PERL_VER%%/Iter.pm +lib/perl5/site_perl/%%PERL_VER%%/kdocAstGen.pm +lib/perl5/site_perl/%%PERL_VER%%/kdocAstSearch.pm lib/perl5/site_perl/%%PERL_VER%%/kdocAstUtil.pm -lib/perl5/site_perl/%%PERL_VER%%/kdocParseDoc.pm +lib/perl5/site_perl/%%PERL_VER%%/kdocCxxDocbook.pm lib/perl5/site_perl/%%PERL_VER%%/kdocCxxHTML.pm -lib/perl5/site_perl/%%PERL_VER%%/kdocLib.pm -lib/perl5/site_perl/%%PERL_VER%%/Ast.pm -lib/perl5/site_perl/%%PERL_VER%%/kdocIDLhtml.pm -lib/perl5/site_perl/%%PERL_VER%%/kdocHTMLutil.pm -lib/perl5/site_perl/%%PERL_VER%%/kdoctexi.pm lib/perl5/site_perl/%%PERL_VER%%/kdocCxxLaTeX.pm lib/perl5/site_perl/%%PERL_VER%%/kdocDocHelper.pm -lib/perl5/site_perl/%%PERL_VER%%/kdocCxxDocbook.pm -lib/perl5/site_perl/%%PERL_VER%%/Iter.pm -lib/perl5/site_perl/%%PERL_VER%%/kdocParser.pm -lib/perl5/site_perl/%%PERL_VER%%/kdocMan.pm lib/perl5/site_perl/%%PERL_VER%%/kdocDocIter.pm -lib/perl5/site_perl/%%PERL_VER%%/kdocAstGen.pm -share/doc/kdoc/index.docbook +lib/perl5/site_perl/%%PERL_VER%%/kdocHTMLutil.pm +lib/perl5/site_perl/%%PERL_VER%%/kdocLib.pm +lib/perl5/site_perl/%%PERL_VER%%/kdocMan.pm +lib/perl5/site_perl/%%PERL_VER%%/kdocParseCxx.pm +lib/perl5/site_perl/%%PERL_VER%%/kdocParseDoc.pm +lib/perl5/site_perl/%%PERL_VER%%/kdocParsePy.pm +lib/perl5/site_perl/%%PERL_VER%%/kdocParser.pm +lib/perl5/site_perl/%%PERL_VER%%/kdocUtil.pm +lib/perl5/site_perl/%%PERL_VER%%/kdoctexi.pm share/doc/kdoc/README +share/doc/kdoc/index.docbook @dirrm share/doc/kdoc diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile index a1f9ef6cbb47..1fe4c3dc71ad 100644 --- a/www/kdewebdev/Makefile +++ b/www/kdewebdev/Makefile @@ -31,6 +31,9 @@ USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \ --disable-closure +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes DOCS= css html javascript php diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index a1f9ef6cbb47..1fe4c3dc71ad 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -31,6 +31,9 @@ USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \ --disable-closure +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes DOCS= css html javascript php diff --git a/www/quanta/Makefile b/www/quanta/Makefile index a1f9ef6cbb47..1fe4c3dc71ad 100644 --- a/www/quanta/Makefile +++ b/www/quanta/Makefile @@ -31,6 +31,9 @@ USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \ --disable-closure +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes DOCS= css html javascript php diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile index c4af328004b6..f96cfa75a64f 100644 --- a/x11-clocks/kdetoys2/Makefile +++ b/x11-clocks/kdetoys2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdetoys -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= x11-clocks kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,32 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes -USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} +GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/x11-clocks/kdetoys2/distinfo b/x11-clocks/kdetoys2/distinfo index b32b658436f6..71fb19eab148 100644 --- a/x11-clocks/kdetoys2/distinfo +++ b/x11-clocks/kdetoys2/distinfo @@ -1 +1 @@ -MD5 (KDE/kdetoys-2.2.1.tar.bz2) = a106df7cbd681d2ef06185ee633d9de6 +MD5 (KDE/kdetoys-2.2.2.tar.bz2) = 67a90e965301997dc909229f643de22d diff --git a/x11-clocks/kdetoys2/pkg-plist b/x11-clocks/kdetoys2/pkg-plist index 0f92726741ef..0be24e947d69 100644 --- a/x11-clocks/kdetoys2/pkg-plist +++ b/x11-clocks/kdetoys2/pkg-plist @@ -531,7 +531,6 @@ share/icons/locolor/32x32/apps/ktux.png @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kworldclock @dirrm share/doc/HTML/en/kteatime @dirrm share/doc/HTML/en/kscore @@ -564,3 +563,4 @@ share/icons/locolor/32x32/apps/ktux.png @dirrm share/applnk/Toys @dirrm share/applnk/System/ScreenSavers @dirrm share/applnk/System +@dirrm share/applnk diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile index c4af328004b6..f96cfa75a64f 100644 --- a/x11-clocks/kdetoys3/Makefile +++ b/x11-clocks/kdetoys3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdetoys -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= x11-clocks kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,32 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes -USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} +GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo index b32b658436f6..71fb19eab148 100644 --- a/x11-clocks/kdetoys3/distinfo +++ b/x11-clocks/kdetoys3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdetoys-2.2.1.tar.bz2) = a106df7cbd681d2ef06185ee633d9de6 +MD5 (KDE/kdetoys-2.2.2.tar.bz2) = 67a90e965301997dc909229f643de22d diff --git a/x11-clocks/kdetoys3/pkg-plist b/x11-clocks/kdetoys3/pkg-plist index 0f92726741ef..0be24e947d69 100644 --- a/x11-clocks/kdetoys3/pkg-plist +++ b/x11-clocks/kdetoys3/pkg-plist @@ -531,7 +531,6 @@ share/icons/locolor/32x32/apps/ktux.png @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kworldclock @dirrm share/doc/HTML/en/kteatime @dirrm share/doc/HTML/en/kscore @@ -564,3 +563,4 @@ share/icons/locolor/32x32/apps/ktux.png @dirrm share/applnk/Toys @dirrm share/applnk/System/ScreenSavers @dirrm share/applnk/System +@dirrm share/applnk diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile index c4af328004b6..f96cfa75a64f 100644 --- a/x11-clocks/kdetoys4/Makefile +++ b/x11-clocks/kdetoys4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdetoys -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= x11-clocks kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,11 +14,32 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes -USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} +GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo index b32b658436f6..71fb19eab148 100644 --- a/x11-clocks/kdetoys4/distinfo +++ b/x11-clocks/kdetoys4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdetoys-2.2.1.tar.bz2) = a106df7cbd681d2ef06185ee633d9de6 +MD5 (KDE/kdetoys-2.2.2.tar.bz2) = 67a90e965301997dc909229f643de22d diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist index 0f92726741ef..0be24e947d69 100644 --- a/x11-clocks/kdetoys4/pkg-plist +++ b/x11-clocks/kdetoys4/pkg-plist @@ -531,7 +531,6 @@ share/icons/locolor/32x32/apps/ktux.png @dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/16x16/apps @dirrm share/doc/HTML/en/kworldclock @dirrm share/doc/HTML/en/kteatime @dirrm share/doc/HTML/en/kscore @@ -564,3 +563,4 @@ share/icons/locolor/32x32/apps/ktux.png @dirrm share/applnk/Toys @dirrm share/applnk/System/ScreenSavers @dirrm share/applnk/System +@dirrm share/applnk diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile index ce3224202514..3456f01c8602 100644 --- a/x11-themes/kdeartwork3/Makefile +++ b/x11-themes/kdeartwork3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeartwork -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= x11-wm kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,10 +14,32 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes INSTALLS_SHLIB= yes +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/x11-themes/kdeartwork3/distinfo b/x11-themes/kdeartwork3/distinfo index c828bdddabbe..67c7c335c2dc 100644 --- a/x11-themes/kdeartwork3/distinfo +++ b/x11-themes/kdeartwork3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeartwork-2.2.1.tar.bz2) = 5ff35f2bb8956ac518993f55854cb5eb +MD5 (KDE/kdeartwork-2.2.2.tar.bz2) = afaa475ba7d353453a5fa83d59b9f5e9 diff --git a/x11-themes/kdeartwork3/pkg-plist b/x11-themes/kdeartwork3/pkg-plist index d456939d81b1..8914a9c30836 100644 --- a/x11-themes/kdeartwork3/pkg-plist +++ b/x11-themes/kdeartwork3/pkg-plist @@ -81,6 +81,7 @@ share/apps/kwin/icewm-themes/Model/titleIM.xpm share/apps/kwin/icewm-themes/Model/titleIT.xpm share/sounds/KDE_Logout_new.wav share/sounds/KDE_Startup_new.wav +@dirrm share/sounds @dirrm share/apps/kwin/icewm-themes/Model @dirrm share/apps/kwin/icewm-themes/MenschMaschine @dirrm share/apps/kwin/icewm-themes diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile index ce3224202514..3456f01c8602 100644 --- a/x11-themes/kdeartwork4/Makefile +++ b/x11-themes/kdeartwork4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeartwork -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= x11-wm kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,10 +14,32 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes INSTALLS_SHLIB= yes +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/x11-themes/kdeartwork4/distinfo b/x11-themes/kdeartwork4/distinfo index c828bdddabbe..67c7c335c2dc 100644 --- a/x11-themes/kdeartwork4/distinfo +++ b/x11-themes/kdeartwork4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeartwork-2.2.1.tar.bz2) = 5ff35f2bb8956ac518993f55854cb5eb +MD5 (KDE/kdeartwork-2.2.2.tar.bz2) = afaa475ba7d353453a5fa83d59b9f5e9 diff --git a/x11-themes/kdeartwork4/pkg-plist b/x11-themes/kdeartwork4/pkg-plist index d456939d81b1..8914a9c30836 100644 --- a/x11-themes/kdeartwork4/pkg-plist +++ b/x11-themes/kdeartwork4/pkg-plist @@ -81,6 +81,7 @@ share/apps/kwin/icewm-themes/Model/titleIM.xpm share/apps/kwin/icewm-themes/Model/titleIT.xpm share/sounds/KDE_Logout_new.wav share/sounds/KDE_Startup_new.wav +@dirrm share/sounds @dirrm share/apps/kwin/icewm-themes/Model @dirrm share/apps/kwin/icewm-themes/MenschMaschine @dirrm share/apps/kwin/icewm-themes diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile index 4d9ab09216d8..915f399b0f96 100644 --- a/x11-toolkits/qt23/Makefile +++ b/x11-toolkits/qt23/Makefile @@ -7,6 +7,7 @@ PORTNAME?= qt PORTVERSION?= 2.3.1 +PORTREVISION= 1 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.chg.ru/pub/X11/qt/source/ @@ -18,6 +19,7 @@ MAINTAINER?= kde@FreeBSD.org LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg +BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_MESA= yes @@ -75,7 +77,10 @@ pre-fetch: .endif .endif -pre-configure: +qt-pre-configure: + @true + +pre-configure: qt-pre-configure ${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \ s,/usr/X11R6,${X11BASE},g; \ s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG} @@ -86,6 +91,10 @@ pre-configure: s,cp src/moc/moc bin/moc,cp src/moc/moc2 bin/moc2,g; \ s,symlinks src-moc src-mt sub-src sub-tools sub-tutorial sub-examples,symlinks src-moc src-mt sub-src sub-tools,g" \ ${WRKSRC}/Makefile +.if (${PORTNAME} == "qt") + ${PERL} -pi -e "s@\$$(MAKE) designer@@g; s@uic \\\@uic@g; \ + s@\t\tdesigner@@g" ${WRKSRC}/tools/designer/Makefile.in +.endif post-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks) diff --git a/x11-toolkits/qt23/files/patch-aa b/x11-toolkits/qt23/files/patch-aa index a58966744e42..d30908925332 100644 --- a/x11-toolkits/qt23/files/patch-aa +++ b/x11-toolkits/qt23/files/patch-aa @@ -1,5 +1,5 @@ ---- configs/freebsd-g++-shared Sun Dec 24 02:41:35 2000 -+++ configs/freebsd-g++-shared.new Sun Dec 24 02:42:49 2000 +--- configs/freebsd-g++-shared Wed Jun 13 03:56:43 2001 ++++ configs/freebsd-g++-shared.new Sun Dec 2 19:22:52 2001 @@ -6,7 +6,7 @@ # Compiling with support libraries @@ -18,6 +18,15 @@ SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib +@@ -32,7 +32,7 @@ + SYSCONF_LIBS_YACC = + + # Linking applications +-SYSCONF_LINK = g++ ++SYSCONF_LINK = objprelink $(OBJECTS) $(OBJMOC) && g++ + SYSCONF_LFLAGS = + SYSCONF_LIBS = + @@ -46,7 +46,7 @@ SYSCONF_LIBS_THREAD = @@ -27,10 +36,18 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -60,1 +60,1 @@ +@@ -57,16 +57,15 @@ + # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) + # + SYSCONF_LINK_SHLIB = g++ -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) +-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ +SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) -@@ -65,6 +65,4 @@ ++SYSCONF_LINK_LIB_SHARED = objprelink $(OBJECTS) $(OBJMOC) && \ ++ $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ + $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ + $(OBJECTS) $(OBJMOC) $(LIBS) && \ + mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ cd $(DESTDIR) && \ - rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ @@ -39,14 +56,16 @@ + rm -f lib$(TARGET).so;\ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so -@@ -77,8 +75,8 @@ + # Linking static libraries + # - Build the $(TARGET) library, eg. lib$(TARGET).a +@@ -77,8 +76,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source -SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 -SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2 ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2 # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/x11-toolkits/qt23/files/patch-designer::Makefile.in b/x11-toolkits/qt23/files/patch-designer::Makefile.in deleted file mode 100644 index f13ffe614aa8..000000000000 --- a/x11-toolkits/qt23/files/patch-designer::Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/designer/Makefile.in Wed Jan 31 21:29:47 2001 -+++ tools/designer/Makefile.in.new Sat Feb 3 18:05:34 2001 -@@ -6,8 +6,7 @@ - ############################################################################# - - SUBDIRS = util \ -- uic \ -- designer -+ uic - - all: - $(MAKE) util diff --git a/devel/qt-designer/files/patch-aj b/x11-toolkits/qt23/files/patch-designer::mainwindow.cpp index eddf54f011d9..eddf54f011d9 100644 --- a/devel/qt-designer/files/patch-aj +++ b/x11-toolkits/qt23/files/patch-designer::mainwindow.cpp diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist index 59ed9b3dfbc1..8b7682a9c868 100644 --- a/x11-toolkits/qt23/pkg-plist +++ b/x11-toolkits/qt23/pkg-plist @@ -284,16 +284,16 @@ include/qt2/qwmatrix.h include/qt2/qworkspace.h include/qt2/qxml.h include/qt2/qxt.h -%%SHARED%%lib/libqtgl.so -%%SHARED%%lib/libqtgl.so.4 %%SHARED%%lib/libqt2-mt.so %%SHARED%%lib/libqt2-mt.so.4 -%%STATIC%%lib/libqt2.a %%SHARED%%lib/libqt2.so %%SHARED%%lib/libqt2.so.4 -%%STATIC%%lib/libqutil.a +%%SHARED%%lib/libqtgl.so +%%SHARED%%lib/libqtgl.so.4 %%SHARED%%lib/libqutil.so %%SHARED%%lib/libqutil.so.1 +%%STATIC%%lib/libqt2.a +%%STATIC%%lib/libqutil.a share/doc/qt2/ANNOUNCE share/doc/qt2/FAQ share/doc/qt2/PORTING diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile index 4d9ab09216d8..915f399b0f96 100644 --- a/x11-toolkits/qt30/Makefile +++ b/x11-toolkits/qt30/Makefile @@ -7,6 +7,7 @@ PORTNAME?= qt PORTVERSION?= 2.3.1 +PORTREVISION= 1 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.chg.ru/pub/X11/qt/source/ @@ -18,6 +19,7 @@ MAINTAINER?= kde@FreeBSD.org LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg +BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_MESA= yes @@ -75,7 +77,10 @@ pre-fetch: .endif .endif -pre-configure: +qt-pre-configure: + @true + +pre-configure: qt-pre-configure ${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \ s,/usr/X11R6,${X11BASE},g; \ s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG} @@ -86,6 +91,10 @@ pre-configure: s,cp src/moc/moc bin/moc,cp src/moc/moc2 bin/moc2,g; \ s,symlinks src-moc src-mt sub-src sub-tools sub-tutorial sub-examples,symlinks src-moc src-mt sub-src sub-tools,g" \ ${WRKSRC}/Makefile +.if (${PORTNAME} == "qt") + ${PERL} -pi -e "s@\$$(MAKE) designer@@g; s@uic \\\@uic@g; \ + s@\t\tdesigner@@g" ${WRKSRC}/tools/designer/Makefile.in +.endif post-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks) diff --git a/x11-toolkits/qt30/files/patch-aa b/x11-toolkits/qt30/files/patch-aa index a58966744e42..d30908925332 100644 --- a/x11-toolkits/qt30/files/patch-aa +++ b/x11-toolkits/qt30/files/patch-aa @@ -1,5 +1,5 @@ ---- configs/freebsd-g++-shared Sun Dec 24 02:41:35 2000 -+++ configs/freebsd-g++-shared.new Sun Dec 24 02:42:49 2000 +--- configs/freebsd-g++-shared Wed Jun 13 03:56:43 2001 ++++ configs/freebsd-g++-shared.new Sun Dec 2 19:22:52 2001 @@ -6,7 +6,7 @@ # Compiling with support libraries @@ -18,6 +18,15 @@ SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib +@@ -32,7 +32,7 @@ + SYSCONF_LIBS_YACC = + + # Linking applications +-SYSCONF_LINK = g++ ++SYSCONF_LINK = objprelink $(OBJECTS) $(OBJMOC) && g++ + SYSCONF_LFLAGS = + SYSCONF_LIBS = + @@ -46,7 +46,7 @@ SYSCONF_LIBS_THREAD = @@ -27,10 +36,18 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -60,1 +60,1 @@ +@@ -57,16 +57,15 @@ + # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) + # + SYSCONF_LINK_SHLIB = g++ -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) +-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ +SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) -@@ -65,6 +65,4 @@ ++SYSCONF_LINK_LIB_SHARED = objprelink $(OBJECTS) $(OBJMOC) && \ ++ $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ + $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ + $(OBJECTS) $(OBJMOC) $(LIBS) && \ + mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ cd $(DESTDIR) && \ - rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ @@ -39,14 +56,16 @@ + rm -f lib$(TARGET).so;\ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so -@@ -77,8 +75,8 @@ + # Linking static libraries + # - Build the $(TARGET) library, eg. lib$(TARGET).a +@@ -77,8 +76,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source -SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 -SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2 ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2 # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/x11-toolkits/qt30/files/patch-designer::Makefile.in b/x11-toolkits/qt30/files/patch-designer::Makefile.in deleted file mode 100644 index f13ffe614aa8..000000000000 --- a/x11-toolkits/qt30/files/patch-designer::Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/designer/Makefile.in Wed Jan 31 21:29:47 2001 -+++ tools/designer/Makefile.in.new Sat Feb 3 18:05:34 2001 -@@ -6,8 +6,7 @@ - ############################################################################# - - SUBDIRS = util \ -- uic \ -- designer -+ uic - - all: - $(MAKE) util diff --git a/x11-toolkits/qt30/files/patch-designer::mainwindow.cpp b/x11-toolkits/qt30/files/patch-designer::mainwindow.cpp new file mode 100644 index 000000000000..eddf54f011d9 --- /dev/null +++ b/x11-toolkits/qt30/files/patch-designer::mainwindow.cpp @@ -0,0 +1,32 @@ +--- tools/designer/designer/mainwindow.cpp 2000/11/18 17:50:58 1.1 ++++ tools/designer/designer/mainwindow.cpp 2000/11/18 17:53:21 +@@ -125,7 +125,7 @@ + : QMainWindow( 0, "mainwindow", WType_TopLevel | WDestructiveClose ), + #endif + grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ), +- docPath( "$QTDIR/doc/html" ), client( asClient ) ++ docPath( QT_PREFIX "/share/doc/qt2/html" ), client( asClient ) + { + self = this; + setIcon( PixmapChooser::loadPixmap( "logo" ) ); +@@ -3144,7 +3144,7 @@ + QMessageBox::information( this, tr( "Create Template" ), tr( "Couldn't create the template" ) ); + return; + } +- fn.prepend( QString( getenv( "QTDIR" ) ) + "/tools/designer/templates/" ); ++ fn.prepend( QT_PREFIX "/share/qt2/designer/templates/" ); + fn.append( ".ui" ); + QFile f( fn ); + if ( !f.open( IO_WriteOnly ) ) { +@@ -3236,9 +3236,9 @@ + + void MainWindow::openHelpForDialog( const QString &dia ) + { +- QString manualdir = QString( getenv( "QTDIR" ) ) + "/tools/designer/manual/book1.html"; ++ QString manualdir = QT_PREFIX "/share/qt2/designer/manual/book1.html"; + if ( !QFile::exists( manualdir ) ) +- manualdir = QString( getenv( "QTDIR" ) ) + "/doc/html/designer/book1.html"; ++ manualdir = QT_PREFIX "/share/doc/qt2/html/designer/book1.html"; + QFile file( manualdir ); + if ( !file.open( IO_ReadOnly ) ) + return; diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist index 59ed9b3dfbc1..8b7682a9c868 100644 --- a/x11-toolkits/qt30/pkg-plist +++ b/x11-toolkits/qt30/pkg-plist @@ -284,16 +284,16 @@ include/qt2/qwmatrix.h include/qt2/qworkspace.h include/qt2/qxml.h include/qt2/qxt.h -%%SHARED%%lib/libqtgl.so -%%SHARED%%lib/libqtgl.so.4 %%SHARED%%lib/libqt2-mt.so %%SHARED%%lib/libqt2-mt.so.4 -%%STATIC%%lib/libqt2.a %%SHARED%%lib/libqt2.so %%SHARED%%lib/libqt2.so.4 -%%STATIC%%lib/libqutil.a +%%SHARED%%lib/libqtgl.so +%%SHARED%%lib/libqtgl.so.4 %%SHARED%%lib/libqutil.so %%SHARED%%lib/libqutil.so.1 +%%STATIC%%lib/libqt2.a +%%STATIC%%lib/libqutil.a share/doc/qt2/ANNOUNCE share/doc/qt2/FAQ share/doc/qt2/PORTING diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile index 4d9ab09216d8..915f399b0f96 100644 --- a/x11-toolkits/qt31/Makefile +++ b/x11-toolkits/qt31/Makefile @@ -7,6 +7,7 @@ PORTNAME?= qt PORTVERSION?= 2.3.1 +PORTREVISION= 1 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.chg.ru/pub/X11/qt/source/ @@ -18,6 +19,7 @@ MAINTAINER?= kde@FreeBSD.org LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg +BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_MESA= yes @@ -75,7 +77,10 @@ pre-fetch: .endif .endif -pre-configure: +qt-pre-configure: + @true + +pre-configure: qt-pre-configure ${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \ s,/usr/X11R6,${X11BASE},g; \ s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG} @@ -86,6 +91,10 @@ pre-configure: s,cp src/moc/moc bin/moc,cp src/moc/moc2 bin/moc2,g; \ s,symlinks src-moc src-mt sub-src sub-tools sub-tutorial sub-examples,symlinks src-moc src-mt sub-src sub-tools,g" \ ${WRKSRC}/Makefile +.if (${PORTNAME} == "qt") + ${PERL} -pi -e "s@\$$(MAKE) designer@@g; s@uic \\\@uic@g; \ + s@\t\tdesigner@@g" ${WRKSRC}/tools/designer/Makefile.in +.endif post-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks) diff --git a/x11-toolkits/qt31/files/patch-aa b/x11-toolkits/qt31/files/patch-aa index a58966744e42..d30908925332 100644 --- a/x11-toolkits/qt31/files/patch-aa +++ b/x11-toolkits/qt31/files/patch-aa @@ -1,5 +1,5 @@ ---- configs/freebsd-g++-shared Sun Dec 24 02:41:35 2000 -+++ configs/freebsd-g++-shared.new Sun Dec 24 02:42:49 2000 +--- configs/freebsd-g++-shared Wed Jun 13 03:56:43 2001 ++++ configs/freebsd-g++-shared.new Sun Dec 2 19:22:52 2001 @@ -6,7 +6,7 @@ # Compiling with support libraries @@ -18,6 +18,15 @@ SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib +@@ -32,7 +32,7 @@ + SYSCONF_LIBS_YACC = + + # Linking applications +-SYSCONF_LINK = g++ ++SYSCONF_LINK = objprelink $(OBJECTS) $(OBJMOC) && g++ + SYSCONF_LFLAGS = + SYSCONF_LIBS = + @@ -46,7 +46,7 @@ SYSCONF_LIBS_THREAD = @@ -27,10 +36,18 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -60,1 +60,1 @@ +@@ -57,16 +57,15 @@ + # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) + # + SYSCONF_LINK_SHLIB = g++ -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) +-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ +SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) -@@ -65,6 +65,4 @@ ++SYSCONF_LINK_LIB_SHARED = objprelink $(OBJECTS) $(OBJMOC) && \ ++ $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ + $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ + $(OBJECTS) $(OBJMOC) $(LIBS) && \ + mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ cd $(DESTDIR) && \ - rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ @@ -39,14 +56,16 @@ + rm -f lib$(TARGET).so;\ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so -@@ -77,8 +75,8 @@ + # Linking static libraries + # - Build the $(TARGET) library, eg. lib$(TARGET).a +@@ -77,8 +76,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source -SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 -SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2 ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2 # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/x11-toolkits/qt31/files/patch-designer::Makefile.in b/x11-toolkits/qt31/files/patch-designer::Makefile.in deleted file mode 100644 index f13ffe614aa8..000000000000 --- a/x11-toolkits/qt31/files/patch-designer::Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/designer/Makefile.in Wed Jan 31 21:29:47 2001 -+++ tools/designer/Makefile.in.new Sat Feb 3 18:05:34 2001 -@@ -6,8 +6,7 @@ - ############################################################################# - - SUBDIRS = util \ -- uic \ -- designer -+ uic - - all: - $(MAKE) util diff --git a/x11-toolkits/qt31/files/patch-designer::mainwindow.cpp b/x11-toolkits/qt31/files/patch-designer::mainwindow.cpp new file mode 100644 index 000000000000..eddf54f011d9 --- /dev/null +++ b/x11-toolkits/qt31/files/patch-designer::mainwindow.cpp @@ -0,0 +1,32 @@ +--- tools/designer/designer/mainwindow.cpp 2000/11/18 17:50:58 1.1 ++++ tools/designer/designer/mainwindow.cpp 2000/11/18 17:53:21 +@@ -125,7 +125,7 @@ + : QMainWindow( 0, "mainwindow", WType_TopLevel | WDestructiveClose ), + #endif + grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ), +- docPath( "$QTDIR/doc/html" ), client( asClient ) ++ docPath( QT_PREFIX "/share/doc/qt2/html" ), client( asClient ) + { + self = this; + setIcon( PixmapChooser::loadPixmap( "logo" ) ); +@@ -3144,7 +3144,7 @@ + QMessageBox::information( this, tr( "Create Template" ), tr( "Couldn't create the template" ) ); + return; + } +- fn.prepend( QString( getenv( "QTDIR" ) ) + "/tools/designer/templates/" ); ++ fn.prepend( QT_PREFIX "/share/qt2/designer/templates/" ); + fn.append( ".ui" ); + QFile f( fn ); + if ( !f.open( IO_WriteOnly ) ) { +@@ -3236,9 +3236,9 @@ + + void MainWindow::openHelpForDialog( const QString &dia ) + { +- QString manualdir = QString( getenv( "QTDIR" ) ) + "/tools/designer/manual/book1.html"; ++ QString manualdir = QT_PREFIX "/share/qt2/designer/manual/book1.html"; + if ( !QFile::exists( manualdir ) ) +- manualdir = QString( getenv( "QTDIR" ) ) + "/doc/html/designer/book1.html"; ++ manualdir = QT_PREFIX "/share/doc/qt2/html/designer/book1.html"; + QFile file( manualdir ); + if ( !file.open( IO_ReadOnly ) ) + return; diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist index 59ed9b3dfbc1..8b7682a9c868 100644 --- a/x11-toolkits/qt31/pkg-plist +++ b/x11-toolkits/qt31/pkg-plist @@ -284,16 +284,16 @@ include/qt2/qwmatrix.h include/qt2/qworkspace.h include/qt2/qxml.h include/qt2/qxt.h -%%SHARED%%lib/libqtgl.so -%%SHARED%%lib/libqtgl.so.4 %%SHARED%%lib/libqt2-mt.so %%SHARED%%lib/libqt2-mt.so.4 -%%STATIC%%lib/libqt2.a %%SHARED%%lib/libqt2.so %%SHARED%%lib/libqt2.so.4 -%%STATIC%%lib/libqutil.a +%%SHARED%%lib/libqtgl.so +%%SHARED%%lib/libqtgl.so.4 %%SHARED%%lib/libqutil.so %%SHARED%%lib/libqutil.so.1 +%%STATIC%%lib/libqt2.a +%%STATIC%%lib/libqutil.a share/doc/qt2/ANNOUNCE share/doc/qt2/FAQ share/doc/qt2/PORTING diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile index 4d9ab09216d8..915f399b0f96 100644 --- a/x11-toolkits/qt32/Makefile +++ b/x11-toolkits/qt32/Makefile @@ -7,6 +7,7 @@ PORTNAME?= qt PORTVERSION?= 2.3.1 +PORTREVISION= 1 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.chg.ru/pub/X11/qt/source/ @@ -18,6 +19,7 @@ MAINTAINER?= kde@FreeBSD.org LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg +BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_MESA= yes @@ -75,7 +77,10 @@ pre-fetch: .endif .endif -pre-configure: +qt-pre-configure: + @true + +pre-configure: qt-pre-configure ${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \ s,/usr/X11R6,${X11BASE},g; \ s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG} @@ -86,6 +91,10 @@ pre-configure: s,cp src/moc/moc bin/moc,cp src/moc/moc2 bin/moc2,g; \ s,symlinks src-moc src-mt sub-src sub-tools sub-tutorial sub-examples,symlinks src-moc src-mt sub-src sub-tools,g" \ ${WRKSRC}/Makefile +.if (${PORTNAME} == "qt") + ${PERL} -pi -e "s@\$$(MAKE) designer@@g; s@uic \\\@uic@g; \ + s@\t\tdesigner@@g" ${WRKSRC}/tools/designer/Makefile.in +.endif post-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks) diff --git a/x11-toolkits/qt32/files/patch-aa b/x11-toolkits/qt32/files/patch-aa index a58966744e42..d30908925332 100644 --- a/x11-toolkits/qt32/files/patch-aa +++ b/x11-toolkits/qt32/files/patch-aa @@ -1,5 +1,5 @@ ---- configs/freebsd-g++-shared Sun Dec 24 02:41:35 2000 -+++ configs/freebsd-g++-shared.new Sun Dec 24 02:42:49 2000 +--- configs/freebsd-g++-shared Wed Jun 13 03:56:43 2001 ++++ configs/freebsd-g++-shared.new Sun Dec 2 19:22:52 2001 @@ -6,7 +6,7 @@ # Compiling with support libraries @@ -18,6 +18,15 @@ SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib +@@ -32,7 +32,7 @@ + SYSCONF_LIBS_YACC = + + # Linking applications +-SYSCONF_LINK = g++ ++SYSCONF_LINK = objprelink $(OBJECTS) $(OBJMOC) && g++ + SYSCONF_LFLAGS = + SYSCONF_LIBS = + @@ -46,7 +46,7 @@ SYSCONF_LIBS_THREAD = @@ -27,10 +36,18 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -60,1 +60,1 @@ +@@ -57,16 +57,15 @@ + # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) + # + SYSCONF_LINK_SHLIB = g++ -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) +-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ +SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) -@@ -65,6 +65,4 @@ ++SYSCONF_LINK_LIB_SHARED = objprelink $(OBJECTS) $(OBJMOC) && \ ++ $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ + $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ + $(OBJECTS) $(OBJMOC) $(LIBS) && \ + mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ cd $(DESTDIR) && \ - rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ @@ -39,14 +56,16 @@ + rm -f lib$(TARGET).so;\ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so -@@ -77,8 +75,8 @@ + # Linking static libraries + # - Build the $(TARGET) library, eg. lib$(TARGET).a +@@ -77,8 +76,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source -SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 -SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2 ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2 # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/x11-toolkits/qt32/files/patch-designer::Makefile.in b/x11-toolkits/qt32/files/patch-designer::Makefile.in deleted file mode 100644 index f13ffe614aa8..000000000000 --- a/x11-toolkits/qt32/files/patch-designer::Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/designer/Makefile.in Wed Jan 31 21:29:47 2001 -+++ tools/designer/Makefile.in.new Sat Feb 3 18:05:34 2001 -@@ -6,8 +6,7 @@ - ############################################################################# - - SUBDIRS = util \ -- uic \ -- designer -+ uic - - all: - $(MAKE) util diff --git a/x11-toolkits/qt32/files/patch-designer::mainwindow.cpp b/x11-toolkits/qt32/files/patch-designer::mainwindow.cpp new file mode 100644 index 000000000000..eddf54f011d9 --- /dev/null +++ b/x11-toolkits/qt32/files/patch-designer::mainwindow.cpp @@ -0,0 +1,32 @@ +--- tools/designer/designer/mainwindow.cpp 2000/11/18 17:50:58 1.1 ++++ tools/designer/designer/mainwindow.cpp 2000/11/18 17:53:21 +@@ -125,7 +125,7 @@ + : QMainWindow( 0, "mainwindow", WType_TopLevel | WDestructiveClose ), + #endif + grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ), +- docPath( "$QTDIR/doc/html" ), client( asClient ) ++ docPath( QT_PREFIX "/share/doc/qt2/html" ), client( asClient ) + { + self = this; + setIcon( PixmapChooser::loadPixmap( "logo" ) ); +@@ -3144,7 +3144,7 @@ + QMessageBox::information( this, tr( "Create Template" ), tr( "Couldn't create the template" ) ); + return; + } +- fn.prepend( QString( getenv( "QTDIR" ) ) + "/tools/designer/templates/" ); ++ fn.prepend( QT_PREFIX "/share/qt2/designer/templates/" ); + fn.append( ".ui" ); + QFile f( fn ); + if ( !f.open( IO_WriteOnly ) ) { +@@ -3236,9 +3236,9 @@ + + void MainWindow::openHelpForDialog( const QString &dia ) + { +- QString manualdir = QString( getenv( "QTDIR" ) ) + "/tools/designer/manual/book1.html"; ++ QString manualdir = QT_PREFIX "/share/qt2/designer/manual/book1.html"; + if ( !QFile::exists( manualdir ) ) +- manualdir = QString( getenv( "QTDIR" ) ) + "/doc/html/designer/book1.html"; ++ manualdir = QT_PREFIX "/share/doc/qt2/html/designer/book1.html"; + QFile file( manualdir ); + if ( !file.open( IO_ReadOnly ) ) + return; diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist index 59ed9b3dfbc1..8b7682a9c868 100644 --- a/x11-toolkits/qt32/pkg-plist +++ b/x11-toolkits/qt32/pkg-plist @@ -284,16 +284,16 @@ include/qt2/qwmatrix.h include/qt2/qworkspace.h include/qt2/qxml.h include/qt2/qxt.h -%%SHARED%%lib/libqtgl.so -%%SHARED%%lib/libqtgl.so.4 %%SHARED%%lib/libqt2-mt.so %%SHARED%%lib/libqt2-mt.so.4 -%%STATIC%%lib/libqt2.a %%SHARED%%lib/libqt2.so %%SHARED%%lib/libqt2.so.4 -%%STATIC%%lib/libqutil.a +%%SHARED%%lib/libqtgl.so +%%SHARED%%lib/libqtgl.so.4 %%SHARED%%lib/libqutil.so %%SHARED%%lib/libqutil.so.1 +%%STATIC%%lib/libqt2.a +%%STATIC%%lib/libqutil.a share/doc/qt2/ANNOUNCE share/doc/qt2/FAQ share/doc/qt2/PORTING diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index 4d9ab09216d8..915f399b0f96 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -7,6 +7,7 @@ PORTNAME?= qt PORTVERSION?= 2.3.1 +PORTREVISION= 1 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.chg.ru/pub/X11/qt/source/ @@ -18,6 +19,7 @@ MAINTAINER?= kde@FreeBSD.org LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg +BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_MESA= yes @@ -75,7 +77,10 @@ pre-fetch: .endif .endif -pre-configure: +qt-pre-configure: + @true + +pre-configure: qt-pre-configure ${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \ s,/usr/X11R6,${X11BASE},g; \ s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG} @@ -86,6 +91,10 @@ pre-configure: s,cp src/moc/moc bin/moc,cp src/moc/moc2 bin/moc2,g; \ s,symlinks src-moc src-mt sub-src sub-tools sub-tutorial sub-examples,symlinks src-moc src-mt sub-src sub-tools,g" \ ${WRKSRC}/Makefile +.if (${PORTNAME} == "qt") + ${PERL} -pi -e "s@\$$(MAKE) designer@@g; s@uic \\\@uic@g; \ + s@\t\tdesigner@@g" ${WRKSRC}/tools/designer/Makefile.in +.endif post-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks) diff --git a/x11-toolkits/qt33/files/patch-aa b/x11-toolkits/qt33/files/patch-aa index a58966744e42..d30908925332 100644 --- a/x11-toolkits/qt33/files/patch-aa +++ b/x11-toolkits/qt33/files/patch-aa @@ -1,5 +1,5 @@ ---- configs/freebsd-g++-shared Sun Dec 24 02:41:35 2000 -+++ configs/freebsd-g++-shared.new Sun Dec 24 02:42:49 2000 +--- configs/freebsd-g++-shared Wed Jun 13 03:56:43 2001 ++++ configs/freebsd-g++-shared.new Sun Dec 2 19:22:52 2001 @@ -6,7 +6,7 @@ # Compiling with support libraries @@ -18,6 +18,15 @@ SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib +@@ -32,7 +32,7 @@ + SYSCONF_LIBS_YACC = + + # Linking applications +-SYSCONF_LINK = g++ ++SYSCONF_LINK = objprelink $(OBJECTS) $(OBJMOC) && g++ + SYSCONF_LFLAGS = + SYSCONF_LIBS = + @@ -46,7 +46,7 @@ SYSCONF_LIBS_THREAD = @@ -27,10 +36,18 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -60,1 +60,1 @@ +@@ -57,16 +57,15 @@ + # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) + # + SYSCONF_LINK_SHLIB = g++ -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) +-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ +SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) -@@ -65,6 +65,4 @@ ++SYSCONF_LINK_LIB_SHARED = objprelink $(OBJECTS) $(OBJMOC) && \ ++ $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ + $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ + $(OBJECTS) $(OBJMOC) $(LIBS) && \ + mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ cd $(DESTDIR) && \ - rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ @@ -39,14 +56,16 @@ + rm -f lib$(TARGET).so;\ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so -@@ -77,8 +75,8 @@ + # Linking static libraries + # - Build the $(TARGET) library, eg. lib$(TARGET).a +@@ -77,8 +76,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source -SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 -SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions -+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2 ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2 # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/x11-toolkits/qt33/files/patch-designer::Makefile.in b/x11-toolkits/qt33/files/patch-designer::Makefile.in deleted file mode 100644 index f13ffe614aa8..000000000000 --- a/x11-toolkits/qt33/files/patch-designer::Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/designer/Makefile.in Wed Jan 31 21:29:47 2001 -+++ tools/designer/Makefile.in.new Sat Feb 3 18:05:34 2001 -@@ -6,8 +6,7 @@ - ############################################################################# - - SUBDIRS = util \ -- uic \ -- designer -+ uic - - all: - $(MAKE) util diff --git a/x11-toolkits/qt33/files/patch-designer::mainwindow.cpp b/x11-toolkits/qt33/files/patch-designer::mainwindow.cpp new file mode 100644 index 000000000000..eddf54f011d9 --- /dev/null +++ b/x11-toolkits/qt33/files/patch-designer::mainwindow.cpp @@ -0,0 +1,32 @@ +--- tools/designer/designer/mainwindow.cpp 2000/11/18 17:50:58 1.1 ++++ tools/designer/designer/mainwindow.cpp 2000/11/18 17:53:21 +@@ -125,7 +125,7 @@ + : QMainWindow( 0, "mainwindow", WType_TopLevel | WDestructiveClose ), + #endif + grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ), +- docPath( "$QTDIR/doc/html" ), client( asClient ) ++ docPath( QT_PREFIX "/share/doc/qt2/html" ), client( asClient ) + { + self = this; + setIcon( PixmapChooser::loadPixmap( "logo" ) ); +@@ -3144,7 +3144,7 @@ + QMessageBox::information( this, tr( "Create Template" ), tr( "Couldn't create the template" ) ); + return; + } +- fn.prepend( QString( getenv( "QTDIR" ) ) + "/tools/designer/templates/" ); ++ fn.prepend( QT_PREFIX "/share/qt2/designer/templates/" ); + fn.append( ".ui" ); + QFile f( fn ); + if ( !f.open( IO_WriteOnly ) ) { +@@ -3236,9 +3236,9 @@ + + void MainWindow::openHelpForDialog( const QString &dia ) + { +- QString manualdir = QString( getenv( "QTDIR" ) ) + "/tools/designer/manual/book1.html"; ++ QString manualdir = QT_PREFIX "/share/qt2/designer/manual/book1.html"; + if ( !QFile::exists( manualdir ) ) +- manualdir = QString( getenv( "QTDIR" ) ) + "/doc/html/designer/book1.html"; ++ manualdir = QT_PREFIX "/share/doc/qt2/html/designer/book1.html"; + QFile file( manualdir ); + if ( !file.open( IO_ReadOnly ) ) + return; diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist index 59ed9b3dfbc1..8b7682a9c868 100644 --- a/x11-toolkits/qt33/pkg-plist +++ b/x11-toolkits/qt33/pkg-plist @@ -284,16 +284,16 @@ include/qt2/qwmatrix.h include/qt2/qworkspace.h include/qt2/qxml.h include/qt2/qxt.h -%%SHARED%%lib/libqtgl.so -%%SHARED%%lib/libqtgl.so.4 %%SHARED%%lib/libqt2-mt.so %%SHARED%%lib/libqt2-mt.so.4 -%%STATIC%%lib/libqt2.a %%SHARED%%lib/libqt2.so %%SHARED%%lib/libqt2.so.4 -%%STATIC%%lib/libqutil.a +%%SHARED%%lib/libqtgl.so +%%SHARED%%lib/libqtgl.so.4 %%SHARED%%lib/libqutil.so %%SHARED%%lib/libqutil.so.1 +%%STATIC%%lib/libqt2.a +%%STATIC%%lib/libqutil.a share/doc/qt2/ANNOUNCE share/doc/qt2/FAQ share/doc/qt2/PORTING diff --git a/x11-wm/kdeartwork/Makefile b/x11-wm/kdeartwork/Makefile index ce3224202514..3456f01c8602 100644 --- a/x11-wm/kdeartwork/Makefile +++ b/x11-wm/kdeartwork/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeartwork -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= x11-wm kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,10 +14,32 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes INSTALLS_SHLIB= yes +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/x11-wm/kdeartwork/distinfo b/x11-wm/kdeartwork/distinfo index c828bdddabbe..67c7c335c2dc 100644 --- a/x11-wm/kdeartwork/distinfo +++ b/x11-wm/kdeartwork/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeartwork-2.2.1.tar.bz2) = 5ff35f2bb8956ac518993f55854cb5eb +MD5 (KDE/kdeartwork-2.2.2.tar.bz2) = afaa475ba7d353453a5fa83d59b9f5e9 diff --git a/x11-wm/kdeartwork/pkg-plist b/x11-wm/kdeartwork/pkg-plist index d456939d81b1..8914a9c30836 100644 --- a/x11-wm/kdeartwork/pkg-plist +++ b/x11-wm/kdeartwork/pkg-plist @@ -81,6 +81,7 @@ share/apps/kwin/icewm-themes/Model/titleIM.xpm share/apps/kwin/icewm-themes/Model/titleIT.xpm share/sounds/KDE_Logout_new.wav share/sounds/KDE_Startup_new.wav +@dirrm share/sounds @dirrm share/apps/kwin/icewm-themes/Model @dirrm share/apps/kwin/icewm-themes/MenschMaschine @dirrm share/apps/kwin/icewm-themes diff --git a/x11-wm/kdeartwork3/Makefile b/x11-wm/kdeartwork3/Makefile index ce3224202514..3456f01c8602 100644 --- a/x11-wm/kdeartwork3/Makefile +++ b/x11-wm/kdeartwork3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdeartwork -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= x11-wm kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,10 +14,32 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink + USE_KDELIBS_VER=2 USE_BZIP2= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes INSTALLS_SHLIB= yes +pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs + .include <bsd.port.mk> diff --git a/x11-wm/kdeartwork3/distinfo b/x11-wm/kdeartwork3/distinfo index c828bdddabbe..67c7c335c2dc 100644 --- a/x11-wm/kdeartwork3/distinfo +++ b/x11-wm/kdeartwork3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeartwork-2.2.1.tar.bz2) = 5ff35f2bb8956ac518993f55854cb5eb +MD5 (KDE/kdeartwork-2.2.2.tar.bz2) = afaa475ba7d353453a5fa83d59b9f5e9 diff --git a/x11-wm/kdeartwork3/pkg-plist b/x11-wm/kdeartwork3/pkg-plist index d456939d81b1..8914a9c30836 100644 --- a/x11-wm/kdeartwork3/pkg-plist +++ b/x11-wm/kdeartwork3/pkg-plist @@ -81,6 +81,7 @@ share/apps/kwin/icewm-themes/Model/titleIM.xpm share/apps/kwin/icewm-themes/Model/titleIT.xpm share/sounds/KDE_Logout_new.wav share/sounds/KDE_Startup_new.wav +@dirrm share/sounds @dirrm share/apps/kwin/icewm-themes/Model @dirrm share/apps/kwin/icewm-themes/MenschMaschine @dirrm share/apps/kwin/icewm-themes diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile index 162e065022fa..42b3d41907ac 100644 --- a/x11/kde2/Makefile +++ b/x11/kde2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kde -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile index 162e065022fa..42b3d41907ac 100644 --- a/x11/kde3/Makefile +++ b/x11/kde3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kde -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index ee69d6cb95bb..f8e6c70e010f 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -6,8 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2.2 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -15,6 +14,9 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -27,8 +29,13 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --without-ldap \ - --disable-closure + --without-ldap --disable-closure --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes .include <bsd.port.pre.mk> @@ -56,6 +63,15 @@ post-extract: @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/libkonq/Makefile.in ${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index f0d9e99b49aa..251c4afefe28 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1 +1 @@ -MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a +MD5 (KDE/kdebase-2.2.2.tar.bz2) = 39635e42056ab2afb8e6f2ff761eea38 diff --git a/x11/kde4-baseapps/files/patch-apm.c b/x11/kde4-baseapps/files/patch-apm.c new file mode 100644 index 000000000000..08925da1dee5 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-apm.c @@ -0,0 +1,101 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.c Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,98 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <machine/apm_bios.h> ++#include <stdio.h> ++ ++#include "Command.h" ++#include "apm.h" ++#include "ksysguardd.h" ++ ++static int ApmFD, BattFill, BattTime; ++ ++#define APMDEV "/dev/apm" ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initApm(void) ++{ ++ if ((ApmFD = open(APMDEV, O_RDONLY)) < 0) ++ return; ++ ++ if (updateApm() < 0) ++ return; ++ ++ registerMonitor("apm/batterycharge", "integer", printApmBatFill, ++ printApmBatFillInfo); ++ registerMonitor("apm/remainingtime", "integer", printApmBatTime, ++ printApmBatTimeInfo); ++} ++ ++void ++exitApm(void) ++{ ++ removeMonitor("apm/batterycharge"); ++ removeMonitor("apm/remainingtime"); ++ ++ close(ApmFD); ++} ++ ++int ++updateApm(void) ++{ ++ struct apm_info info; ++ int retval; ++ ++ retval = ioctl(ApmFD, APMIO_GETINFO, &info); ++ ++ BattFill = info.ai_batt_life; ++ BattTime = info.ai_batt_time; ++ ++ return retval; ++} ++ ++void ++printApmBatFill(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattFill); ++} ++ ++void ++printApmBatFillInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Battery charge\t0\t100\t%%\n"); ++} ++ ++void ++printApmBatTime(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattTime); ++} ++ ++void ++printApmBatTimeInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); ++} diff --git a/x11/kde4-baseapps/files/patch-apm.h b/x11/kde4-baseapps/files/patch-apm.h new file mode 100644 index 000000000000..73e509bdd61b --- /dev/null +++ b/x11/kde4-baseapps/files/patch-apm.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.h Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _apm_h_ ++#define _apm_h_ ++ ++void initApm(void); ++void exitApm(void); ++int updateApm(void); ++ ++void printApmBatFill(const char*); ++void printApmBatFillInfo(const char*); ++void printApmBatTime(const char*); ++void printApmBatTimeInfo(const char*); ++ ++#endif diff --git a/x11/kde4-baseapps/files/patch-conf.c b/x11/kde4-baseapps/files/patch-conf.c new file mode 100644 index 000000000000..a4de97379b10 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-conf.c @@ -0,0 +1,136 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.c Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,133 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.c,v 1.3 2001/11/05 23:24:19 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++ ++CONTAINER LogFileList = 0; ++CONTAINER SensorList = 0; ++ ++void parseConfigFile(const char *filename) ++{ ++ FILE* config; ++ char line[2048]; ++ char *begin, *token, *tmp, *confSensor; ++ ConfigLogFile *confLog; ++ ++ ++ if (LogFileList) ++ destr_ctnr(LogFileList, free); ++ ++ if (SensorList) ++ destr_ctnr(SensorList, free); ++ ++ LogFileList = new_ctnr(CT_DLL); ++ SensorList = new_ctnr(CT_DLL); ++ ++ if ((config = fopen(filename, "r")) == NULL) { ++ log_error("can't open config file '%s'", filename); ++ ++ /* if we can't open a config file we have to add the ++ available sensors manually ++ */ ++ ++ confSensor = strdup("ProcessList"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Memory"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Stat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetDev"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("CpuInfo"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LoadAvg"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("DiskStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LogFile"); ++ push_ctnr(SensorList, confSensor); ++ ++ return; ++ } ++ ++ while (fgets(line, sizeof(line), config) != NULL) { ++ if ((line[0] == '#') || (strlen(line) == 0)) { ++ continue; ++ } ++ ++ if (strchr(line, '#')) ++ *(strchr(line, '#')) = '\0'; ++ ++ if (line[strlen(line) - 1] == '\n') ++ line[strlen(line) - 1] = '\0'; ++ ++ if (!strncmp(line, "LogFiles", 8)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ if ((confLog = (ConfigLogFile *)malloc(sizeof(ConfigLogFile))) == NULL) { ++ log_error("malloc() no free memory avail"); ++ continue; ++ } ++ confLog->name = strdup(token); ++ tmp = strchr(confLog->name, ':'); ++ *tmp = '\0'; ++ confLog->path = tmp; ++ confLog->path++; ++ ++ push_ctnr(LogFileList, confLog); ++ } ++ } ++ if (!strncmp(line, "Sensors", 7)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ confSensor = strdup(token); ++ push_ctnr(SensorList, confSensor); ++ } ++ } ++ } ++ ++ fclose(config); ++} ++ ++int sensorAvailable(const char *sensor) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(SensorList); i++) { ++ char* name = get_ctnr(SensorList, i); ++ if (!strcmp(name, sensor)) ++ return 1; ++ } ++ ++ return 0; ++} diff --git a/x11/kde4-baseapps/files/patch-conf.h b/x11/kde4-baseapps/files/patch-conf.h new file mode 100644 index 000000000000..8aba2e520205 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-conf.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.h Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _conf_h_ ++#define _conf_h_ ++ ++typedef struct { ++ char *name; ++ char *path; ++} ConfigLogFile; ++ ++void parseConfigFile(const char *filename); ++ ++int sensorAvailable(const char* sensor); ++ ++#endif diff --git a/x11/kde4-baseapps/files/patch-diskstat.c b/x11/kde4-baseapps/files/patch-diskstat.c new file mode 100644 index 000000000000..5535e580a673 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-diskstat.c @@ -0,0 +1,260 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.c Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,257 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/param.h> ++#include <sys/stat.h> ++#include <sys/ucred.h> ++#include <sys/mount.h> ++#include <time.h> ++#include <unistd.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "diskstat.h" ++#include "ksysguardd.h" ++ ++typedef struct { ++ char device[256]; ++ char mntpnt[256]; ++ long blocks; ++ long bfree; ++ long bused; ++ int bused_percent; ++} DiskInfo; ++ ++static CONTAINER DiskStatList = 0; ++ ++char *getMntPnt(const char *cmd) ++{ ++ static char device[1024]; ++ char *ptr; ++ ++ memset(device, 0, sizeof(device)); ++ sscanf(cmd, "partitions%1024s", device); ++ ++ ptr = (char *)rindex(device, '/'); ++ *ptr = '\0'; ++ ++ return (char *)device; ++} ++ ++int numMntPnt(void) ++{ ++ struct statfs *fs_info; ++ int i, n, counter = 0; ++ ++ n = getmntinfo(&fs_info, MNT_WAIT); ++ for (i = 0; i < n; i++) ++ if (strcmp(fs_info[i].f_fstypename, "procfs") && strcmp(fs_info[i].f_fstypename, "swap") && strcmp(fs_info[i].f_fstypename, "devfs")) ++ counter++; ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initDiskStat(void) ++{ ++ char monitor[1024]; ++ int i; ++ ++ DiskStatList = new_ctnr(CT_DLL); ++ ++ updateDiskStat(); ++ ++ registerMonitor("partitions/list", "listview", printDiskStat, printDiskStatInfo); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatUsed, printDiskStatUsedInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatFree, printDiskStatFreeInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatPercent, printDiskStatPercentInfo); ++ } ++} ++ ++void checkDiskStat(void) ++{ ++ if (numMntPnt() != level_ctnr(DiskStatList)) { ++ /* a filesystem was mounted or unmounted ++ so we do a reset */ ++ exitDiskStat(); ++ initDiskStat(); ++ } ++} ++ ++void exitDiskStat(void) ++{ ++ DiskInfo *disk_info; ++ char monitor[1024]; ++ int i; ++ ++ removeMonitor("partitions/list"); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ disk_info = remove_ctnr(DiskStatList, i--); ++ ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ removeMonitor(monitor); ++ ++ free(disk_info); ++ } ++ ++ if (DiskStatList) ++ destr_ctnr(DiskStatList, free); ++} ++ ++int updateDiskStat(void) ++{ ++ struct statfs *fs_info; ++ struct statfs fs; ++ float percent; ++ int i, mntcount; ++ DiskInfo *disk_info; ++ ++ /* let's hope there is no difference between the DiskStatList and ++ the number of mounted filesystems */ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) ++ free(remove_ctnr(DiskStatList, i--)); ++ ++ mntcount = getmntinfo(&fs_info, MNT_WAIT); ++ ++ for (i = 0; i < mntcount; i++) { ++ fs = fs_info[i]; ++ if (strcmp(fs.f_fstypename, "procfs") && strcmp(fs.f_fstypename, "devfs") && strcmp(fs.f_fstypename, "devfs")) { ++ percent = (((float)fs.f_blocks - (float)fs.f_bfree)/(float)fs.f_blocks); ++ percent = percent * 100; ++ if ((disk_info = (DiskInfo *)malloc(sizeof(DiskInfo))) == NULL) { ++ continue; ++ } ++ memset(disk_info, 0, sizeof(DiskInfo)); ++ strncpy(disk_info->device, fs.f_mntfromname, 255); ++ if (!strcmp(fs.f_mntonname, "/")) { ++ strncpy(disk_info->mntpnt, "/root", 6); ++ } else { ++ strncpy(disk_info->mntpnt, fs.f_mntonname, 255); ++ } ++ disk_info->blocks = fs.f_blocks; ++ disk_info->bfree = fs.f_bfree; ++ disk_info->bused = (fs.f_blocks - fs.f_bfree); ++ disk_info->bused_percent = (int)percent; ++ ++ push_ctnr(DiskStatList, disk_info); ++ } ++ } ++ ++ return 0; ++} ++ ++void printDiskStat(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%d\t%s\n", ++ disk_info->device, ++ disk_info->blocks, ++ disk_info->bused, ++ disk_info->bfree, ++ disk_info->bused_percent, ++ disk_info->mntpnt); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Device\tBlocks\tUsed\tAvailable\tUsed %%\tMountPoint\n"); ++} ++ ++void printDiskStatUsed(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bused); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatUsedInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatFree(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bfree); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatFreeInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Free Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatPercent(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%d\n", disk_info->bused_percent); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatPercentInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t100\t%%\n"); ++} diff --git a/x11/kde4-baseapps/files/patch-diskstat.h b/x11/kde4-baseapps/files/patch-diskstat.h new file mode 100644 index 000000000000..3b5bf11b89c7 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-diskstat.h @@ -0,0 +1,44 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.h Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,41 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _diskstat_h_ ++#define _diskstat_h_ ++ ++void initDiskStat(void); ++void exitDiskStat(void); ++ ++int updateDiskStat(void); ++void checkDiskStat(void); ++ ++void printDiskStat(const char* cmd); ++void printDiskStatInfo(const char* cmd); ++ ++void printDiskStatUsed(const char* cmd); ++void printDiskStatUsedInfo(const char* cmd); ++void printDiskStatFree(const char* cmd); ++void printDiskStatFreeInfo(const char* cmd); ++void printDiskStatPercent(const char* cmd); ++void printDiskStatPercentInfo(const char* cmd); ++ ++#endif diff --git a/x11/kde4-baseapps/files/patch-ksysguardd.c b/x11/kde4-baseapps/files/patch-ksysguardd.c new file mode 100644 index 000000000000..940aa4d327a5 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-ksysguardd.c @@ -0,0 +1,15 @@ +--- ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 02:01:46 1.5 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 06:16:15 1.6 +@@ -17,9 +17,11 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +- $Id: ksysguardd.c,v 1.2.6.1 2001/11/08 10:48:51 tokoe Exp $ ++ $Id: ksysguardd.c,v 1.6 2001/11/17 06:16:15 waba Exp $ + */ + ++#include <config.h> ++ + #include <ctype.h> + #include <fcntl.h> + #include <netdb.h> diff --git a/x11/kde4-baseapps/files/patch-ksysguardd.h b/x11/kde4-baseapps/files/patch-ksysguardd.h new file mode 100644 index 000000000000..1545b83d39d7 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-ksysguardd.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.h Mon Nov 19 17:07:38 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 1999-2001 Chris Schlaeger <cs@kde.org> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: ksysguardd.h,v 1.2 2001/11/08 10:52:55 tokoe Exp $ ++*/ ++ ++#ifndef _ksysguardd_h_ ++#define _ksysguardd_h_ ++ ++#include <stdio.h> ++ ++extern int QuitApp; ++extern int RunAsDaemon; ++extern FILE* CurrentClient; ++ ++void updateModules(void); ++void checkModules(void); ++ ++#endif diff --git a/x11/kde4-baseapps/files/patch-loadavg.c b/x11/kde4-baseapps/files/patch-loadavg.c new file mode 100644 index 000000000000..ced78fa5ad68 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-loadavg.c @@ -0,0 +1,100 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.c Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,97 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "loadavg.h" ++ ++static double LoadAvg[3]; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initLoadAvg(void) ++{ ++ if (updateLoadAvg() < 0) ++ return; ++ ++ registerMonitor("cpu/loadavg1", "float", printLoadAvg1, ++ printLoadAvg1Info); ++ registerMonitor("cpu/loadavg5", "float", printLoadAvg5, ++ printLoadAvg5Info); ++ registerMonitor("cpu/loadavg15", "float", printLoadAvg15, ++ printLoadAvg15Info); ++} ++ ++void ++exitLoadAvg(void) ++{ ++ removeMonitor("cpu/loadavg1"); ++ removeMonitor("cpu/loadavg5"); ++ removeMonitor("cpu/loadavg15"); ++} ++ ++int ++updateLoadAvg(void) ++{ ++ return getloadavg(LoadAvg, 3); ++} ++ ++void ++printLoadAvg1(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[0]); ++} ++ ++void ++printLoadAvg1Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 1 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg5(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[1]); ++} ++ ++void ++printLoadAvg5Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 5 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg15(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[2]); ++} ++ ++void ++printLoadAvg15Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 15 min\t0\t0\t\n"); ++} diff --git a/x11/kde4-baseapps/files/patch-loadavg.h b/x11/kde4-baseapps/files/patch-loadavg.h new file mode 100644 index 000000000000..cdc680cbd492 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-loadavg.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.h Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _loadavg_h_ ++#define _loadavg_h_ ++ ++void initLoadAvg(void); ++void exitLoadAvg(void); ++int updateLoadAvg(void); ++ ++void printLoadAvg1(const char*); ++void printLoadAvg1Info(const char*); ++void printLoadAvg5(const char*); ++void printLoadAvg5Info(const char*); ++void printLoadAvg15(const char*); ++void printLoadAvg15Info(const char*); ++ ++#endif diff --git a/x11/kde4-baseapps/files/patch-logfile.c b/x11/kde4-baseapps/files/patch-logfile.c new file mode 100644 index 000000000000..5fd3def1ae6b --- /dev/null +++ b/x11/kde4-baseapps/files/patch-logfile.c @@ -0,0 +1,184 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.c Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,181 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++#include "ksysguardd.h" ++#include "logfile.h" ++ ++static CONTAINER LogFiles = 0; ++static unsigned long counter = 1; ++ ++typedef struct { ++ char name[256]; ++ FILE* fh; ++ unsigned long id; ++} LogFileEntry; ++ ++extern CONTAINER LogFileList; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void initLogFile(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ registerCommand("logfile_register", registerLogFile); ++ registerCommand("logfile_unregister", unregisterLogFile); ++ registerCommand("logfile_registered", printRegistered); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) ++ { ++ FILE* fp; ++ ConfigLogFile *entry = get_ctnr(LogFileList, i); ++ /* register the log file if we can actually read the file. */ ++ if ((fp = fopen(entry->path, "r")) != NULL) ++ { ++ fclose(fp); ++ snprintf(monitor, 1024, "logfiles/%s", entry->name); ++ registerMonitor(monitor, "logfile", printLogFile, ++ printLogFileInfo); ++ } ++ } ++ ++ LogFiles = new_ctnr(CT_DLL); ++} ++ ++void exitLogFile(void) ++{ ++ if (LogFiles) ++ destr_ctnr(LogFiles, free); ++} ++ ++void printLogFile(const char* cmd) ++{ ++ char line[1024]; ++ unsigned long id; ++ int i; ++ char ch; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ while (fgets(line, sizeof(line), entry->fh) != NULL) { ++ fprintf(CurrentClient, "%s", line); ++ } ++ clearerr(entry->fh); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printLogFileInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "LogFile\n"); ++} ++ ++void registerLogFile(const char* cmd) ++{ ++ char name[256]; ++ FILE* file; ++ LogFileEntry *entry; ++ int i; ++ ++ memset(name, 0, sizeof(name)); ++ sscanf(cmd, "%*s %256s", name); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) { ++ ConfigLogFile *conf = get_ctnr(LogFileList, i); ++ if (!strcmp(conf->name, name)) { ++ if ((file = fopen(conf->path, "r")) == NULL) { ++ print_error("fopen()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ fseek(file, 0, SEEK_END); ++ ++ if ((entry = (LogFileEntry *)malloc(sizeof(LogFileEntry))) == NULL) { ++ print_error("malloc()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ entry->fh = file; ++ strncpy(entry->name, conf->name, 256); ++ entry->id = counter; ++ ++ push_ctnr(LogFiles, entry); ++ ++ fprintf(CurrentClient, "%lu\n", counter); ++ counter++; ++ ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "0\n"); ++} ++ ++void unregisterLogFile(const char* cmd) ++{ ++ unsigned long id; ++ int i; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ fclose(entry->fh); ++ free(remove_ctnr(LogFiles, i)); ++ fprintf(CurrentClient, "\n"); ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printRegistered(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ fprintf(CurrentClient, "%s:%lu\n", entry->name, entry->id); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} diff --git a/x11/kde4-baseapps/files/patch-logfile.h b/x11/kde4-baseapps/files/patch-logfile.h new file mode 100644 index 000000000000..69b8d6ed1ca6 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-logfile.h @@ -0,0 +1,40 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.h Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,37 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _logfile_h_ ++#define _logfile_h_ ++ ++void initLogFile(void); ++void exitLogFile(void); ++ ++void printLogFile(const char* cmd); ++void printLogFileInfo(const char* cmd); ++ ++void registerLogFile(const char* cmd); ++void unregisterLogFile(const char* cmd); ++ ++/* debug command */ ++void printRegistered(const char* cmd); ++ ++#endif diff --git a/x11/kde4-baseapps/files/patch-netdev.c b/x11/kde4-baseapps/files/patch-netdev.c new file mode 100644 index 000000000000..2c0f473ebbcf --- /dev/null +++ b/x11/kde4-baseapps/files/patch-netdev.c @@ -0,0 +1,322 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.c Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,319 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <sys/socket.h> ++#include <net/if.h> ++#include <net/if_mib.h> ++#include <stdio.h> ++#include <string.h> ++#include <sys/sysctl.h> ++#include <sys/time.h> ++#include <sys/types.h> ++#include <unistd.h> ++ ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "netdev.h" ++ ++ ++typedef struct { ++ char name[32]; ++ u_long recBytes; ++ u_long recPacks; ++ u_long recErrs; ++ u_long recDrop; ++ u_long recMulticast; ++ u_long sentBytes; ++ u_long sentPacks; ++ u_long sentErrs; ++ u_long sentMulticast; ++ u_long sentColls; ++} NetDevInfo; ++ ++#define MAXNETDEVS 64 ++static NetDevInfo NetDevs[MAXNETDEVS]; ++static int NetDevCnt = 0; ++ ++char **parseCommand(const char *cmd) ++{ ++ char tmp_cmd[1024]; ++ char *begin; ++ static char sensor[100]; ++ static char interface[100]; ++ static char* retval[2]; ++ ++ strncpy(tmp_cmd, cmd, 1024); ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin++; ++ strcpy(sensor, begin); ++ retval[1] = sensor; ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin = rindex(tmp_cmd, '/'); ++ begin++; ++ strcpy(interface, begin); ++ retval[0] = interface; ++ ++ return retval; ++} ++ ++int numActivIfaces(void) ++{ ++ int counter = 0; ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) ++ counter++; ++ } ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ updateNetDev(); ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ } ++} ++ ++void exitNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ removeMonitor(monitor); ++ } ++} ++ ++void updateNetDev(void) ++{ ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ NetDevCnt = 0; ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) { ++ strncpy(NetDevs[NetDevCnt].name, ifmd.ifmd_name, 32); ++ NetDevs[NetDevCnt].recBytes = ifmd.ifmd_data.ifi_ibytes - NetDevs[NetDevCnt].recBytes; ++ NetDevs[NetDevCnt].recPacks = ifmd.ifmd_data.ifi_ipackets - NetDevs[NetDevCnt].recPacks; ++ NetDevs[NetDevCnt].recErrs = ifmd.ifmd_data.ifi_ierrors - NetDevs[NetDevCnt].recErrs; ++ NetDevs[NetDevCnt].recDrop = ifmd.ifmd_data.ifi_iqdrops - NetDevs[NetDevCnt].recDrop; ++ NetDevs[NetDevCnt].recMulticast = ifmd.ifmd_data.ifi_imcasts - NetDevs[NetDevCnt].recMulticast; ++ NetDevs[NetDevCnt].sentBytes = ifmd.ifmd_data.ifi_obytes - NetDevs[NetDevCnt].sentBytes; ++ NetDevs[NetDevCnt].sentPacks = ifmd.ifmd_data.ifi_opackets - NetDevs[NetDevCnt].sentPacks; ++ NetDevs[NetDevCnt].sentErrs = ifmd.ifmd_data.ifi_oerrors - NetDevs[NetDevCnt].sentErrs; ++ NetDevs[NetDevCnt].sentMulticast = ifmd.ifmd_data.ifi_omcasts - NetDevs[NetDevCnt].sentMulticast; ++ NetDevs[NetDevCnt].sentColls = ifmd.ifmd_data.ifi_collisions - NetDevs[NetDevCnt].sentColls; ++ NetDevCnt++; ++ } ++ } ++} ++ ++void checkNetDev(void) ++{ ++ if (numActivIfaces() != NetDevCnt) { ++ /* interface has been added or removed ++ so we do a reset */ ++ exitNetDev(); ++ initNetDev(); ++ } ++} ++ ++void printNetDevRecBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recErrs); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recDrop); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recMulticast); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevRecBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Received Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Received Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Receiver Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "Receiver Drops\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Received Multicast Packets\t0\t0\t1/s\n"); ++} ++ ++void printNetDevSentBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentErrs); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentMulticast); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentColls); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevSentBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Sent Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Sent Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Transmitter Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Sent Multicast Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "Transmitter Collisions\t0\t0\t1/s\n"); ++} diff --git a/x11/kde4-baseapps/files/patch-netdev.h b/x11/kde4-baseapps/files/patch-netdev.h new file mode 100644 index 000000000000..3c291f85dc9e --- /dev/null +++ b/x11/kde4-baseapps/files/patch-netdev.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.h Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _netdev_h_ ++#define _netdev_h_ ++ ++void initNetDev(void); ++void exitNetDev(void); ++ ++void updateNetDev(void); ++void checkNetDev(void); ++ ++void printNetDevRecBytes(const char* cmd); ++void printNetDevRecBytesInfo(const char* cmd); ++void printNetDevSentBytes(const char* cmd); ++void printNetDevSentBytesInfo(const char* cmd); ++ ++#endif diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index 5466b74bfbc6..3b9d7855dd8d 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -229,7 +229,6 @@ lib/kde2/libkcm_kwinoptions.la lib/kde2/libkcm_kwinoptions.so lib/kde2/libkcm_launch.la lib/kde2/libkcm_launch.so -lib/kde2/libkcm_launch.so.0 lib/kde2/libkcm_locale.la lib/kde2/libkcm_locale.so lib/kde2/libkcm_midi.la @@ -277,7 +276,6 @@ lib/kde2/libkonqsidebartree_dirtree.la lib/kde2/libkonqsidebartree_dirtree.so lib/kde2/libkonqsidebartree_history.la lib/kde2/libkonqsidebartree_history.so -lib/kde2/libkonqsidebartree_history.so.0 lib/kde2/libkonqsound.la lib/kde2/libkonqsound.so lib/kde2/libkonqtree.la @@ -1146,9 +1144,6 @@ share/apps/konsole/konsole_part.rc share/apps/konsole/linux.desktop share/apps/konsole/linux.keytab share/apps/konsole/mc.desktop -share/apps/konsole/pics/brightness.png -share/apps/konsole/pics/colourness.png -share/apps/konsole/pics/contrast.png share/apps/konsole/shell.desktop share/apps/konsole/su.desktop share/apps/konsole/sumc.desktop @@ -1284,8 +1279,14 @@ share/config/imsmaprc share/config/interferencerc share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 +share/config/kdm/Xaccess +share/config/kdm/Xreset +share/config/kdm/Xservers +share/config/kdm/Xsession +share/config/kdm/Xsetup +share/config/kdm/Xstartup +share/config/kdm/Xwilling share/config/kdm/kdmrc -share/config/kdm/README share/config/klipperrc share/config/konqsidebartng.rc share/config/konsolerc @@ -2158,6 +2159,8 @@ share/locale/l10n/hr/entry.desktop share/locale/l10n/hr/flag.png share/locale/l10n/hu/entry.desktop share/locale/l10n/hu/flag.png +share/locale/l10n/id/entry.desktop +share/locale/l10n/id/flag.png share/locale/l10n/ie/entry.desktop share/locale/l10n/ie/flag.png share/locale/l10n/il/entry.desktop @@ -2426,18 +2429,12 @@ share/wallpapers/simple_wallpaper.jpg share/wallpapers/sunday_brunch.jpg share/wallpapers/vegetative_fog.jpg @dirrm share/wallpapers -@exec mkdir %D/share/templates/.source/emptydir -@exec chmod 644 %D/share/templates/.source/emptydir -@unexec rmdir %D/share/templates/.source/emptydir +@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds -@dirrm share/servicetypes @dirrm share/services/useragentstrings @dirrm share/services/searchproviders -@dirrm share/services/kded -@dirrm share/services -@dirrm share/mimelnk/application @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ve @dirrm share/locale/l10n/vc @@ -2479,6 +2476,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/is @dirrm share/locale/l10n/il @dirrm share/locale/l10n/ie +@dirrm share/locale/l10n/id @dirrm share/locale/l10n/hu @dirrm share/locale/l10n/hr @dirrm share/locale/l10n/hn @@ -2512,22 +2510,13 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/ag @dirrm share/locale/l10n/C @dirrm share/locale/l10n -@dirrm share/locale/C -@dirrm share/locale @dirrm share/icons/locolor/32x32/apps @dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/filesystems @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32/actions -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/16x16/filesystems -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @@ -2552,9 +2541,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook -@dirrm share/doc/HTML/en @dirrm share/config/kdm -@dirrm share/config @dirrm share/autostart @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2572,7 +2559,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer -@dirrm share/apps/konsole/pics @dirrm share/apps/konsole @dirrm share/apps/konqueror/tiles @dirrm share/apps/konqueror/profiles @@ -2658,7 +2644,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol -@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2755,6 +2740,5 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/applnk/Applications @dirrm share/applnk/.hidden @dirrm share/applnk -@dirrm lib/kde2 @dirrm include/kwin @dirrm include/kate diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index ee69d6cb95bb..f8e6c70e010f 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -6,8 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2.2 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -15,6 +14,9 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -27,8 +29,13 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --without-ldap \ - --disable-closure + --without-ldap --disable-closure --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes .include <bsd.port.pre.mk> @@ -56,6 +63,15 @@ post-extract: @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/libkonq/Makefile.in ${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index f0d9e99b49aa..251c4afefe28 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1 +1 @@ -MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a +MD5 (KDE/kdebase-2.2.2.tar.bz2) = 39635e42056ab2afb8e6f2ff761eea38 diff --git a/x11/kde4-runtime/files/patch-apm.c b/x11/kde4-runtime/files/patch-apm.c new file mode 100644 index 000000000000..08925da1dee5 --- /dev/null +++ b/x11/kde4-runtime/files/patch-apm.c @@ -0,0 +1,101 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.c Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,98 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <machine/apm_bios.h> ++#include <stdio.h> ++ ++#include "Command.h" ++#include "apm.h" ++#include "ksysguardd.h" ++ ++static int ApmFD, BattFill, BattTime; ++ ++#define APMDEV "/dev/apm" ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initApm(void) ++{ ++ if ((ApmFD = open(APMDEV, O_RDONLY)) < 0) ++ return; ++ ++ if (updateApm() < 0) ++ return; ++ ++ registerMonitor("apm/batterycharge", "integer", printApmBatFill, ++ printApmBatFillInfo); ++ registerMonitor("apm/remainingtime", "integer", printApmBatTime, ++ printApmBatTimeInfo); ++} ++ ++void ++exitApm(void) ++{ ++ removeMonitor("apm/batterycharge"); ++ removeMonitor("apm/remainingtime"); ++ ++ close(ApmFD); ++} ++ ++int ++updateApm(void) ++{ ++ struct apm_info info; ++ int retval; ++ ++ retval = ioctl(ApmFD, APMIO_GETINFO, &info); ++ ++ BattFill = info.ai_batt_life; ++ BattTime = info.ai_batt_time; ++ ++ return retval; ++} ++ ++void ++printApmBatFill(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattFill); ++} ++ ++void ++printApmBatFillInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Battery charge\t0\t100\t%%\n"); ++} ++ ++void ++printApmBatTime(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattTime); ++} ++ ++void ++printApmBatTimeInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); ++} diff --git a/x11/kde4-runtime/files/patch-apm.h b/x11/kde4-runtime/files/patch-apm.h new file mode 100644 index 000000000000..73e509bdd61b --- /dev/null +++ b/x11/kde4-runtime/files/patch-apm.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.h Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _apm_h_ ++#define _apm_h_ ++ ++void initApm(void); ++void exitApm(void); ++int updateApm(void); ++ ++void printApmBatFill(const char*); ++void printApmBatFillInfo(const char*); ++void printApmBatTime(const char*); ++void printApmBatTimeInfo(const char*); ++ ++#endif diff --git a/x11/kde4-runtime/files/patch-conf.c b/x11/kde4-runtime/files/patch-conf.c new file mode 100644 index 000000000000..a4de97379b10 --- /dev/null +++ b/x11/kde4-runtime/files/patch-conf.c @@ -0,0 +1,136 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.c Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,133 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.c,v 1.3 2001/11/05 23:24:19 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++ ++CONTAINER LogFileList = 0; ++CONTAINER SensorList = 0; ++ ++void parseConfigFile(const char *filename) ++{ ++ FILE* config; ++ char line[2048]; ++ char *begin, *token, *tmp, *confSensor; ++ ConfigLogFile *confLog; ++ ++ ++ if (LogFileList) ++ destr_ctnr(LogFileList, free); ++ ++ if (SensorList) ++ destr_ctnr(SensorList, free); ++ ++ LogFileList = new_ctnr(CT_DLL); ++ SensorList = new_ctnr(CT_DLL); ++ ++ if ((config = fopen(filename, "r")) == NULL) { ++ log_error("can't open config file '%s'", filename); ++ ++ /* if we can't open a config file we have to add the ++ available sensors manually ++ */ ++ ++ confSensor = strdup("ProcessList"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Memory"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Stat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetDev"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("CpuInfo"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LoadAvg"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("DiskStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LogFile"); ++ push_ctnr(SensorList, confSensor); ++ ++ return; ++ } ++ ++ while (fgets(line, sizeof(line), config) != NULL) { ++ if ((line[0] == '#') || (strlen(line) == 0)) { ++ continue; ++ } ++ ++ if (strchr(line, '#')) ++ *(strchr(line, '#')) = '\0'; ++ ++ if (line[strlen(line) - 1] == '\n') ++ line[strlen(line) - 1] = '\0'; ++ ++ if (!strncmp(line, "LogFiles", 8)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ if ((confLog = (ConfigLogFile *)malloc(sizeof(ConfigLogFile))) == NULL) { ++ log_error("malloc() no free memory avail"); ++ continue; ++ } ++ confLog->name = strdup(token); ++ tmp = strchr(confLog->name, ':'); ++ *tmp = '\0'; ++ confLog->path = tmp; ++ confLog->path++; ++ ++ push_ctnr(LogFileList, confLog); ++ } ++ } ++ if (!strncmp(line, "Sensors", 7)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ confSensor = strdup(token); ++ push_ctnr(SensorList, confSensor); ++ } ++ } ++ } ++ ++ fclose(config); ++} ++ ++int sensorAvailable(const char *sensor) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(SensorList); i++) { ++ char* name = get_ctnr(SensorList, i); ++ if (!strcmp(name, sensor)) ++ return 1; ++ } ++ ++ return 0; ++} diff --git a/x11/kde4-runtime/files/patch-conf.h b/x11/kde4-runtime/files/patch-conf.h new file mode 100644 index 000000000000..8aba2e520205 --- /dev/null +++ b/x11/kde4-runtime/files/patch-conf.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.h Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _conf_h_ ++#define _conf_h_ ++ ++typedef struct { ++ char *name; ++ char *path; ++} ConfigLogFile; ++ ++void parseConfigFile(const char *filename); ++ ++int sensorAvailable(const char* sensor); ++ ++#endif diff --git a/x11/kde4-runtime/files/patch-diskstat.c b/x11/kde4-runtime/files/patch-diskstat.c new file mode 100644 index 000000000000..5535e580a673 --- /dev/null +++ b/x11/kde4-runtime/files/patch-diskstat.c @@ -0,0 +1,260 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.c Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,257 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/param.h> ++#include <sys/stat.h> ++#include <sys/ucred.h> ++#include <sys/mount.h> ++#include <time.h> ++#include <unistd.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "diskstat.h" ++#include "ksysguardd.h" ++ ++typedef struct { ++ char device[256]; ++ char mntpnt[256]; ++ long blocks; ++ long bfree; ++ long bused; ++ int bused_percent; ++} DiskInfo; ++ ++static CONTAINER DiskStatList = 0; ++ ++char *getMntPnt(const char *cmd) ++{ ++ static char device[1024]; ++ char *ptr; ++ ++ memset(device, 0, sizeof(device)); ++ sscanf(cmd, "partitions%1024s", device); ++ ++ ptr = (char *)rindex(device, '/'); ++ *ptr = '\0'; ++ ++ return (char *)device; ++} ++ ++int numMntPnt(void) ++{ ++ struct statfs *fs_info; ++ int i, n, counter = 0; ++ ++ n = getmntinfo(&fs_info, MNT_WAIT); ++ for (i = 0; i < n; i++) ++ if (strcmp(fs_info[i].f_fstypename, "procfs") && strcmp(fs_info[i].f_fstypename, "swap") && strcmp(fs_info[i].f_fstypename, "devfs")) ++ counter++; ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initDiskStat(void) ++{ ++ char monitor[1024]; ++ int i; ++ ++ DiskStatList = new_ctnr(CT_DLL); ++ ++ updateDiskStat(); ++ ++ registerMonitor("partitions/list", "listview", printDiskStat, printDiskStatInfo); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatUsed, printDiskStatUsedInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatFree, printDiskStatFreeInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatPercent, printDiskStatPercentInfo); ++ } ++} ++ ++void checkDiskStat(void) ++{ ++ if (numMntPnt() != level_ctnr(DiskStatList)) { ++ /* a filesystem was mounted or unmounted ++ so we do a reset */ ++ exitDiskStat(); ++ initDiskStat(); ++ } ++} ++ ++void exitDiskStat(void) ++{ ++ DiskInfo *disk_info; ++ char monitor[1024]; ++ int i; ++ ++ removeMonitor("partitions/list"); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ disk_info = remove_ctnr(DiskStatList, i--); ++ ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ removeMonitor(monitor); ++ ++ free(disk_info); ++ } ++ ++ if (DiskStatList) ++ destr_ctnr(DiskStatList, free); ++} ++ ++int updateDiskStat(void) ++{ ++ struct statfs *fs_info; ++ struct statfs fs; ++ float percent; ++ int i, mntcount; ++ DiskInfo *disk_info; ++ ++ /* let's hope there is no difference between the DiskStatList and ++ the number of mounted filesystems */ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) ++ free(remove_ctnr(DiskStatList, i--)); ++ ++ mntcount = getmntinfo(&fs_info, MNT_WAIT); ++ ++ for (i = 0; i < mntcount; i++) { ++ fs = fs_info[i]; ++ if (strcmp(fs.f_fstypename, "procfs") && strcmp(fs.f_fstypename, "devfs") && strcmp(fs.f_fstypename, "devfs")) { ++ percent = (((float)fs.f_blocks - (float)fs.f_bfree)/(float)fs.f_blocks); ++ percent = percent * 100; ++ if ((disk_info = (DiskInfo *)malloc(sizeof(DiskInfo))) == NULL) { ++ continue; ++ } ++ memset(disk_info, 0, sizeof(DiskInfo)); ++ strncpy(disk_info->device, fs.f_mntfromname, 255); ++ if (!strcmp(fs.f_mntonname, "/")) { ++ strncpy(disk_info->mntpnt, "/root", 6); ++ } else { ++ strncpy(disk_info->mntpnt, fs.f_mntonname, 255); ++ } ++ disk_info->blocks = fs.f_blocks; ++ disk_info->bfree = fs.f_bfree; ++ disk_info->bused = (fs.f_blocks - fs.f_bfree); ++ disk_info->bused_percent = (int)percent; ++ ++ push_ctnr(DiskStatList, disk_info); ++ } ++ } ++ ++ return 0; ++} ++ ++void printDiskStat(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%d\t%s\n", ++ disk_info->device, ++ disk_info->blocks, ++ disk_info->bused, ++ disk_info->bfree, ++ disk_info->bused_percent, ++ disk_info->mntpnt); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Device\tBlocks\tUsed\tAvailable\tUsed %%\tMountPoint\n"); ++} ++ ++void printDiskStatUsed(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bused); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatUsedInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatFree(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bfree); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatFreeInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Free Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatPercent(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%d\n", disk_info->bused_percent); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatPercentInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t100\t%%\n"); ++} diff --git a/x11/kde4-runtime/files/patch-diskstat.h b/x11/kde4-runtime/files/patch-diskstat.h new file mode 100644 index 000000000000..3b5bf11b89c7 --- /dev/null +++ b/x11/kde4-runtime/files/patch-diskstat.h @@ -0,0 +1,44 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.h Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,41 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _diskstat_h_ ++#define _diskstat_h_ ++ ++void initDiskStat(void); ++void exitDiskStat(void); ++ ++int updateDiskStat(void); ++void checkDiskStat(void); ++ ++void printDiskStat(const char* cmd); ++void printDiskStatInfo(const char* cmd); ++ ++void printDiskStatUsed(const char* cmd); ++void printDiskStatUsedInfo(const char* cmd); ++void printDiskStatFree(const char* cmd); ++void printDiskStatFreeInfo(const char* cmd); ++void printDiskStatPercent(const char* cmd); ++void printDiskStatPercentInfo(const char* cmd); ++ ++#endif diff --git a/x11/kde4-runtime/files/patch-ksysguardd.c b/x11/kde4-runtime/files/patch-ksysguardd.c new file mode 100644 index 000000000000..940aa4d327a5 --- /dev/null +++ b/x11/kde4-runtime/files/patch-ksysguardd.c @@ -0,0 +1,15 @@ +--- ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 02:01:46 1.5 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 06:16:15 1.6 +@@ -17,9 +17,11 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +- $Id: ksysguardd.c,v 1.2.6.1 2001/11/08 10:48:51 tokoe Exp $ ++ $Id: ksysguardd.c,v 1.6 2001/11/17 06:16:15 waba Exp $ + */ + ++#include <config.h> ++ + #include <ctype.h> + #include <fcntl.h> + #include <netdb.h> diff --git a/x11/kde4-runtime/files/patch-ksysguardd.h b/x11/kde4-runtime/files/patch-ksysguardd.h new file mode 100644 index 000000000000..1545b83d39d7 --- /dev/null +++ b/x11/kde4-runtime/files/patch-ksysguardd.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.h Mon Nov 19 17:07:38 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 1999-2001 Chris Schlaeger <cs@kde.org> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: ksysguardd.h,v 1.2 2001/11/08 10:52:55 tokoe Exp $ ++*/ ++ ++#ifndef _ksysguardd_h_ ++#define _ksysguardd_h_ ++ ++#include <stdio.h> ++ ++extern int QuitApp; ++extern int RunAsDaemon; ++extern FILE* CurrentClient; ++ ++void updateModules(void); ++void checkModules(void); ++ ++#endif diff --git a/x11/kde4-runtime/files/patch-loadavg.c b/x11/kde4-runtime/files/patch-loadavg.c new file mode 100644 index 000000000000..ced78fa5ad68 --- /dev/null +++ b/x11/kde4-runtime/files/patch-loadavg.c @@ -0,0 +1,100 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.c Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,97 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "loadavg.h" ++ ++static double LoadAvg[3]; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initLoadAvg(void) ++{ ++ if (updateLoadAvg() < 0) ++ return; ++ ++ registerMonitor("cpu/loadavg1", "float", printLoadAvg1, ++ printLoadAvg1Info); ++ registerMonitor("cpu/loadavg5", "float", printLoadAvg5, ++ printLoadAvg5Info); ++ registerMonitor("cpu/loadavg15", "float", printLoadAvg15, ++ printLoadAvg15Info); ++} ++ ++void ++exitLoadAvg(void) ++{ ++ removeMonitor("cpu/loadavg1"); ++ removeMonitor("cpu/loadavg5"); ++ removeMonitor("cpu/loadavg15"); ++} ++ ++int ++updateLoadAvg(void) ++{ ++ return getloadavg(LoadAvg, 3); ++} ++ ++void ++printLoadAvg1(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[0]); ++} ++ ++void ++printLoadAvg1Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 1 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg5(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[1]); ++} ++ ++void ++printLoadAvg5Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 5 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg15(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[2]); ++} ++ ++void ++printLoadAvg15Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 15 min\t0\t0\t\n"); ++} diff --git a/x11/kde4-runtime/files/patch-loadavg.h b/x11/kde4-runtime/files/patch-loadavg.h new file mode 100644 index 000000000000..cdc680cbd492 --- /dev/null +++ b/x11/kde4-runtime/files/patch-loadavg.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.h Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _loadavg_h_ ++#define _loadavg_h_ ++ ++void initLoadAvg(void); ++void exitLoadAvg(void); ++int updateLoadAvg(void); ++ ++void printLoadAvg1(const char*); ++void printLoadAvg1Info(const char*); ++void printLoadAvg5(const char*); ++void printLoadAvg5Info(const char*); ++void printLoadAvg15(const char*); ++void printLoadAvg15Info(const char*); ++ ++#endif diff --git a/x11/kde4-runtime/files/patch-logfile.c b/x11/kde4-runtime/files/patch-logfile.c new file mode 100644 index 000000000000..5fd3def1ae6b --- /dev/null +++ b/x11/kde4-runtime/files/patch-logfile.c @@ -0,0 +1,184 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.c Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,181 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++#include "ksysguardd.h" ++#include "logfile.h" ++ ++static CONTAINER LogFiles = 0; ++static unsigned long counter = 1; ++ ++typedef struct { ++ char name[256]; ++ FILE* fh; ++ unsigned long id; ++} LogFileEntry; ++ ++extern CONTAINER LogFileList; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void initLogFile(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ registerCommand("logfile_register", registerLogFile); ++ registerCommand("logfile_unregister", unregisterLogFile); ++ registerCommand("logfile_registered", printRegistered); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) ++ { ++ FILE* fp; ++ ConfigLogFile *entry = get_ctnr(LogFileList, i); ++ /* register the log file if we can actually read the file. */ ++ if ((fp = fopen(entry->path, "r")) != NULL) ++ { ++ fclose(fp); ++ snprintf(monitor, 1024, "logfiles/%s", entry->name); ++ registerMonitor(monitor, "logfile", printLogFile, ++ printLogFileInfo); ++ } ++ } ++ ++ LogFiles = new_ctnr(CT_DLL); ++} ++ ++void exitLogFile(void) ++{ ++ if (LogFiles) ++ destr_ctnr(LogFiles, free); ++} ++ ++void printLogFile(const char* cmd) ++{ ++ char line[1024]; ++ unsigned long id; ++ int i; ++ char ch; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ while (fgets(line, sizeof(line), entry->fh) != NULL) { ++ fprintf(CurrentClient, "%s", line); ++ } ++ clearerr(entry->fh); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printLogFileInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "LogFile\n"); ++} ++ ++void registerLogFile(const char* cmd) ++{ ++ char name[256]; ++ FILE* file; ++ LogFileEntry *entry; ++ int i; ++ ++ memset(name, 0, sizeof(name)); ++ sscanf(cmd, "%*s %256s", name); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) { ++ ConfigLogFile *conf = get_ctnr(LogFileList, i); ++ if (!strcmp(conf->name, name)) { ++ if ((file = fopen(conf->path, "r")) == NULL) { ++ print_error("fopen()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ fseek(file, 0, SEEK_END); ++ ++ if ((entry = (LogFileEntry *)malloc(sizeof(LogFileEntry))) == NULL) { ++ print_error("malloc()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ entry->fh = file; ++ strncpy(entry->name, conf->name, 256); ++ entry->id = counter; ++ ++ push_ctnr(LogFiles, entry); ++ ++ fprintf(CurrentClient, "%lu\n", counter); ++ counter++; ++ ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "0\n"); ++} ++ ++void unregisterLogFile(const char* cmd) ++{ ++ unsigned long id; ++ int i; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ fclose(entry->fh); ++ free(remove_ctnr(LogFiles, i)); ++ fprintf(CurrentClient, "\n"); ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printRegistered(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ fprintf(CurrentClient, "%s:%lu\n", entry->name, entry->id); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} diff --git a/x11/kde4-runtime/files/patch-logfile.h b/x11/kde4-runtime/files/patch-logfile.h new file mode 100644 index 000000000000..69b8d6ed1ca6 --- /dev/null +++ b/x11/kde4-runtime/files/patch-logfile.h @@ -0,0 +1,40 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.h Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,37 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _logfile_h_ ++#define _logfile_h_ ++ ++void initLogFile(void); ++void exitLogFile(void); ++ ++void printLogFile(const char* cmd); ++void printLogFileInfo(const char* cmd); ++ ++void registerLogFile(const char* cmd); ++void unregisterLogFile(const char* cmd); ++ ++/* debug command */ ++void printRegistered(const char* cmd); ++ ++#endif diff --git a/x11/kde4-runtime/files/patch-netdev.c b/x11/kde4-runtime/files/patch-netdev.c new file mode 100644 index 000000000000..2c0f473ebbcf --- /dev/null +++ b/x11/kde4-runtime/files/patch-netdev.c @@ -0,0 +1,322 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.c Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,319 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <sys/socket.h> ++#include <net/if.h> ++#include <net/if_mib.h> ++#include <stdio.h> ++#include <string.h> ++#include <sys/sysctl.h> ++#include <sys/time.h> ++#include <sys/types.h> ++#include <unistd.h> ++ ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "netdev.h" ++ ++ ++typedef struct { ++ char name[32]; ++ u_long recBytes; ++ u_long recPacks; ++ u_long recErrs; ++ u_long recDrop; ++ u_long recMulticast; ++ u_long sentBytes; ++ u_long sentPacks; ++ u_long sentErrs; ++ u_long sentMulticast; ++ u_long sentColls; ++} NetDevInfo; ++ ++#define MAXNETDEVS 64 ++static NetDevInfo NetDevs[MAXNETDEVS]; ++static int NetDevCnt = 0; ++ ++char **parseCommand(const char *cmd) ++{ ++ char tmp_cmd[1024]; ++ char *begin; ++ static char sensor[100]; ++ static char interface[100]; ++ static char* retval[2]; ++ ++ strncpy(tmp_cmd, cmd, 1024); ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin++; ++ strcpy(sensor, begin); ++ retval[1] = sensor; ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin = rindex(tmp_cmd, '/'); ++ begin++; ++ strcpy(interface, begin); ++ retval[0] = interface; ++ ++ return retval; ++} ++ ++int numActivIfaces(void) ++{ ++ int counter = 0; ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) ++ counter++; ++ } ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ updateNetDev(); ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ } ++} ++ ++void exitNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ removeMonitor(monitor); ++ } ++} ++ ++void updateNetDev(void) ++{ ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ NetDevCnt = 0; ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) { ++ strncpy(NetDevs[NetDevCnt].name, ifmd.ifmd_name, 32); ++ NetDevs[NetDevCnt].recBytes = ifmd.ifmd_data.ifi_ibytes - NetDevs[NetDevCnt].recBytes; ++ NetDevs[NetDevCnt].recPacks = ifmd.ifmd_data.ifi_ipackets - NetDevs[NetDevCnt].recPacks; ++ NetDevs[NetDevCnt].recErrs = ifmd.ifmd_data.ifi_ierrors - NetDevs[NetDevCnt].recErrs; ++ NetDevs[NetDevCnt].recDrop = ifmd.ifmd_data.ifi_iqdrops - NetDevs[NetDevCnt].recDrop; ++ NetDevs[NetDevCnt].recMulticast = ifmd.ifmd_data.ifi_imcasts - NetDevs[NetDevCnt].recMulticast; ++ NetDevs[NetDevCnt].sentBytes = ifmd.ifmd_data.ifi_obytes - NetDevs[NetDevCnt].sentBytes; ++ NetDevs[NetDevCnt].sentPacks = ifmd.ifmd_data.ifi_opackets - NetDevs[NetDevCnt].sentPacks; ++ NetDevs[NetDevCnt].sentErrs = ifmd.ifmd_data.ifi_oerrors - NetDevs[NetDevCnt].sentErrs; ++ NetDevs[NetDevCnt].sentMulticast = ifmd.ifmd_data.ifi_omcasts - NetDevs[NetDevCnt].sentMulticast; ++ NetDevs[NetDevCnt].sentColls = ifmd.ifmd_data.ifi_collisions - NetDevs[NetDevCnt].sentColls; ++ NetDevCnt++; ++ } ++ } ++} ++ ++void checkNetDev(void) ++{ ++ if (numActivIfaces() != NetDevCnt) { ++ /* interface has been added or removed ++ so we do a reset */ ++ exitNetDev(); ++ initNetDev(); ++ } ++} ++ ++void printNetDevRecBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recErrs); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recDrop); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recMulticast); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevRecBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Received Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Received Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Receiver Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "Receiver Drops\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Received Multicast Packets\t0\t0\t1/s\n"); ++} ++ ++void printNetDevSentBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentErrs); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentMulticast); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentColls); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevSentBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Sent Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Sent Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Transmitter Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Sent Multicast Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "Transmitter Collisions\t0\t0\t1/s\n"); ++} diff --git a/x11/kde4-runtime/files/patch-netdev.h b/x11/kde4-runtime/files/patch-netdev.h new file mode 100644 index 000000000000..3c291f85dc9e --- /dev/null +++ b/x11/kde4-runtime/files/patch-netdev.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.h Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _netdev_h_ ++#define _netdev_h_ ++ ++void initNetDev(void); ++void exitNetDev(void); ++ ++void updateNetDev(void); ++void checkNetDev(void); ++ ++void printNetDevRecBytes(const char* cmd); ++void printNetDevRecBytesInfo(const char* cmd); ++void printNetDevSentBytes(const char* cmd); ++void printNetDevSentBytesInfo(const char* cmd); ++ ++#endif diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index 5466b74bfbc6..3b9d7855dd8d 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -229,7 +229,6 @@ lib/kde2/libkcm_kwinoptions.la lib/kde2/libkcm_kwinoptions.so lib/kde2/libkcm_launch.la lib/kde2/libkcm_launch.so -lib/kde2/libkcm_launch.so.0 lib/kde2/libkcm_locale.la lib/kde2/libkcm_locale.so lib/kde2/libkcm_midi.la @@ -277,7 +276,6 @@ lib/kde2/libkonqsidebartree_dirtree.la lib/kde2/libkonqsidebartree_dirtree.so lib/kde2/libkonqsidebartree_history.la lib/kde2/libkonqsidebartree_history.so -lib/kde2/libkonqsidebartree_history.so.0 lib/kde2/libkonqsound.la lib/kde2/libkonqsound.so lib/kde2/libkonqtree.la @@ -1146,9 +1144,6 @@ share/apps/konsole/konsole_part.rc share/apps/konsole/linux.desktop share/apps/konsole/linux.keytab share/apps/konsole/mc.desktop -share/apps/konsole/pics/brightness.png -share/apps/konsole/pics/colourness.png -share/apps/konsole/pics/contrast.png share/apps/konsole/shell.desktop share/apps/konsole/su.desktop share/apps/konsole/sumc.desktop @@ -1284,8 +1279,14 @@ share/config/imsmaprc share/config/interferencerc share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 +share/config/kdm/Xaccess +share/config/kdm/Xreset +share/config/kdm/Xservers +share/config/kdm/Xsession +share/config/kdm/Xsetup +share/config/kdm/Xstartup +share/config/kdm/Xwilling share/config/kdm/kdmrc -share/config/kdm/README share/config/klipperrc share/config/konqsidebartng.rc share/config/konsolerc @@ -2158,6 +2159,8 @@ share/locale/l10n/hr/entry.desktop share/locale/l10n/hr/flag.png share/locale/l10n/hu/entry.desktop share/locale/l10n/hu/flag.png +share/locale/l10n/id/entry.desktop +share/locale/l10n/id/flag.png share/locale/l10n/ie/entry.desktop share/locale/l10n/ie/flag.png share/locale/l10n/il/entry.desktop @@ -2426,18 +2429,12 @@ share/wallpapers/simple_wallpaper.jpg share/wallpapers/sunday_brunch.jpg share/wallpapers/vegetative_fog.jpg @dirrm share/wallpapers -@exec mkdir %D/share/templates/.source/emptydir -@exec chmod 644 %D/share/templates/.source/emptydir -@unexec rmdir %D/share/templates/.source/emptydir +@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds -@dirrm share/servicetypes @dirrm share/services/useragentstrings @dirrm share/services/searchproviders -@dirrm share/services/kded -@dirrm share/services -@dirrm share/mimelnk/application @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ve @dirrm share/locale/l10n/vc @@ -2479,6 +2476,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/is @dirrm share/locale/l10n/il @dirrm share/locale/l10n/ie +@dirrm share/locale/l10n/id @dirrm share/locale/l10n/hu @dirrm share/locale/l10n/hr @dirrm share/locale/l10n/hn @@ -2512,22 +2510,13 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/ag @dirrm share/locale/l10n/C @dirrm share/locale/l10n -@dirrm share/locale/C -@dirrm share/locale @dirrm share/icons/locolor/32x32/apps @dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/filesystems @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32/actions -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/16x16/filesystems -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @@ -2552,9 +2541,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook -@dirrm share/doc/HTML/en @dirrm share/config/kdm -@dirrm share/config @dirrm share/autostart @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2572,7 +2559,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer -@dirrm share/apps/konsole/pics @dirrm share/apps/konsole @dirrm share/apps/konqueror/tiles @dirrm share/apps/konqueror/profiles @@ -2658,7 +2644,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol -@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2755,6 +2740,5 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/applnk/Applications @dirrm share/applnk/.hidden @dirrm share/applnk -@dirrm lib/kde2 @dirrm include/kwin @dirrm include/kate diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index ee69d6cb95bb..f8e6c70e010f 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -6,8 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2.2 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -15,6 +14,9 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -27,8 +29,13 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --without-ldap \ - --disable-closure + --without-ldap --disable-closure --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes .include <bsd.port.pre.mk> @@ -56,6 +63,15 @@ post-extract: @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/libkonq/Makefile.in ${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index f0d9e99b49aa..251c4afefe28 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1 +1 @@ -MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a +MD5 (KDE/kdebase-2.2.2.tar.bz2) = 39635e42056ab2afb8e6f2ff761eea38 diff --git a/x11/kde4-workspace/files/patch-apm.c b/x11/kde4-workspace/files/patch-apm.c new file mode 100644 index 000000000000..08925da1dee5 --- /dev/null +++ b/x11/kde4-workspace/files/patch-apm.c @@ -0,0 +1,101 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.c Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,98 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <machine/apm_bios.h> ++#include <stdio.h> ++ ++#include "Command.h" ++#include "apm.h" ++#include "ksysguardd.h" ++ ++static int ApmFD, BattFill, BattTime; ++ ++#define APMDEV "/dev/apm" ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initApm(void) ++{ ++ if ((ApmFD = open(APMDEV, O_RDONLY)) < 0) ++ return; ++ ++ if (updateApm() < 0) ++ return; ++ ++ registerMonitor("apm/batterycharge", "integer", printApmBatFill, ++ printApmBatFillInfo); ++ registerMonitor("apm/remainingtime", "integer", printApmBatTime, ++ printApmBatTimeInfo); ++} ++ ++void ++exitApm(void) ++{ ++ removeMonitor("apm/batterycharge"); ++ removeMonitor("apm/remainingtime"); ++ ++ close(ApmFD); ++} ++ ++int ++updateApm(void) ++{ ++ struct apm_info info; ++ int retval; ++ ++ retval = ioctl(ApmFD, APMIO_GETINFO, &info); ++ ++ BattFill = info.ai_batt_life; ++ BattTime = info.ai_batt_time; ++ ++ return retval; ++} ++ ++void ++printApmBatFill(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattFill); ++} ++ ++void ++printApmBatFillInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Battery charge\t0\t100\t%%\n"); ++} ++ ++void ++printApmBatTime(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattTime); ++} ++ ++void ++printApmBatTimeInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); ++} diff --git a/x11/kde4-workspace/files/patch-apm.h b/x11/kde4-workspace/files/patch-apm.h new file mode 100644 index 000000000000..73e509bdd61b --- /dev/null +++ b/x11/kde4-workspace/files/patch-apm.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.h Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _apm_h_ ++#define _apm_h_ ++ ++void initApm(void); ++void exitApm(void); ++int updateApm(void); ++ ++void printApmBatFill(const char*); ++void printApmBatFillInfo(const char*); ++void printApmBatTime(const char*); ++void printApmBatTimeInfo(const char*); ++ ++#endif diff --git a/x11/kde4-workspace/files/patch-conf.c b/x11/kde4-workspace/files/patch-conf.c new file mode 100644 index 000000000000..a4de97379b10 --- /dev/null +++ b/x11/kde4-workspace/files/patch-conf.c @@ -0,0 +1,136 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.c Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,133 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.c,v 1.3 2001/11/05 23:24:19 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++ ++CONTAINER LogFileList = 0; ++CONTAINER SensorList = 0; ++ ++void parseConfigFile(const char *filename) ++{ ++ FILE* config; ++ char line[2048]; ++ char *begin, *token, *tmp, *confSensor; ++ ConfigLogFile *confLog; ++ ++ ++ if (LogFileList) ++ destr_ctnr(LogFileList, free); ++ ++ if (SensorList) ++ destr_ctnr(SensorList, free); ++ ++ LogFileList = new_ctnr(CT_DLL); ++ SensorList = new_ctnr(CT_DLL); ++ ++ if ((config = fopen(filename, "r")) == NULL) { ++ log_error("can't open config file '%s'", filename); ++ ++ /* if we can't open a config file we have to add the ++ available sensors manually ++ */ ++ ++ confSensor = strdup("ProcessList"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Memory"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Stat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetDev"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("CpuInfo"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LoadAvg"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("DiskStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LogFile"); ++ push_ctnr(SensorList, confSensor); ++ ++ return; ++ } ++ ++ while (fgets(line, sizeof(line), config) != NULL) { ++ if ((line[0] == '#') || (strlen(line) == 0)) { ++ continue; ++ } ++ ++ if (strchr(line, '#')) ++ *(strchr(line, '#')) = '\0'; ++ ++ if (line[strlen(line) - 1] == '\n') ++ line[strlen(line) - 1] = '\0'; ++ ++ if (!strncmp(line, "LogFiles", 8)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ if ((confLog = (ConfigLogFile *)malloc(sizeof(ConfigLogFile))) == NULL) { ++ log_error("malloc() no free memory avail"); ++ continue; ++ } ++ confLog->name = strdup(token); ++ tmp = strchr(confLog->name, ':'); ++ *tmp = '\0'; ++ confLog->path = tmp; ++ confLog->path++; ++ ++ push_ctnr(LogFileList, confLog); ++ } ++ } ++ if (!strncmp(line, "Sensors", 7)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ confSensor = strdup(token); ++ push_ctnr(SensorList, confSensor); ++ } ++ } ++ } ++ ++ fclose(config); ++} ++ ++int sensorAvailable(const char *sensor) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(SensorList); i++) { ++ char* name = get_ctnr(SensorList, i); ++ if (!strcmp(name, sensor)) ++ return 1; ++ } ++ ++ return 0; ++} diff --git a/x11/kde4-workspace/files/patch-conf.h b/x11/kde4-workspace/files/patch-conf.h new file mode 100644 index 000000000000..8aba2e520205 --- /dev/null +++ b/x11/kde4-workspace/files/patch-conf.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.h Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _conf_h_ ++#define _conf_h_ ++ ++typedef struct { ++ char *name; ++ char *path; ++} ConfigLogFile; ++ ++void parseConfigFile(const char *filename); ++ ++int sensorAvailable(const char* sensor); ++ ++#endif diff --git a/x11/kde4-workspace/files/patch-diskstat.c b/x11/kde4-workspace/files/patch-diskstat.c new file mode 100644 index 000000000000..5535e580a673 --- /dev/null +++ b/x11/kde4-workspace/files/patch-diskstat.c @@ -0,0 +1,260 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.c Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,257 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/param.h> ++#include <sys/stat.h> ++#include <sys/ucred.h> ++#include <sys/mount.h> ++#include <time.h> ++#include <unistd.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "diskstat.h" ++#include "ksysguardd.h" ++ ++typedef struct { ++ char device[256]; ++ char mntpnt[256]; ++ long blocks; ++ long bfree; ++ long bused; ++ int bused_percent; ++} DiskInfo; ++ ++static CONTAINER DiskStatList = 0; ++ ++char *getMntPnt(const char *cmd) ++{ ++ static char device[1024]; ++ char *ptr; ++ ++ memset(device, 0, sizeof(device)); ++ sscanf(cmd, "partitions%1024s", device); ++ ++ ptr = (char *)rindex(device, '/'); ++ *ptr = '\0'; ++ ++ return (char *)device; ++} ++ ++int numMntPnt(void) ++{ ++ struct statfs *fs_info; ++ int i, n, counter = 0; ++ ++ n = getmntinfo(&fs_info, MNT_WAIT); ++ for (i = 0; i < n; i++) ++ if (strcmp(fs_info[i].f_fstypename, "procfs") && strcmp(fs_info[i].f_fstypename, "swap") && strcmp(fs_info[i].f_fstypename, "devfs")) ++ counter++; ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initDiskStat(void) ++{ ++ char monitor[1024]; ++ int i; ++ ++ DiskStatList = new_ctnr(CT_DLL); ++ ++ updateDiskStat(); ++ ++ registerMonitor("partitions/list", "listview", printDiskStat, printDiskStatInfo); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatUsed, printDiskStatUsedInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatFree, printDiskStatFreeInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatPercent, printDiskStatPercentInfo); ++ } ++} ++ ++void checkDiskStat(void) ++{ ++ if (numMntPnt() != level_ctnr(DiskStatList)) { ++ /* a filesystem was mounted or unmounted ++ so we do a reset */ ++ exitDiskStat(); ++ initDiskStat(); ++ } ++} ++ ++void exitDiskStat(void) ++{ ++ DiskInfo *disk_info; ++ char monitor[1024]; ++ int i; ++ ++ removeMonitor("partitions/list"); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ disk_info = remove_ctnr(DiskStatList, i--); ++ ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ removeMonitor(monitor); ++ ++ free(disk_info); ++ } ++ ++ if (DiskStatList) ++ destr_ctnr(DiskStatList, free); ++} ++ ++int updateDiskStat(void) ++{ ++ struct statfs *fs_info; ++ struct statfs fs; ++ float percent; ++ int i, mntcount; ++ DiskInfo *disk_info; ++ ++ /* let's hope there is no difference between the DiskStatList and ++ the number of mounted filesystems */ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) ++ free(remove_ctnr(DiskStatList, i--)); ++ ++ mntcount = getmntinfo(&fs_info, MNT_WAIT); ++ ++ for (i = 0; i < mntcount; i++) { ++ fs = fs_info[i]; ++ if (strcmp(fs.f_fstypename, "procfs") && strcmp(fs.f_fstypename, "devfs") && strcmp(fs.f_fstypename, "devfs")) { ++ percent = (((float)fs.f_blocks - (float)fs.f_bfree)/(float)fs.f_blocks); ++ percent = percent * 100; ++ if ((disk_info = (DiskInfo *)malloc(sizeof(DiskInfo))) == NULL) { ++ continue; ++ } ++ memset(disk_info, 0, sizeof(DiskInfo)); ++ strncpy(disk_info->device, fs.f_mntfromname, 255); ++ if (!strcmp(fs.f_mntonname, "/")) { ++ strncpy(disk_info->mntpnt, "/root", 6); ++ } else { ++ strncpy(disk_info->mntpnt, fs.f_mntonname, 255); ++ } ++ disk_info->blocks = fs.f_blocks; ++ disk_info->bfree = fs.f_bfree; ++ disk_info->bused = (fs.f_blocks - fs.f_bfree); ++ disk_info->bused_percent = (int)percent; ++ ++ push_ctnr(DiskStatList, disk_info); ++ } ++ } ++ ++ return 0; ++} ++ ++void printDiskStat(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%d\t%s\n", ++ disk_info->device, ++ disk_info->blocks, ++ disk_info->bused, ++ disk_info->bfree, ++ disk_info->bused_percent, ++ disk_info->mntpnt); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Device\tBlocks\tUsed\tAvailable\tUsed %%\tMountPoint\n"); ++} ++ ++void printDiskStatUsed(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bused); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatUsedInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatFree(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bfree); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatFreeInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Free Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatPercent(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%d\n", disk_info->bused_percent); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatPercentInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t100\t%%\n"); ++} diff --git a/x11/kde4-workspace/files/patch-diskstat.h b/x11/kde4-workspace/files/patch-diskstat.h new file mode 100644 index 000000000000..3b5bf11b89c7 --- /dev/null +++ b/x11/kde4-workspace/files/patch-diskstat.h @@ -0,0 +1,44 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.h Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,41 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _diskstat_h_ ++#define _diskstat_h_ ++ ++void initDiskStat(void); ++void exitDiskStat(void); ++ ++int updateDiskStat(void); ++void checkDiskStat(void); ++ ++void printDiskStat(const char* cmd); ++void printDiskStatInfo(const char* cmd); ++ ++void printDiskStatUsed(const char* cmd); ++void printDiskStatUsedInfo(const char* cmd); ++void printDiskStatFree(const char* cmd); ++void printDiskStatFreeInfo(const char* cmd); ++void printDiskStatPercent(const char* cmd); ++void printDiskStatPercentInfo(const char* cmd); ++ ++#endif diff --git a/x11/kde4-workspace/files/patch-ksysguardd.c b/x11/kde4-workspace/files/patch-ksysguardd.c new file mode 100644 index 000000000000..940aa4d327a5 --- /dev/null +++ b/x11/kde4-workspace/files/patch-ksysguardd.c @@ -0,0 +1,15 @@ +--- ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 02:01:46 1.5 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 06:16:15 1.6 +@@ -17,9 +17,11 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +- $Id: ksysguardd.c,v 1.2.6.1 2001/11/08 10:48:51 tokoe Exp $ ++ $Id: ksysguardd.c,v 1.6 2001/11/17 06:16:15 waba Exp $ + */ + ++#include <config.h> ++ + #include <ctype.h> + #include <fcntl.h> + #include <netdb.h> diff --git a/x11/kde4-workspace/files/patch-ksysguardd.h b/x11/kde4-workspace/files/patch-ksysguardd.h new file mode 100644 index 000000000000..1545b83d39d7 --- /dev/null +++ b/x11/kde4-workspace/files/patch-ksysguardd.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.h Mon Nov 19 17:07:38 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 1999-2001 Chris Schlaeger <cs@kde.org> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: ksysguardd.h,v 1.2 2001/11/08 10:52:55 tokoe Exp $ ++*/ ++ ++#ifndef _ksysguardd_h_ ++#define _ksysguardd_h_ ++ ++#include <stdio.h> ++ ++extern int QuitApp; ++extern int RunAsDaemon; ++extern FILE* CurrentClient; ++ ++void updateModules(void); ++void checkModules(void); ++ ++#endif diff --git a/x11/kde4-workspace/files/patch-loadavg.c b/x11/kde4-workspace/files/patch-loadavg.c new file mode 100644 index 000000000000..ced78fa5ad68 --- /dev/null +++ b/x11/kde4-workspace/files/patch-loadavg.c @@ -0,0 +1,100 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.c Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,97 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "loadavg.h" ++ ++static double LoadAvg[3]; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initLoadAvg(void) ++{ ++ if (updateLoadAvg() < 0) ++ return; ++ ++ registerMonitor("cpu/loadavg1", "float", printLoadAvg1, ++ printLoadAvg1Info); ++ registerMonitor("cpu/loadavg5", "float", printLoadAvg5, ++ printLoadAvg5Info); ++ registerMonitor("cpu/loadavg15", "float", printLoadAvg15, ++ printLoadAvg15Info); ++} ++ ++void ++exitLoadAvg(void) ++{ ++ removeMonitor("cpu/loadavg1"); ++ removeMonitor("cpu/loadavg5"); ++ removeMonitor("cpu/loadavg15"); ++} ++ ++int ++updateLoadAvg(void) ++{ ++ return getloadavg(LoadAvg, 3); ++} ++ ++void ++printLoadAvg1(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[0]); ++} ++ ++void ++printLoadAvg1Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 1 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg5(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[1]); ++} ++ ++void ++printLoadAvg5Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 5 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg15(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[2]); ++} ++ ++void ++printLoadAvg15Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 15 min\t0\t0\t\n"); ++} diff --git a/x11/kde4-workspace/files/patch-loadavg.h b/x11/kde4-workspace/files/patch-loadavg.h new file mode 100644 index 000000000000..cdc680cbd492 --- /dev/null +++ b/x11/kde4-workspace/files/patch-loadavg.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.h Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _loadavg_h_ ++#define _loadavg_h_ ++ ++void initLoadAvg(void); ++void exitLoadAvg(void); ++int updateLoadAvg(void); ++ ++void printLoadAvg1(const char*); ++void printLoadAvg1Info(const char*); ++void printLoadAvg5(const char*); ++void printLoadAvg5Info(const char*); ++void printLoadAvg15(const char*); ++void printLoadAvg15Info(const char*); ++ ++#endif diff --git a/x11/kde4-workspace/files/patch-logfile.c b/x11/kde4-workspace/files/patch-logfile.c new file mode 100644 index 000000000000..5fd3def1ae6b --- /dev/null +++ b/x11/kde4-workspace/files/patch-logfile.c @@ -0,0 +1,184 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.c Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,181 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++#include "ksysguardd.h" ++#include "logfile.h" ++ ++static CONTAINER LogFiles = 0; ++static unsigned long counter = 1; ++ ++typedef struct { ++ char name[256]; ++ FILE* fh; ++ unsigned long id; ++} LogFileEntry; ++ ++extern CONTAINER LogFileList; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void initLogFile(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ registerCommand("logfile_register", registerLogFile); ++ registerCommand("logfile_unregister", unregisterLogFile); ++ registerCommand("logfile_registered", printRegistered); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) ++ { ++ FILE* fp; ++ ConfigLogFile *entry = get_ctnr(LogFileList, i); ++ /* register the log file if we can actually read the file. */ ++ if ((fp = fopen(entry->path, "r")) != NULL) ++ { ++ fclose(fp); ++ snprintf(monitor, 1024, "logfiles/%s", entry->name); ++ registerMonitor(monitor, "logfile", printLogFile, ++ printLogFileInfo); ++ } ++ } ++ ++ LogFiles = new_ctnr(CT_DLL); ++} ++ ++void exitLogFile(void) ++{ ++ if (LogFiles) ++ destr_ctnr(LogFiles, free); ++} ++ ++void printLogFile(const char* cmd) ++{ ++ char line[1024]; ++ unsigned long id; ++ int i; ++ char ch; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ while (fgets(line, sizeof(line), entry->fh) != NULL) { ++ fprintf(CurrentClient, "%s", line); ++ } ++ clearerr(entry->fh); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printLogFileInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "LogFile\n"); ++} ++ ++void registerLogFile(const char* cmd) ++{ ++ char name[256]; ++ FILE* file; ++ LogFileEntry *entry; ++ int i; ++ ++ memset(name, 0, sizeof(name)); ++ sscanf(cmd, "%*s %256s", name); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) { ++ ConfigLogFile *conf = get_ctnr(LogFileList, i); ++ if (!strcmp(conf->name, name)) { ++ if ((file = fopen(conf->path, "r")) == NULL) { ++ print_error("fopen()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ fseek(file, 0, SEEK_END); ++ ++ if ((entry = (LogFileEntry *)malloc(sizeof(LogFileEntry))) == NULL) { ++ print_error("malloc()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ entry->fh = file; ++ strncpy(entry->name, conf->name, 256); ++ entry->id = counter; ++ ++ push_ctnr(LogFiles, entry); ++ ++ fprintf(CurrentClient, "%lu\n", counter); ++ counter++; ++ ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "0\n"); ++} ++ ++void unregisterLogFile(const char* cmd) ++{ ++ unsigned long id; ++ int i; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ fclose(entry->fh); ++ free(remove_ctnr(LogFiles, i)); ++ fprintf(CurrentClient, "\n"); ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printRegistered(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ fprintf(CurrentClient, "%s:%lu\n", entry->name, entry->id); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} diff --git a/x11/kde4-workspace/files/patch-logfile.h b/x11/kde4-workspace/files/patch-logfile.h new file mode 100644 index 000000000000..69b8d6ed1ca6 --- /dev/null +++ b/x11/kde4-workspace/files/patch-logfile.h @@ -0,0 +1,40 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.h Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,37 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _logfile_h_ ++#define _logfile_h_ ++ ++void initLogFile(void); ++void exitLogFile(void); ++ ++void printLogFile(const char* cmd); ++void printLogFileInfo(const char* cmd); ++ ++void registerLogFile(const char* cmd); ++void unregisterLogFile(const char* cmd); ++ ++/* debug command */ ++void printRegistered(const char* cmd); ++ ++#endif diff --git a/x11/kde4-workspace/files/patch-netdev.c b/x11/kde4-workspace/files/patch-netdev.c new file mode 100644 index 000000000000..2c0f473ebbcf --- /dev/null +++ b/x11/kde4-workspace/files/patch-netdev.c @@ -0,0 +1,322 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.c Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,319 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <sys/socket.h> ++#include <net/if.h> ++#include <net/if_mib.h> ++#include <stdio.h> ++#include <string.h> ++#include <sys/sysctl.h> ++#include <sys/time.h> ++#include <sys/types.h> ++#include <unistd.h> ++ ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "netdev.h" ++ ++ ++typedef struct { ++ char name[32]; ++ u_long recBytes; ++ u_long recPacks; ++ u_long recErrs; ++ u_long recDrop; ++ u_long recMulticast; ++ u_long sentBytes; ++ u_long sentPacks; ++ u_long sentErrs; ++ u_long sentMulticast; ++ u_long sentColls; ++} NetDevInfo; ++ ++#define MAXNETDEVS 64 ++static NetDevInfo NetDevs[MAXNETDEVS]; ++static int NetDevCnt = 0; ++ ++char **parseCommand(const char *cmd) ++{ ++ char tmp_cmd[1024]; ++ char *begin; ++ static char sensor[100]; ++ static char interface[100]; ++ static char* retval[2]; ++ ++ strncpy(tmp_cmd, cmd, 1024); ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin++; ++ strcpy(sensor, begin); ++ retval[1] = sensor; ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin = rindex(tmp_cmd, '/'); ++ begin++; ++ strcpy(interface, begin); ++ retval[0] = interface; ++ ++ return retval; ++} ++ ++int numActivIfaces(void) ++{ ++ int counter = 0; ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) ++ counter++; ++ } ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ updateNetDev(); ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ } ++} ++ ++void exitNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ removeMonitor(monitor); ++ } ++} ++ ++void updateNetDev(void) ++{ ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ NetDevCnt = 0; ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) { ++ strncpy(NetDevs[NetDevCnt].name, ifmd.ifmd_name, 32); ++ NetDevs[NetDevCnt].recBytes = ifmd.ifmd_data.ifi_ibytes - NetDevs[NetDevCnt].recBytes; ++ NetDevs[NetDevCnt].recPacks = ifmd.ifmd_data.ifi_ipackets - NetDevs[NetDevCnt].recPacks; ++ NetDevs[NetDevCnt].recErrs = ifmd.ifmd_data.ifi_ierrors - NetDevs[NetDevCnt].recErrs; ++ NetDevs[NetDevCnt].recDrop = ifmd.ifmd_data.ifi_iqdrops - NetDevs[NetDevCnt].recDrop; ++ NetDevs[NetDevCnt].recMulticast = ifmd.ifmd_data.ifi_imcasts - NetDevs[NetDevCnt].recMulticast; ++ NetDevs[NetDevCnt].sentBytes = ifmd.ifmd_data.ifi_obytes - NetDevs[NetDevCnt].sentBytes; ++ NetDevs[NetDevCnt].sentPacks = ifmd.ifmd_data.ifi_opackets - NetDevs[NetDevCnt].sentPacks; ++ NetDevs[NetDevCnt].sentErrs = ifmd.ifmd_data.ifi_oerrors - NetDevs[NetDevCnt].sentErrs; ++ NetDevs[NetDevCnt].sentMulticast = ifmd.ifmd_data.ifi_omcasts - NetDevs[NetDevCnt].sentMulticast; ++ NetDevs[NetDevCnt].sentColls = ifmd.ifmd_data.ifi_collisions - NetDevs[NetDevCnt].sentColls; ++ NetDevCnt++; ++ } ++ } ++} ++ ++void checkNetDev(void) ++{ ++ if (numActivIfaces() != NetDevCnt) { ++ /* interface has been added or removed ++ so we do a reset */ ++ exitNetDev(); ++ initNetDev(); ++ } ++} ++ ++void printNetDevRecBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recErrs); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recDrop); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recMulticast); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevRecBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Received Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Received Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Receiver Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "Receiver Drops\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Received Multicast Packets\t0\t0\t1/s\n"); ++} ++ ++void printNetDevSentBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentErrs); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentMulticast); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentColls); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevSentBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Sent Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Sent Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Transmitter Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Sent Multicast Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "Transmitter Collisions\t0\t0\t1/s\n"); ++} diff --git a/x11/kde4-workspace/files/patch-netdev.h b/x11/kde4-workspace/files/patch-netdev.h new file mode 100644 index 000000000000..3c291f85dc9e --- /dev/null +++ b/x11/kde4-workspace/files/patch-netdev.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.h Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _netdev_h_ ++#define _netdev_h_ ++ ++void initNetDev(void); ++void exitNetDev(void); ++ ++void updateNetDev(void); ++void checkNetDev(void); ++ ++void printNetDevRecBytes(const char* cmd); ++void printNetDevRecBytesInfo(const char* cmd); ++void printNetDevSentBytes(const char* cmd); ++void printNetDevSentBytesInfo(const char* cmd); ++ ++#endif diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 5466b74bfbc6..3b9d7855dd8d 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -229,7 +229,6 @@ lib/kde2/libkcm_kwinoptions.la lib/kde2/libkcm_kwinoptions.so lib/kde2/libkcm_launch.la lib/kde2/libkcm_launch.so -lib/kde2/libkcm_launch.so.0 lib/kde2/libkcm_locale.la lib/kde2/libkcm_locale.so lib/kde2/libkcm_midi.la @@ -277,7 +276,6 @@ lib/kde2/libkonqsidebartree_dirtree.la lib/kde2/libkonqsidebartree_dirtree.so lib/kde2/libkonqsidebartree_history.la lib/kde2/libkonqsidebartree_history.so -lib/kde2/libkonqsidebartree_history.so.0 lib/kde2/libkonqsound.la lib/kde2/libkonqsound.so lib/kde2/libkonqtree.la @@ -1146,9 +1144,6 @@ share/apps/konsole/konsole_part.rc share/apps/konsole/linux.desktop share/apps/konsole/linux.keytab share/apps/konsole/mc.desktop -share/apps/konsole/pics/brightness.png -share/apps/konsole/pics/colourness.png -share/apps/konsole/pics/contrast.png share/apps/konsole/shell.desktop share/apps/konsole/su.desktop share/apps/konsole/sumc.desktop @@ -1284,8 +1279,14 @@ share/config/imsmaprc share/config/interferencerc share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 +share/config/kdm/Xaccess +share/config/kdm/Xreset +share/config/kdm/Xservers +share/config/kdm/Xsession +share/config/kdm/Xsetup +share/config/kdm/Xstartup +share/config/kdm/Xwilling share/config/kdm/kdmrc -share/config/kdm/README share/config/klipperrc share/config/konqsidebartng.rc share/config/konsolerc @@ -2158,6 +2159,8 @@ share/locale/l10n/hr/entry.desktop share/locale/l10n/hr/flag.png share/locale/l10n/hu/entry.desktop share/locale/l10n/hu/flag.png +share/locale/l10n/id/entry.desktop +share/locale/l10n/id/flag.png share/locale/l10n/ie/entry.desktop share/locale/l10n/ie/flag.png share/locale/l10n/il/entry.desktop @@ -2426,18 +2429,12 @@ share/wallpapers/simple_wallpaper.jpg share/wallpapers/sunday_brunch.jpg share/wallpapers/vegetative_fog.jpg @dirrm share/wallpapers -@exec mkdir %D/share/templates/.source/emptydir -@exec chmod 644 %D/share/templates/.source/emptydir -@unexec rmdir %D/share/templates/.source/emptydir +@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds -@dirrm share/servicetypes @dirrm share/services/useragentstrings @dirrm share/services/searchproviders -@dirrm share/services/kded -@dirrm share/services -@dirrm share/mimelnk/application @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ve @dirrm share/locale/l10n/vc @@ -2479,6 +2476,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/is @dirrm share/locale/l10n/il @dirrm share/locale/l10n/ie +@dirrm share/locale/l10n/id @dirrm share/locale/l10n/hu @dirrm share/locale/l10n/hr @dirrm share/locale/l10n/hn @@ -2512,22 +2510,13 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/ag @dirrm share/locale/l10n/C @dirrm share/locale/l10n -@dirrm share/locale/C -@dirrm share/locale @dirrm share/icons/locolor/32x32/apps @dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/filesystems @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32/actions -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/16x16/filesystems -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @@ -2552,9 +2541,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook -@dirrm share/doc/HTML/en @dirrm share/config/kdm -@dirrm share/config @dirrm share/autostart @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2572,7 +2559,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer -@dirrm share/apps/konsole/pics @dirrm share/apps/konsole @dirrm share/apps/konqueror/tiles @dirrm share/apps/konqueror/profiles @@ -2658,7 +2644,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol -@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2755,6 +2740,5 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/applnk/Applications @dirrm share/applnk/.hidden @dirrm share/applnk -@dirrm lib/kde2 @dirrm include/kwin @dirrm include/kate diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile index 162e065022fa..42b3d41907ac 100644 --- a/x11/kde4/Makefile +++ b/x11/kde4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kde -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index ee69d6cb95bb..f8e6c70e010f 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2.2 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -15,6 +14,9 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -27,8 +29,13 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --without-ldap \ - --disable-closure + --without-ldap --disable-closure --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes .include <bsd.port.pre.mk> @@ -56,6 +63,15 @@ post-extract: @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/libkonq/Makefile.in ${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo index f0d9e99b49aa..251c4afefe28 100644 --- a/x11/kdebase2/distinfo +++ b/x11/kdebase2/distinfo @@ -1 +1 @@ -MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a +MD5 (KDE/kdebase-2.2.2.tar.bz2) = 39635e42056ab2afb8e6f2ff761eea38 diff --git a/x11/kdebase2/files/patch-apm.c b/x11/kdebase2/files/patch-apm.c new file mode 100644 index 000000000000..08925da1dee5 --- /dev/null +++ b/x11/kdebase2/files/patch-apm.c @@ -0,0 +1,101 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.c Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,98 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <machine/apm_bios.h> ++#include <stdio.h> ++ ++#include "Command.h" ++#include "apm.h" ++#include "ksysguardd.h" ++ ++static int ApmFD, BattFill, BattTime; ++ ++#define APMDEV "/dev/apm" ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initApm(void) ++{ ++ if ((ApmFD = open(APMDEV, O_RDONLY)) < 0) ++ return; ++ ++ if (updateApm() < 0) ++ return; ++ ++ registerMonitor("apm/batterycharge", "integer", printApmBatFill, ++ printApmBatFillInfo); ++ registerMonitor("apm/remainingtime", "integer", printApmBatTime, ++ printApmBatTimeInfo); ++} ++ ++void ++exitApm(void) ++{ ++ removeMonitor("apm/batterycharge"); ++ removeMonitor("apm/remainingtime"); ++ ++ close(ApmFD); ++} ++ ++int ++updateApm(void) ++{ ++ struct apm_info info; ++ int retval; ++ ++ retval = ioctl(ApmFD, APMIO_GETINFO, &info); ++ ++ BattFill = info.ai_batt_life; ++ BattTime = info.ai_batt_time; ++ ++ return retval; ++} ++ ++void ++printApmBatFill(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattFill); ++} ++ ++void ++printApmBatFillInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Battery charge\t0\t100\t%%\n"); ++} ++ ++void ++printApmBatTime(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattTime); ++} ++ ++void ++printApmBatTimeInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); ++} diff --git a/x11/kdebase2/files/patch-apm.h b/x11/kdebase2/files/patch-apm.h new file mode 100644 index 000000000000..73e509bdd61b --- /dev/null +++ b/x11/kdebase2/files/patch-apm.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.h Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _apm_h_ ++#define _apm_h_ ++ ++void initApm(void); ++void exitApm(void); ++int updateApm(void); ++ ++void printApmBatFill(const char*); ++void printApmBatFillInfo(const char*); ++void printApmBatTime(const char*); ++void printApmBatTimeInfo(const char*); ++ ++#endif diff --git a/x11/kdebase2/files/patch-conf.c b/x11/kdebase2/files/patch-conf.c new file mode 100644 index 000000000000..a4de97379b10 --- /dev/null +++ b/x11/kdebase2/files/patch-conf.c @@ -0,0 +1,136 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.c Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,133 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.c,v 1.3 2001/11/05 23:24:19 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++ ++CONTAINER LogFileList = 0; ++CONTAINER SensorList = 0; ++ ++void parseConfigFile(const char *filename) ++{ ++ FILE* config; ++ char line[2048]; ++ char *begin, *token, *tmp, *confSensor; ++ ConfigLogFile *confLog; ++ ++ ++ if (LogFileList) ++ destr_ctnr(LogFileList, free); ++ ++ if (SensorList) ++ destr_ctnr(SensorList, free); ++ ++ LogFileList = new_ctnr(CT_DLL); ++ SensorList = new_ctnr(CT_DLL); ++ ++ if ((config = fopen(filename, "r")) == NULL) { ++ log_error("can't open config file '%s'", filename); ++ ++ /* if we can't open a config file we have to add the ++ available sensors manually ++ */ ++ ++ confSensor = strdup("ProcessList"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Memory"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Stat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetDev"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("CpuInfo"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LoadAvg"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("DiskStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LogFile"); ++ push_ctnr(SensorList, confSensor); ++ ++ return; ++ } ++ ++ while (fgets(line, sizeof(line), config) != NULL) { ++ if ((line[0] == '#') || (strlen(line) == 0)) { ++ continue; ++ } ++ ++ if (strchr(line, '#')) ++ *(strchr(line, '#')) = '\0'; ++ ++ if (line[strlen(line) - 1] == '\n') ++ line[strlen(line) - 1] = '\0'; ++ ++ if (!strncmp(line, "LogFiles", 8)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ if ((confLog = (ConfigLogFile *)malloc(sizeof(ConfigLogFile))) == NULL) { ++ log_error("malloc() no free memory avail"); ++ continue; ++ } ++ confLog->name = strdup(token); ++ tmp = strchr(confLog->name, ':'); ++ *tmp = '\0'; ++ confLog->path = tmp; ++ confLog->path++; ++ ++ push_ctnr(LogFileList, confLog); ++ } ++ } ++ if (!strncmp(line, "Sensors", 7)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ confSensor = strdup(token); ++ push_ctnr(SensorList, confSensor); ++ } ++ } ++ } ++ ++ fclose(config); ++} ++ ++int sensorAvailable(const char *sensor) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(SensorList); i++) { ++ char* name = get_ctnr(SensorList, i); ++ if (!strcmp(name, sensor)) ++ return 1; ++ } ++ ++ return 0; ++} diff --git a/x11/kdebase2/files/patch-conf.h b/x11/kdebase2/files/patch-conf.h new file mode 100644 index 000000000000..8aba2e520205 --- /dev/null +++ b/x11/kdebase2/files/patch-conf.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.h Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _conf_h_ ++#define _conf_h_ ++ ++typedef struct { ++ char *name; ++ char *path; ++} ConfigLogFile; ++ ++void parseConfigFile(const char *filename); ++ ++int sensorAvailable(const char* sensor); ++ ++#endif diff --git a/x11/kdebase2/files/patch-diskstat.c b/x11/kdebase2/files/patch-diskstat.c new file mode 100644 index 000000000000..5535e580a673 --- /dev/null +++ b/x11/kdebase2/files/patch-diskstat.c @@ -0,0 +1,260 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.c Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,257 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/param.h> ++#include <sys/stat.h> ++#include <sys/ucred.h> ++#include <sys/mount.h> ++#include <time.h> ++#include <unistd.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "diskstat.h" ++#include "ksysguardd.h" ++ ++typedef struct { ++ char device[256]; ++ char mntpnt[256]; ++ long blocks; ++ long bfree; ++ long bused; ++ int bused_percent; ++} DiskInfo; ++ ++static CONTAINER DiskStatList = 0; ++ ++char *getMntPnt(const char *cmd) ++{ ++ static char device[1024]; ++ char *ptr; ++ ++ memset(device, 0, sizeof(device)); ++ sscanf(cmd, "partitions%1024s", device); ++ ++ ptr = (char *)rindex(device, '/'); ++ *ptr = '\0'; ++ ++ return (char *)device; ++} ++ ++int numMntPnt(void) ++{ ++ struct statfs *fs_info; ++ int i, n, counter = 0; ++ ++ n = getmntinfo(&fs_info, MNT_WAIT); ++ for (i = 0; i < n; i++) ++ if (strcmp(fs_info[i].f_fstypename, "procfs") && strcmp(fs_info[i].f_fstypename, "swap") && strcmp(fs_info[i].f_fstypename, "devfs")) ++ counter++; ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initDiskStat(void) ++{ ++ char monitor[1024]; ++ int i; ++ ++ DiskStatList = new_ctnr(CT_DLL); ++ ++ updateDiskStat(); ++ ++ registerMonitor("partitions/list", "listview", printDiskStat, printDiskStatInfo); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatUsed, printDiskStatUsedInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatFree, printDiskStatFreeInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatPercent, printDiskStatPercentInfo); ++ } ++} ++ ++void checkDiskStat(void) ++{ ++ if (numMntPnt() != level_ctnr(DiskStatList)) { ++ /* a filesystem was mounted or unmounted ++ so we do a reset */ ++ exitDiskStat(); ++ initDiskStat(); ++ } ++} ++ ++void exitDiskStat(void) ++{ ++ DiskInfo *disk_info; ++ char monitor[1024]; ++ int i; ++ ++ removeMonitor("partitions/list"); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ disk_info = remove_ctnr(DiskStatList, i--); ++ ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ removeMonitor(monitor); ++ ++ free(disk_info); ++ } ++ ++ if (DiskStatList) ++ destr_ctnr(DiskStatList, free); ++} ++ ++int updateDiskStat(void) ++{ ++ struct statfs *fs_info; ++ struct statfs fs; ++ float percent; ++ int i, mntcount; ++ DiskInfo *disk_info; ++ ++ /* let's hope there is no difference between the DiskStatList and ++ the number of mounted filesystems */ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) ++ free(remove_ctnr(DiskStatList, i--)); ++ ++ mntcount = getmntinfo(&fs_info, MNT_WAIT); ++ ++ for (i = 0; i < mntcount; i++) { ++ fs = fs_info[i]; ++ if (strcmp(fs.f_fstypename, "procfs") && strcmp(fs.f_fstypename, "devfs") && strcmp(fs.f_fstypename, "devfs")) { ++ percent = (((float)fs.f_blocks - (float)fs.f_bfree)/(float)fs.f_blocks); ++ percent = percent * 100; ++ if ((disk_info = (DiskInfo *)malloc(sizeof(DiskInfo))) == NULL) { ++ continue; ++ } ++ memset(disk_info, 0, sizeof(DiskInfo)); ++ strncpy(disk_info->device, fs.f_mntfromname, 255); ++ if (!strcmp(fs.f_mntonname, "/")) { ++ strncpy(disk_info->mntpnt, "/root", 6); ++ } else { ++ strncpy(disk_info->mntpnt, fs.f_mntonname, 255); ++ } ++ disk_info->blocks = fs.f_blocks; ++ disk_info->bfree = fs.f_bfree; ++ disk_info->bused = (fs.f_blocks - fs.f_bfree); ++ disk_info->bused_percent = (int)percent; ++ ++ push_ctnr(DiskStatList, disk_info); ++ } ++ } ++ ++ return 0; ++} ++ ++void printDiskStat(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%d\t%s\n", ++ disk_info->device, ++ disk_info->blocks, ++ disk_info->bused, ++ disk_info->bfree, ++ disk_info->bused_percent, ++ disk_info->mntpnt); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Device\tBlocks\tUsed\tAvailable\tUsed %%\tMountPoint\n"); ++} ++ ++void printDiskStatUsed(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bused); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatUsedInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatFree(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bfree); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatFreeInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Free Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatPercent(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%d\n", disk_info->bused_percent); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatPercentInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t100\t%%\n"); ++} diff --git a/x11/kdebase2/files/patch-diskstat.h b/x11/kdebase2/files/patch-diskstat.h new file mode 100644 index 000000000000..3b5bf11b89c7 --- /dev/null +++ b/x11/kdebase2/files/patch-diskstat.h @@ -0,0 +1,44 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.h Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,41 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _diskstat_h_ ++#define _diskstat_h_ ++ ++void initDiskStat(void); ++void exitDiskStat(void); ++ ++int updateDiskStat(void); ++void checkDiskStat(void); ++ ++void printDiskStat(const char* cmd); ++void printDiskStatInfo(const char* cmd); ++ ++void printDiskStatUsed(const char* cmd); ++void printDiskStatUsedInfo(const char* cmd); ++void printDiskStatFree(const char* cmd); ++void printDiskStatFreeInfo(const char* cmd); ++void printDiskStatPercent(const char* cmd); ++void printDiskStatPercentInfo(const char* cmd); ++ ++#endif diff --git a/x11/kdebase2/files/patch-ksysguardd.c b/x11/kdebase2/files/patch-ksysguardd.c new file mode 100644 index 000000000000..940aa4d327a5 --- /dev/null +++ b/x11/kdebase2/files/patch-ksysguardd.c @@ -0,0 +1,15 @@ +--- ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 02:01:46 1.5 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 06:16:15 1.6 +@@ -17,9 +17,11 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +- $Id: ksysguardd.c,v 1.2.6.1 2001/11/08 10:48:51 tokoe Exp $ ++ $Id: ksysguardd.c,v 1.6 2001/11/17 06:16:15 waba Exp $ + */ + ++#include <config.h> ++ + #include <ctype.h> + #include <fcntl.h> + #include <netdb.h> diff --git a/x11/kdebase2/files/patch-ksysguardd.h b/x11/kdebase2/files/patch-ksysguardd.h new file mode 100644 index 000000000000..1545b83d39d7 --- /dev/null +++ b/x11/kdebase2/files/patch-ksysguardd.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.h Mon Nov 19 17:07:38 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 1999-2001 Chris Schlaeger <cs@kde.org> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: ksysguardd.h,v 1.2 2001/11/08 10:52:55 tokoe Exp $ ++*/ ++ ++#ifndef _ksysguardd_h_ ++#define _ksysguardd_h_ ++ ++#include <stdio.h> ++ ++extern int QuitApp; ++extern int RunAsDaemon; ++extern FILE* CurrentClient; ++ ++void updateModules(void); ++void checkModules(void); ++ ++#endif diff --git a/x11/kdebase2/files/patch-loadavg.c b/x11/kdebase2/files/patch-loadavg.c new file mode 100644 index 000000000000..ced78fa5ad68 --- /dev/null +++ b/x11/kdebase2/files/patch-loadavg.c @@ -0,0 +1,100 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.c Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,97 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "loadavg.h" ++ ++static double LoadAvg[3]; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initLoadAvg(void) ++{ ++ if (updateLoadAvg() < 0) ++ return; ++ ++ registerMonitor("cpu/loadavg1", "float", printLoadAvg1, ++ printLoadAvg1Info); ++ registerMonitor("cpu/loadavg5", "float", printLoadAvg5, ++ printLoadAvg5Info); ++ registerMonitor("cpu/loadavg15", "float", printLoadAvg15, ++ printLoadAvg15Info); ++} ++ ++void ++exitLoadAvg(void) ++{ ++ removeMonitor("cpu/loadavg1"); ++ removeMonitor("cpu/loadavg5"); ++ removeMonitor("cpu/loadavg15"); ++} ++ ++int ++updateLoadAvg(void) ++{ ++ return getloadavg(LoadAvg, 3); ++} ++ ++void ++printLoadAvg1(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[0]); ++} ++ ++void ++printLoadAvg1Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 1 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg5(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[1]); ++} ++ ++void ++printLoadAvg5Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 5 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg15(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[2]); ++} ++ ++void ++printLoadAvg15Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 15 min\t0\t0\t\n"); ++} diff --git a/x11/kdebase2/files/patch-loadavg.h b/x11/kdebase2/files/patch-loadavg.h new file mode 100644 index 000000000000..cdc680cbd492 --- /dev/null +++ b/x11/kdebase2/files/patch-loadavg.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.h Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _loadavg_h_ ++#define _loadavg_h_ ++ ++void initLoadAvg(void); ++void exitLoadAvg(void); ++int updateLoadAvg(void); ++ ++void printLoadAvg1(const char*); ++void printLoadAvg1Info(const char*); ++void printLoadAvg5(const char*); ++void printLoadAvg5Info(const char*); ++void printLoadAvg15(const char*); ++void printLoadAvg15Info(const char*); ++ ++#endif diff --git a/x11/kdebase2/files/patch-logfile.c b/x11/kdebase2/files/patch-logfile.c new file mode 100644 index 000000000000..5fd3def1ae6b --- /dev/null +++ b/x11/kdebase2/files/patch-logfile.c @@ -0,0 +1,184 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.c Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,181 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++#include "ksysguardd.h" ++#include "logfile.h" ++ ++static CONTAINER LogFiles = 0; ++static unsigned long counter = 1; ++ ++typedef struct { ++ char name[256]; ++ FILE* fh; ++ unsigned long id; ++} LogFileEntry; ++ ++extern CONTAINER LogFileList; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void initLogFile(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ registerCommand("logfile_register", registerLogFile); ++ registerCommand("logfile_unregister", unregisterLogFile); ++ registerCommand("logfile_registered", printRegistered); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) ++ { ++ FILE* fp; ++ ConfigLogFile *entry = get_ctnr(LogFileList, i); ++ /* register the log file if we can actually read the file. */ ++ if ((fp = fopen(entry->path, "r")) != NULL) ++ { ++ fclose(fp); ++ snprintf(monitor, 1024, "logfiles/%s", entry->name); ++ registerMonitor(monitor, "logfile", printLogFile, ++ printLogFileInfo); ++ } ++ } ++ ++ LogFiles = new_ctnr(CT_DLL); ++} ++ ++void exitLogFile(void) ++{ ++ if (LogFiles) ++ destr_ctnr(LogFiles, free); ++} ++ ++void printLogFile(const char* cmd) ++{ ++ char line[1024]; ++ unsigned long id; ++ int i; ++ char ch; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ while (fgets(line, sizeof(line), entry->fh) != NULL) { ++ fprintf(CurrentClient, "%s", line); ++ } ++ clearerr(entry->fh); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printLogFileInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "LogFile\n"); ++} ++ ++void registerLogFile(const char* cmd) ++{ ++ char name[256]; ++ FILE* file; ++ LogFileEntry *entry; ++ int i; ++ ++ memset(name, 0, sizeof(name)); ++ sscanf(cmd, "%*s %256s", name); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) { ++ ConfigLogFile *conf = get_ctnr(LogFileList, i); ++ if (!strcmp(conf->name, name)) { ++ if ((file = fopen(conf->path, "r")) == NULL) { ++ print_error("fopen()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ fseek(file, 0, SEEK_END); ++ ++ if ((entry = (LogFileEntry *)malloc(sizeof(LogFileEntry))) == NULL) { ++ print_error("malloc()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ entry->fh = file; ++ strncpy(entry->name, conf->name, 256); ++ entry->id = counter; ++ ++ push_ctnr(LogFiles, entry); ++ ++ fprintf(CurrentClient, "%lu\n", counter); ++ counter++; ++ ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "0\n"); ++} ++ ++void unregisterLogFile(const char* cmd) ++{ ++ unsigned long id; ++ int i; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ fclose(entry->fh); ++ free(remove_ctnr(LogFiles, i)); ++ fprintf(CurrentClient, "\n"); ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printRegistered(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ fprintf(CurrentClient, "%s:%lu\n", entry->name, entry->id); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} diff --git a/x11/kdebase2/files/patch-logfile.h b/x11/kdebase2/files/patch-logfile.h new file mode 100644 index 000000000000..69b8d6ed1ca6 --- /dev/null +++ b/x11/kdebase2/files/patch-logfile.h @@ -0,0 +1,40 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.h Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,37 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _logfile_h_ ++#define _logfile_h_ ++ ++void initLogFile(void); ++void exitLogFile(void); ++ ++void printLogFile(const char* cmd); ++void printLogFileInfo(const char* cmd); ++ ++void registerLogFile(const char* cmd); ++void unregisterLogFile(const char* cmd); ++ ++/* debug command */ ++void printRegistered(const char* cmd); ++ ++#endif diff --git a/x11/kdebase2/files/patch-netdev.c b/x11/kdebase2/files/patch-netdev.c new file mode 100644 index 000000000000..2c0f473ebbcf --- /dev/null +++ b/x11/kdebase2/files/patch-netdev.c @@ -0,0 +1,322 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.c Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,319 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <sys/socket.h> ++#include <net/if.h> ++#include <net/if_mib.h> ++#include <stdio.h> ++#include <string.h> ++#include <sys/sysctl.h> ++#include <sys/time.h> ++#include <sys/types.h> ++#include <unistd.h> ++ ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "netdev.h" ++ ++ ++typedef struct { ++ char name[32]; ++ u_long recBytes; ++ u_long recPacks; ++ u_long recErrs; ++ u_long recDrop; ++ u_long recMulticast; ++ u_long sentBytes; ++ u_long sentPacks; ++ u_long sentErrs; ++ u_long sentMulticast; ++ u_long sentColls; ++} NetDevInfo; ++ ++#define MAXNETDEVS 64 ++static NetDevInfo NetDevs[MAXNETDEVS]; ++static int NetDevCnt = 0; ++ ++char **parseCommand(const char *cmd) ++{ ++ char tmp_cmd[1024]; ++ char *begin; ++ static char sensor[100]; ++ static char interface[100]; ++ static char* retval[2]; ++ ++ strncpy(tmp_cmd, cmd, 1024); ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin++; ++ strcpy(sensor, begin); ++ retval[1] = sensor; ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin = rindex(tmp_cmd, '/'); ++ begin++; ++ strcpy(interface, begin); ++ retval[0] = interface; ++ ++ return retval; ++} ++ ++int numActivIfaces(void) ++{ ++ int counter = 0; ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) ++ counter++; ++ } ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ updateNetDev(); ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ } ++} ++ ++void exitNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ removeMonitor(monitor); ++ } ++} ++ ++void updateNetDev(void) ++{ ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ NetDevCnt = 0; ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) { ++ strncpy(NetDevs[NetDevCnt].name, ifmd.ifmd_name, 32); ++ NetDevs[NetDevCnt].recBytes = ifmd.ifmd_data.ifi_ibytes - NetDevs[NetDevCnt].recBytes; ++ NetDevs[NetDevCnt].recPacks = ifmd.ifmd_data.ifi_ipackets - NetDevs[NetDevCnt].recPacks; ++ NetDevs[NetDevCnt].recErrs = ifmd.ifmd_data.ifi_ierrors - NetDevs[NetDevCnt].recErrs; ++ NetDevs[NetDevCnt].recDrop = ifmd.ifmd_data.ifi_iqdrops - NetDevs[NetDevCnt].recDrop; ++ NetDevs[NetDevCnt].recMulticast = ifmd.ifmd_data.ifi_imcasts - NetDevs[NetDevCnt].recMulticast; ++ NetDevs[NetDevCnt].sentBytes = ifmd.ifmd_data.ifi_obytes - NetDevs[NetDevCnt].sentBytes; ++ NetDevs[NetDevCnt].sentPacks = ifmd.ifmd_data.ifi_opackets - NetDevs[NetDevCnt].sentPacks; ++ NetDevs[NetDevCnt].sentErrs = ifmd.ifmd_data.ifi_oerrors - NetDevs[NetDevCnt].sentErrs; ++ NetDevs[NetDevCnt].sentMulticast = ifmd.ifmd_data.ifi_omcasts - NetDevs[NetDevCnt].sentMulticast; ++ NetDevs[NetDevCnt].sentColls = ifmd.ifmd_data.ifi_collisions - NetDevs[NetDevCnt].sentColls; ++ NetDevCnt++; ++ } ++ } ++} ++ ++void checkNetDev(void) ++{ ++ if (numActivIfaces() != NetDevCnt) { ++ /* interface has been added or removed ++ so we do a reset */ ++ exitNetDev(); ++ initNetDev(); ++ } ++} ++ ++void printNetDevRecBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recErrs); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recDrop); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recMulticast); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevRecBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Received Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Received Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Receiver Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "Receiver Drops\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Received Multicast Packets\t0\t0\t1/s\n"); ++} ++ ++void printNetDevSentBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentErrs); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentMulticast); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentColls); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevSentBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Sent Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Sent Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Transmitter Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Sent Multicast Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "Transmitter Collisions\t0\t0\t1/s\n"); ++} diff --git a/x11/kdebase2/files/patch-netdev.h b/x11/kdebase2/files/patch-netdev.h new file mode 100644 index 000000000000..3c291f85dc9e --- /dev/null +++ b/x11/kdebase2/files/patch-netdev.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.h Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _netdev_h_ ++#define _netdev_h_ ++ ++void initNetDev(void); ++void exitNetDev(void); ++ ++void updateNetDev(void); ++void checkNetDev(void); ++ ++void printNetDevRecBytes(const char* cmd); ++void printNetDevRecBytesInfo(const char* cmd); ++void printNetDevSentBytes(const char* cmd); ++void printNetDevSentBytesInfo(const char* cmd); ++ ++#endif diff --git a/x11/kdebase2/pkg-plist b/x11/kdebase2/pkg-plist index 5466b74bfbc6..3b9d7855dd8d 100644 --- a/x11/kdebase2/pkg-plist +++ b/x11/kdebase2/pkg-plist @@ -229,7 +229,6 @@ lib/kde2/libkcm_kwinoptions.la lib/kde2/libkcm_kwinoptions.so lib/kde2/libkcm_launch.la lib/kde2/libkcm_launch.so -lib/kde2/libkcm_launch.so.0 lib/kde2/libkcm_locale.la lib/kde2/libkcm_locale.so lib/kde2/libkcm_midi.la @@ -277,7 +276,6 @@ lib/kde2/libkonqsidebartree_dirtree.la lib/kde2/libkonqsidebartree_dirtree.so lib/kde2/libkonqsidebartree_history.la lib/kde2/libkonqsidebartree_history.so -lib/kde2/libkonqsidebartree_history.so.0 lib/kde2/libkonqsound.la lib/kde2/libkonqsound.so lib/kde2/libkonqtree.la @@ -1146,9 +1144,6 @@ share/apps/konsole/konsole_part.rc share/apps/konsole/linux.desktop share/apps/konsole/linux.keytab share/apps/konsole/mc.desktop -share/apps/konsole/pics/brightness.png -share/apps/konsole/pics/colourness.png -share/apps/konsole/pics/contrast.png share/apps/konsole/shell.desktop share/apps/konsole/su.desktop share/apps/konsole/sumc.desktop @@ -1284,8 +1279,14 @@ share/config/imsmaprc share/config/interferencerc share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 +share/config/kdm/Xaccess +share/config/kdm/Xreset +share/config/kdm/Xservers +share/config/kdm/Xsession +share/config/kdm/Xsetup +share/config/kdm/Xstartup +share/config/kdm/Xwilling share/config/kdm/kdmrc -share/config/kdm/README share/config/klipperrc share/config/konqsidebartng.rc share/config/konsolerc @@ -2158,6 +2159,8 @@ share/locale/l10n/hr/entry.desktop share/locale/l10n/hr/flag.png share/locale/l10n/hu/entry.desktop share/locale/l10n/hu/flag.png +share/locale/l10n/id/entry.desktop +share/locale/l10n/id/flag.png share/locale/l10n/ie/entry.desktop share/locale/l10n/ie/flag.png share/locale/l10n/il/entry.desktop @@ -2426,18 +2429,12 @@ share/wallpapers/simple_wallpaper.jpg share/wallpapers/sunday_brunch.jpg share/wallpapers/vegetative_fog.jpg @dirrm share/wallpapers -@exec mkdir %D/share/templates/.source/emptydir -@exec chmod 644 %D/share/templates/.source/emptydir -@unexec rmdir %D/share/templates/.source/emptydir +@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds -@dirrm share/servicetypes @dirrm share/services/useragentstrings @dirrm share/services/searchproviders -@dirrm share/services/kded -@dirrm share/services -@dirrm share/mimelnk/application @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ve @dirrm share/locale/l10n/vc @@ -2479,6 +2476,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/is @dirrm share/locale/l10n/il @dirrm share/locale/l10n/ie +@dirrm share/locale/l10n/id @dirrm share/locale/l10n/hu @dirrm share/locale/l10n/hr @dirrm share/locale/l10n/hn @@ -2512,22 +2510,13 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/ag @dirrm share/locale/l10n/C @dirrm share/locale/l10n -@dirrm share/locale/C -@dirrm share/locale @dirrm share/icons/locolor/32x32/apps @dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/filesystems @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32/actions -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/16x16/filesystems -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @@ -2552,9 +2541,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook -@dirrm share/doc/HTML/en @dirrm share/config/kdm -@dirrm share/config @dirrm share/autostart @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2572,7 +2559,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer -@dirrm share/apps/konsole/pics @dirrm share/apps/konsole @dirrm share/apps/konqueror/tiles @dirrm share/apps/konqueror/profiles @@ -2658,7 +2644,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol -@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2755,6 +2740,5 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/applnk/Applications @dirrm share/applnk/.hidden @dirrm share/applnk -@dirrm lib/kde2 @dirrm include/kwin @dirrm include/kate diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index ee69d6cb95bb..f8e6c70e010f 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -6,8 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2.2 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -15,6 +14,9 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -27,8 +29,13 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --without-ldap \ - --disable-closure + --without-ldap --disable-closure --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes .include <bsd.port.pre.mk> @@ -56,6 +63,15 @@ post-extract: @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/libkonq/Makefile.in ${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index f0d9e99b49aa..251c4afefe28 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a +MD5 (KDE/kdebase-2.2.2.tar.bz2) = 39635e42056ab2afb8e6f2ff761eea38 diff --git a/x11/kdebase3/files/patch-apm.c b/x11/kdebase3/files/patch-apm.c new file mode 100644 index 000000000000..08925da1dee5 --- /dev/null +++ b/x11/kdebase3/files/patch-apm.c @@ -0,0 +1,101 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.c Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,98 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <machine/apm_bios.h> ++#include <stdio.h> ++ ++#include "Command.h" ++#include "apm.h" ++#include "ksysguardd.h" ++ ++static int ApmFD, BattFill, BattTime; ++ ++#define APMDEV "/dev/apm" ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initApm(void) ++{ ++ if ((ApmFD = open(APMDEV, O_RDONLY)) < 0) ++ return; ++ ++ if (updateApm() < 0) ++ return; ++ ++ registerMonitor("apm/batterycharge", "integer", printApmBatFill, ++ printApmBatFillInfo); ++ registerMonitor("apm/remainingtime", "integer", printApmBatTime, ++ printApmBatTimeInfo); ++} ++ ++void ++exitApm(void) ++{ ++ removeMonitor("apm/batterycharge"); ++ removeMonitor("apm/remainingtime"); ++ ++ close(ApmFD); ++} ++ ++int ++updateApm(void) ++{ ++ struct apm_info info; ++ int retval; ++ ++ retval = ioctl(ApmFD, APMIO_GETINFO, &info); ++ ++ BattFill = info.ai_batt_life; ++ BattTime = info.ai_batt_time; ++ ++ return retval; ++} ++ ++void ++printApmBatFill(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattFill); ++} ++ ++void ++printApmBatFillInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Battery charge\t0\t100\t%%\n"); ++} ++ ++void ++printApmBatTime(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattTime); ++} ++ ++void ++printApmBatTimeInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); ++} diff --git a/x11/kdebase3/files/patch-apm.h b/x11/kdebase3/files/patch-apm.h new file mode 100644 index 000000000000..73e509bdd61b --- /dev/null +++ b/x11/kdebase3/files/patch-apm.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.h Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _apm_h_ ++#define _apm_h_ ++ ++void initApm(void); ++void exitApm(void); ++int updateApm(void); ++ ++void printApmBatFill(const char*); ++void printApmBatFillInfo(const char*); ++void printApmBatTime(const char*); ++void printApmBatTimeInfo(const char*); ++ ++#endif diff --git a/x11/kdebase3/files/patch-conf.c b/x11/kdebase3/files/patch-conf.c new file mode 100644 index 000000000000..a4de97379b10 --- /dev/null +++ b/x11/kdebase3/files/patch-conf.c @@ -0,0 +1,136 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.c Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,133 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.c,v 1.3 2001/11/05 23:24:19 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++ ++CONTAINER LogFileList = 0; ++CONTAINER SensorList = 0; ++ ++void parseConfigFile(const char *filename) ++{ ++ FILE* config; ++ char line[2048]; ++ char *begin, *token, *tmp, *confSensor; ++ ConfigLogFile *confLog; ++ ++ ++ if (LogFileList) ++ destr_ctnr(LogFileList, free); ++ ++ if (SensorList) ++ destr_ctnr(SensorList, free); ++ ++ LogFileList = new_ctnr(CT_DLL); ++ SensorList = new_ctnr(CT_DLL); ++ ++ if ((config = fopen(filename, "r")) == NULL) { ++ log_error("can't open config file '%s'", filename); ++ ++ /* if we can't open a config file we have to add the ++ available sensors manually ++ */ ++ ++ confSensor = strdup("ProcessList"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Memory"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Stat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetDev"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("CpuInfo"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LoadAvg"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("DiskStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LogFile"); ++ push_ctnr(SensorList, confSensor); ++ ++ return; ++ } ++ ++ while (fgets(line, sizeof(line), config) != NULL) { ++ if ((line[0] == '#') || (strlen(line) == 0)) { ++ continue; ++ } ++ ++ if (strchr(line, '#')) ++ *(strchr(line, '#')) = '\0'; ++ ++ if (line[strlen(line) - 1] == '\n') ++ line[strlen(line) - 1] = '\0'; ++ ++ if (!strncmp(line, "LogFiles", 8)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ if ((confLog = (ConfigLogFile *)malloc(sizeof(ConfigLogFile))) == NULL) { ++ log_error("malloc() no free memory avail"); ++ continue; ++ } ++ confLog->name = strdup(token); ++ tmp = strchr(confLog->name, ':'); ++ *tmp = '\0'; ++ confLog->path = tmp; ++ confLog->path++; ++ ++ push_ctnr(LogFileList, confLog); ++ } ++ } ++ if (!strncmp(line, "Sensors", 7)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ confSensor = strdup(token); ++ push_ctnr(SensorList, confSensor); ++ } ++ } ++ } ++ ++ fclose(config); ++} ++ ++int sensorAvailable(const char *sensor) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(SensorList); i++) { ++ char* name = get_ctnr(SensorList, i); ++ if (!strcmp(name, sensor)) ++ return 1; ++ } ++ ++ return 0; ++} diff --git a/x11/kdebase3/files/patch-conf.h b/x11/kdebase3/files/patch-conf.h new file mode 100644 index 000000000000..8aba2e520205 --- /dev/null +++ b/x11/kdebase3/files/patch-conf.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.h Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _conf_h_ ++#define _conf_h_ ++ ++typedef struct { ++ char *name; ++ char *path; ++} ConfigLogFile; ++ ++void parseConfigFile(const char *filename); ++ ++int sensorAvailable(const char* sensor); ++ ++#endif diff --git a/x11/kdebase3/files/patch-diskstat.c b/x11/kdebase3/files/patch-diskstat.c new file mode 100644 index 000000000000..5535e580a673 --- /dev/null +++ b/x11/kdebase3/files/patch-diskstat.c @@ -0,0 +1,260 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.c Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,257 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/param.h> ++#include <sys/stat.h> ++#include <sys/ucred.h> ++#include <sys/mount.h> ++#include <time.h> ++#include <unistd.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "diskstat.h" ++#include "ksysguardd.h" ++ ++typedef struct { ++ char device[256]; ++ char mntpnt[256]; ++ long blocks; ++ long bfree; ++ long bused; ++ int bused_percent; ++} DiskInfo; ++ ++static CONTAINER DiskStatList = 0; ++ ++char *getMntPnt(const char *cmd) ++{ ++ static char device[1024]; ++ char *ptr; ++ ++ memset(device, 0, sizeof(device)); ++ sscanf(cmd, "partitions%1024s", device); ++ ++ ptr = (char *)rindex(device, '/'); ++ *ptr = '\0'; ++ ++ return (char *)device; ++} ++ ++int numMntPnt(void) ++{ ++ struct statfs *fs_info; ++ int i, n, counter = 0; ++ ++ n = getmntinfo(&fs_info, MNT_WAIT); ++ for (i = 0; i < n; i++) ++ if (strcmp(fs_info[i].f_fstypename, "procfs") && strcmp(fs_info[i].f_fstypename, "swap") && strcmp(fs_info[i].f_fstypename, "devfs")) ++ counter++; ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initDiskStat(void) ++{ ++ char monitor[1024]; ++ int i; ++ ++ DiskStatList = new_ctnr(CT_DLL); ++ ++ updateDiskStat(); ++ ++ registerMonitor("partitions/list", "listview", printDiskStat, printDiskStatInfo); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatUsed, printDiskStatUsedInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatFree, printDiskStatFreeInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatPercent, printDiskStatPercentInfo); ++ } ++} ++ ++void checkDiskStat(void) ++{ ++ if (numMntPnt() != level_ctnr(DiskStatList)) { ++ /* a filesystem was mounted or unmounted ++ so we do a reset */ ++ exitDiskStat(); ++ initDiskStat(); ++ } ++} ++ ++void exitDiskStat(void) ++{ ++ DiskInfo *disk_info; ++ char monitor[1024]; ++ int i; ++ ++ removeMonitor("partitions/list"); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ disk_info = remove_ctnr(DiskStatList, i--); ++ ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ removeMonitor(monitor); ++ ++ free(disk_info); ++ } ++ ++ if (DiskStatList) ++ destr_ctnr(DiskStatList, free); ++} ++ ++int updateDiskStat(void) ++{ ++ struct statfs *fs_info; ++ struct statfs fs; ++ float percent; ++ int i, mntcount; ++ DiskInfo *disk_info; ++ ++ /* let's hope there is no difference between the DiskStatList and ++ the number of mounted filesystems */ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) ++ free(remove_ctnr(DiskStatList, i--)); ++ ++ mntcount = getmntinfo(&fs_info, MNT_WAIT); ++ ++ for (i = 0; i < mntcount; i++) { ++ fs = fs_info[i]; ++ if (strcmp(fs.f_fstypename, "procfs") && strcmp(fs.f_fstypename, "devfs") && strcmp(fs.f_fstypename, "devfs")) { ++ percent = (((float)fs.f_blocks - (float)fs.f_bfree)/(float)fs.f_blocks); ++ percent = percent * 100; ++ if ((disk_info = (DiskInfo *)malloc(sizeof(DiskInfo))) == NULL) { ++ continue; ++ } ++ memset(disk_info, 0, sizeof(DiskInfo)); ++ strncpy(disk_info->device, fs.f_mntfromname, 255); ++ if (!strcmp(fs.f_mntonname, "/")) { ++ strncpy(disk_info->mntpnt, "/root", 6); ++ } else { ++ strncpy(disk_info->mntpnt, fs.f_mntonname, 255); ++ } ++ disk_info->blocks = fs.f_blocks; ++ disk_info->bfree = fs.f_bfree; ++ disk_info->bused = (fs.f_blocks - fs.f_bfree); ++ disk_info->bused_percent = (int)percent; ++ ++ push_ctnr(DiskStatList, disk_info); ++ } ++ } ++ ++ return 0; ++} ++ ++void printDiskStat(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%d\t%s\n", ++ disk_info->device, ++ disk_info->blocks, ++ disk_info->bused, ++ disk_info->bfree, ++ disk_info->bused_percent, ++ disk_info->mntpnt); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Device\tBlocks\tUsed\tAvailable\tUsed %%\tMountPoint\n"); ++} ++ ++void printDiskStatUsed(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bused); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatUsedInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatFree(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bfree); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatFreeInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Free Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatPercent(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%d\n", disk_info->bused_percent); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatPercentInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t100\t%%\n"); ++} diff --git a/x11/kdebase3/files/patch-diskstat.h b/x11/kdebase3/files/patch-diskstat.h new file mode 100644 index 000000000000..3b5bf11b89c7 --- /dev/null +++ b/x11/kdebase3/files/patch-diskstat.h @@ -0,0 +1,44 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.h Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,41 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _diskstat_h_ ++#define _diskstat_h_ ++ ++void initDiskStat(void); ++void exitDiskStat(void); ++ ++int updateDiskStat(void); ++void checkDiskStat(void); ++ ++void printDiskStat(const char* cmd); ++void printDiskStatInfo(const char* cmd); ++ ++void printDiskStatUsed(const char* cmd); ++void printDiskStatUsedInfo(const char* cmd); ++void printDiskStatFree(const char* cmd); ++void printDiskStatFreeInfo(const char* cmd); ++void printDiskStatPercent(const char* cmd); ++void printDiskStatPercentInfo(const char* cmd); ++ ++#endif diff --git a/x11/kdebase3/files/patch-ksysguardd.c b/x11/kdebase3/files/patch-ksysguardd.c new file mode 100644 index 000000000000..940aa4d327a5 --- /dev/null +++ b/x11/kdebase3/files/patch-ksysguardd.c @@ -0,0 +1,15 @@ +--- ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 02:01:46 1.5 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 06:16:15 1.6 +@@ -17,9 +17,11 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +- $Id: ksysguardd.c,v 1.2.6.1 2001/11/08 10:48:51 tokoe Exp $ ++ $Id: ksysguardd.c,v 1.6 2001/11/17 06:16:15 waba Exp $ + */ + ++#include <config.h> ++ + #include <ctype.h> + #include <fcntl.h> + #include <netdb.h> diff --git a/x11/kdebase3/files/patch-ksysguardd.h b/x11/kdebase3/files/patch-ksysguardd.h new file mode 100644 index 000000000000..1545b83d39d7 --- /dev/null +++ b/x11/kdebase3/files/patch-ksysguardd.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.h Mon Nov 19 17:07:38 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 1999-2001 Chris Schlaeger <cs@kde.org> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: ksysguardd.h,v 1.2 2001/11/08 10:52:55 tokoe Exp $ ++*/ ++ ++#ifndef _ksysguardd_h_ ++#define _ksysguardd_h_ ++ ++#include <stdio.h> ++ ++extern int QuitApp; ++extern int RunAsDaemon; ++extern FILE* CurrentClient; ++ ++void updateModules(void); ++void checkModules(void); ++ ++#endif diff --git a/x11/kdebase3/files/patch-loadavg.c b/x11/kdebase3/files/patch-loadavg.c new file mode 100644 index 000000000000..ced78fa5ad68 --- /dev/null +++ b/x11/kdebase3/files/patch-loadavg.c @@ -0,0 +1,100 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.c Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,97 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "loadavg.h" ++ ++static double LoadAvg[3]; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initLoadAvg(void) ++{ ++ if (updateLoadAvg() < 0) ++ return; ++ ++ registerMonitor("cpu/loadavg1", "float", printLoadAvg1, ++ printLoadAvg1Info); ++ registerMonitor("cpu/loadavg5", "float", printLoadAvg5, ++ printLoadAvg5Info); ++ registerMonitor("cpu/loadavg15", "float", printLoadAvg15, ++ printLoadAvg15Info); ++} ++ ++void ++exitLoadAvg(void) ++{ ++ removeMonitor("cpu/loadavg1"); ++ removeMonitor("cpu/loadavg5"); ++ removeMonitor("cpu/loadavg15"); ++} ++ ++int ++updateLoadAvg(void) ++{ ++ return getloadavg(LoadAvg, 3); ++} ++ ++void ++printLoadAvg1(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[0]); ++} ++ ++void ++printLoadAvg1Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 1 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg5(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[1]); ++} ++ ++void ++printLoadAvg5Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 5 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg15(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[2]); ++} ++ ++void ++printLoadAvg15Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 15 min\t0\t0\t\n"); ++} diff --git a/x11/kdebase3/files/patch-loadavg.h b/x11/kdebase3/files/patch-loadavg.h new file mode 100644 index 000000000000..cdc680cbd492 --- /dev/null +++ b/x11/kdebase3/files/patch-loadavg.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.h Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _loadavg_h_ ++#define _loadavg_h_ ++ ++void initLoadAvg(void); ++void exitLoadAvg(void); ++int updateLoadAvg(void); ++ ++void printLoadAvg1(const char*); ++void printLoadAvg1Info(const char*); ++void printLoadAvg5(const char*); ++void printLoadAvg5Info(const char*); ++void printLoadAvg15(const char*); ++void printLoadAvg15Info(const char*); ++ ++#endif diff --git a/x11/kdebase3/files/patch-logfile.c b/x11/kdebase3/files/patch-logfile.c new file mode 100644 index 000000000000..5fd3def1ae6b --- /dev/null +++ b/x11/kdebase3/files/patch-logfile.c @@ -0,0 +1,184 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.c Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,181 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++#include "ksysguardd.h" ++#include "logfile.h" ++ ++static CONTAINER LogFiles = 0; ++static unsigned long counter = 1; ++ ++typedef struct { ++ char name[256]; ++ FILE* fh; ++ unsigned long id; ++} LogFileEntry; ++ ++extern CONTAINER LogFileList; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void initLogFile(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ registerCommand("logfile_register", registerLogFile); ++ registerCommand("logfile_unregister", unregisterLogFile); ++ registerCommand("logfile_registered", printRegistered); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) ++ { ++ FILE* fp; ++ ConfigLogFile *entry = get_ctnr(LogFileList, i); ++ /* register the log file if we can actually read the file. */ ++ if ((fp = fopen(entry->path, "r")) != NULL) ++ { ++ fclose(fp); ++ snprintf(monitor, 1024, "logfiles/%s", entry->name); ++ registerMonitor(monitor, "logfile", printLogFile, ++ printLogFileInfo); ++ } ++ } ++ ++ LogFiles = new_ctnr(CT_DLL); ++} ++ ++void exitLogFile(void) ++{ ++ if (LogFiles) ++ destr_ctnr(LogFiles, free); ++} ++ ++void printLogFile(const char* cmd) ++{ ++ char line[1024]; ++ unsigned long id; ++ int i; ++ char ch; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ while (fgets(line, sizeof(line), entry->fh) != NULL) { ++ fprintf(CurrentClient, "%s", line); ++ } ++ clearerr(entry->fh); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printLogFileInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "LogFile\n"); ++} ++ ++void registerLogFile(const char* cmd) ++{ ++ char name[256]; ++ FILE* file; ++ LogFileEntry *entry; ++ int i; ++ ++ memset(name, 0, sizeof(name)); ++ sscanf(cmd, "%*s %256s", name); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) { ++ ConfigLogFile *conf = get_ctnr(LogFileList, i); ++ if (!strcmp(conf->name, name)) { ++ if ((file = fopen(conf->path, "r")) == NULL) { ++ print_error("fopen()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ fseek(file, 0, SEEK_END); ++ ++ if ((entry = (LogFileEntry *)malloc(sizeof(LogFileEntry))) == NULL) { ++ print_error("malloc()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ entry->fh = file; ++ strncpy(entry->name, conf->name, 256); ++ entry->id = counter; ++ ++ push_ctnr(LogFiles, entry); ++ ++ fprintf(CurrentClient, "%lu\n", counter); ++ counter++; ++ ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "0\n"); ++} ++ ++void unregisterLogFile(const char* cmd) ++{ ++ unsigned long id; ++ int i; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ fclose(entry->fh); ++ free(remove_ctnr(LogFiles, i)); ++ fprintf(CurrentClient, "\n"); ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printRegistered(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ fprintf(CurrentClient, "%s:%lu\n", entry->name, entry->id); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} diff --git a/x11/kdebase3/files/patch-logfile.h b/x11/kdebase3/files/patch-logfile.h new file mode 100644 index 000000000000..69b8d6ed1ca6 --- /dev/null +++ b/x11/kdebase3/files/patch-logfile.h @@ -0,0 +1,40 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.h Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,37 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _logfile_h_ ++#define _logfile_h_ ++ ++void initLogFile(void); ++void exitLogFile(void); ++ ++void printLogFile(const char* cmd); ++void printLogFileInfo(const char* cmd); ++ ++void registerLogFile(const char* cmd); ++void unregisterLogFile(const char* cmd); ++ ++/* debug command */ ++void printRegistered(const char* cmd); ++ ++#endif diff --git a/x11/kdebase3/files/patch-netdev.c b/x11/kdebase3/files/patch-netdev.c new file mode 100644 index 000000000000..2c0f473ebbcf --- /dev/null +++ b/x11/kdebase3/files/patch-netdev.c @@ -0,0 +1,322 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.c Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,319 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <sys/socket.h> ++#include <net/if.h> ++#include <net/if_mib.h> ++#include <stdio.h> ++#include <string.h> ++#include <sys/sysctl.h> ++#include <sys/time.h> ++#include <sys/types.h> ++#include <unistd.h> ++ ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "netdev.h" ++ ++ ++typedef struct { ++ char name[32]; ++ u_long recBytes; ++ u_long recPacks; ++ u_long recErrs; ++ u_long recDrop; ++ u_long recMulticast; ++ u_long sentBytes; ++ u_long sentPacks; ++ u_long sentErrs; ++ u_long sentMulticast; ++ u_long sentColls; ++} NetDevInfo; ++ ++#define MAXNETDEVS 64 ++static NetDevInfo NetDevs[MAXNETDEVS]; ++static int NetDevCnt = 0; ++ ++char **parseCommand(const char *cmd) ++{ ++ char tmp_cmd[1024]; ++ char *begin; ++ static char sensor[100]; ++ static char interface[100]; ++ static char* retval[2]; ++ ++ strncpy(tmp_cmd, cmd, 1024); ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin++; ++ strcpy(sensor, begin); ++ retval[1] = sensor; ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin = rindex(tmp_cmd, '/'); ++ begin++; ++ strcpy(interface, begin); ++ retval[0] = interface; ++ ++ return retval; ++} ++ ++int numActivIfaces(void) ++{ ++ int counter = 0; ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) ++ counter++; ++ } ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ updateNetDev(); ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ } ++} ++ ++void exitNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ removeMonitor(monitor); ++ } ++} ++ ++void updateNetDev(void) ++{ ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ NetDevCnt = 0; ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) { ++ strncpy(NetDevs[NetDevCnt].name, ifmd.ifmd_name, 32); ++ NetDevs[NetDevCnt].recBytes = ifmd.ifmd_data.ifi_ibytes - NetDevs[NetDevCnt].recBytes; ++ NetDevs[NetDevCnt].recPacks = ifmd.ifmd_data.ifi_ipackets - NetDevs[NetDevCnt].recPacks; ++ NetDevs[NetDevCnt].recErrs = ifmd.ifmd_data.ifi_ierrors - NetDevs[NetDevCnt].recErrs; ++ NetDevs[NetDevCnt].recDrop = ifmd.ifmd_data.ifi_iqdrops - NetDevs[NetDevCnt].recDrop; ++ NetDevs[NetDevCnt].recMulticast = ifmd.ifmd_data.ifi_imcasts - NetDevs[NetDevCnt].recMulticast; ++ NetDevs[NetDevCnt].sentBytes = ifmd.ifmd_data.ifi_obytes - NetDevs[NetDevCnt].sentBytes; ++ NetDevs[NetDevCnt].sentPacks = ifmd.ifmd_data.ifi_opackets - NetDevs[NetDevCnt].sentPacks; ++ NetDevs[NetDevCnt].sentErrs = ifmd.ifmd_data.ifi_oerrors - NetDevs[NetDevCnt].sentErrs; ++ NetDevs[NetDevCnt].sentMulticast = ifmd.ifmd_data.ifi_omcasts - NetDevs[NetDevCnt].sentMulticast; ++ NetDevs[NetDevCnt].sentColls = ifmd.ifmd_data.ifi_collisions - NetDevs[NetDevCnt].sentColls; ++ NetDevCnt++; ++ } ++ } ++} ++ ++void checkNetDev(void) ++{ ++ if (numActivIfaces() != NetDevCnt) { ++ /* interface has been added or removed ++ so we do a reset */ ++ exitNetDev(); ++ initNetDev(); ++ } ++} ++ ++void printNetDevRecBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recErrs); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recDrop); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recMulticast); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevRecBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Received Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Received Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Receiver Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "Receiver Drops\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Received Multicast Packets\t0\t0\t1/s\n"); ++} ++ ++void printNetDevSentBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentErrs); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentMulticast); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentColls); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevSentBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Sent Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Sent Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Transmitter Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Sent Multicast Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "Transmitter Collisions\t0\t0\t1/s\n"); ++} diff --git a/x11/kdebase3/files/patch-netdev.h b/x11/kdebase3/files/patch-netdev.h new file mode 100644 index 000000000000..3c291f85dc9e --- /dev/null +++ b/x11/kdebase3/files/patch-netdev.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.h Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _netdev_h_ ++#define _netdev_h_ ++ ++void initNetDev(void); ++void exitNetDev(void); ++ ++void updateNetDev(void); ++void checkNetDev(void); ++ ++void printNetDevRecBytes(const char* cmd); ++void printNetDevRecBytesInfo(const char* cmd); ++void printNetDevSentBytes(const char* cmd); ++void printNetDevSentBytesInfo(const char* cmd); ++ ++#endif diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist index 5466b74bfbc6..3b9d7855dd8d 100644 --- a/x11/kdebase3/pkg-plist +++ b/x11/kdebase3/pkg-plist @@ -229,7 +229,6 @@ lib/kde2/libkcm_kwinoptions.la lib/kde2/libkcm_kwinoptions.so lib/kde2/libkcm_launch.la lib/kde2/libkcm_launch.so -lib/kde2/libkcm_launch.so.0 lib/kde2/libkcm_locale.la lib/kde2/libkcm_locale.so lib/kde2/libkcm_midi.la @@ -277,7 +276,6 @@ lib/kde2/libkonqsidebartree_dirtree.la lib/kde2/libkonqsidebartree_dirtree.so lib/kde2/libkonqsidebartree_history.la lib/kde2/libkonqsidebartree_history.so -lib/kde2/libkonqsidebartree_history.so.0 lib/kde2/libkonqsound.la lib/kde2/libkonqsound.so lib/kde2/libkonqtree.la @@ -1146,9 +1144,6 @@ share/apps/konsole/konsole_part.rc share/apps/konsole/linux.desktop share/apps/konsole/linux.keytab share/apps/konsole/mc.desktop -share/apps/konsole/pics/brightness.png -share/apps/konsole/pics/colourness.png -share/apps/konsole/pics/contrast.png share/apps/konsole/shell.desktop share/apps/konsole/su.desktop share/apps/konsole/sumc.desktop @@ -1284,8 +1279,14 @@ share/config/imsmaprc share/config/interferencerc share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 +share/config/kdm/Xaccess +share/config/kdm/Xreset +share/config/kdm/Xservers +share/config/kdm/Xsession +share/config/kdm/Xsetup +share/config/kdm/Xstartup +share/config/kdm/Xwilling share/config/kdm/kdmrc -share/config/kdm/README share/config/klipperrc share/config/konqsidebartng.rc share/config/konsolerc @@ -2158,6 +2159,8 @@ share/locale/l10n/hr/entry.desktop share/locale/l10n/hr/flag.png share/locale/l10n/hu/entry.desktop share/locale/l10n/hu/flag.png +share/locale/l10n/id/entry.desktop +share/locale/l10n/id/flag.png share/locale/l10n/ie/entry.desktop share/locale/l10n/ie/flag.png share/locale/l10n/il/entry.desktop @@ -2426,18 +2429,12 @@ share/wallpapers/simple_wallpaper.jpg share/wallpapers/sunday_brunch.jpg share/wallpapers/vegetative_fog.jpg @dirrm share/wallpapers -@exec mkdir %D/share/templates/.source/emptydir -@exec chmod 644 %D/share/templates/.source/emptydir -@unexec rmdir %D/share/templates/.source/emptydir +@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds -@dirrm share/servicetypes @dirrm share/services/useragentstrings @dirrm share/services/searchproviders -@dirrm share/services/kded -@dirrm share/services -@dirrm share/mimelnk/application @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ve @dirrm share/locale/l10n/vc @@ -2479,6 +2476,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/is @dirrm share/locale/l10n/il @dirrm share/locale/l10n/ie +@dirrm share/locale/l10n/id @dirrm share/locale/l10n/hu @dirrm share/locale/l10n/hr @dirrm share/locale/l10n/hn @@ -2512,22 +2510,13 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/ag @dirrm share/locale/l10n/C @dirrm share/locale/l10n -@dirrm share/locale/C -@dirrm share/locale @dirrm share/icons/locolor/32x32/apps @dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/filesystems @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32/actions -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/16x16/filesystems -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @@ -2552,9 +2541,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook -@dirrm share/doc/HTML/en @dirrm share/config/kdm -@dirrm share/config @dirrm share/autostart @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2572,7 +2559,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer -@dirrm share/apps/konsole/pics @dirrm share/apps/konsole @dirrm share/apps/konqueror/tiles @dirrm share/apps/konqueror/profiles @@ -2658,7 +2644,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol -@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2755,6 +2740,5 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/applnk/Applications @dirrm share/applnk/.hidden @dirrm share/applnk -@dirrm lib/kde2 @dirrm include/kwin @dirrm include/kate diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index ee69d6cb95bb..f8e6c70e010f 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -6,8 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2.2 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -15,6 +14,9 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -27,8 +29,13 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --without-ldap \ - --disable-closure + --without-ldap --disable-closure --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes .include <bsd.port.pre.mk> @@ -56,6 +63,15 @@ post-extract: @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/libkonq/Makefile.in ${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo index f0d9e99b49aa..251c4afefe28 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/distinfo @@ -1 +1 @@ -MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a +MD5 (KDE/kdebase-2.2.2.tar.bz2) = 39635e42056ab2afb8e6f2ff761eea38 diff --git a/x11/kdebase4-runtime/files/patch-apm.c b/x11/kdebase4-runtime/files/patch-apm.c new file mode 100644 index 000000000000..08925da1dee5 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-apm.c @@ -0,0 +1,101 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.c Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,98 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <machine/apm_bios.h> ++#include <stdio.h> ++ ++#include "Command.h" ++#include "apm.h" ++#include "ksysguardd.h" ++ ++static int ApmFD, BattFill, BattTime; ++ ++#define APMDEV "/dev/apm" ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initApm(void) ++{ ++ if ((ApmFD = open(APMDEV, O_RDONLY)) < 0) ++ return; ++ ++ if (updateApm() < 0) ++ return; ++ ++ registerMonitor("apm/batterycharge", "integer", printApmBatFill, ++ printApmBatFillInfo); ++ registerMonitor("apm/remainingtime", "integer", printApmBatTime, ++ printApmBatTimeInfo); ++} ++ ++void ++exitApm(void) ++{ ++ removeMonitor("apm/batterycharge"); ++ removeMonitor("apm/remainingtime"); ++ ++ close(ApmFD); ++} ++ ++int ++updateApm(void) ++{ ++ struct apm_info info; ++ int retval; ++ ++ retval = ioctl(ApmFD, APMIO_GETINFO, &info); ++ ++ BattFill = info.ai_batt_life; ++ BattTime = info.ai_batt_time; ++ ++ return retval; ++} ++ ++void ++printApmBatFill(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattFill); ++} ++ ++void ++printApmBatFillInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Battery charge\t0\t100\t%%\n"); ++} ++ ++void ++printApmBatTime(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattTime); ++} ++ ++void ++printApmBatTimeInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); ++} diff --git a/x11/kdebase4-runtime/files/patch-apm.h b/x11/kdebase4-runtime/files/patch-apm.h new file mode 100644 index 000000000000..73e509bdd61b --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-apm.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.h Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _apm_h_ ++#define _apm_h_ ++ ++void initApm(void); ++void exitApm(void); ++int updateApm(void); ++ ++void printApmBatFill(const char*); ++void printApmBatFillInfo(const char*); ++void printApmBatTime(const char*); ++void printApmBatTimeInfo(const char*); ++ ++#endif diff --git a/x11/kdebase4-runtime/files/patch-conf.c b/x11/kdebase4-runtime/files/patch-conf.c new file mode 100644 index 000000000000..a4de97379b10 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-conf.c @@ -0,0 +1,136 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.c Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,133 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.c,v 1.3 2001/11/05 23:24:19 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++ ++CONTAINER LogFileList = 0; ++CONTAINER SensorList = 0; ++ ++void parseConfigFile(const char *filename) ++{ ++ FILE* config; ++ char line[2048]; ++ char *begin, *token, *tmp, *confSensor; ++ ConfigLogFile *confLog; ++ ++ ++ if (LogFileList) ++ destr_ctnr(LogFileList, free); ++ ++ if (SensorList) ++ destr_ctnr(SensorList, free); ++ ++ LogFileList = new_ctnr(CT_DLL); ++ SensorList = new_ctnr(CT_DLL); ++ ++ if ((config = fopen(filename, "r")) == NULL) { ++ log_error("can't open config file '%s'", filename); ++ ++ /* if we can't open a config file we have to add the ++ available sensors manually ++ */ ++ ++ confSensor = strdup("ProcessList"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Memory"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Stat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetDev"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("CpuInfo"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LoadAvg"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("DiskStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LogFile"); ++ push_ctnr(SensorList, confSensor); ++ ++ return; ++ } ++ ++ while (fgets(line, sizeof(line), config) != NULL) { ++ if ((line[0] == '#') || (strlen(line) == 0)) { ++ continue; ++ } ++ ++ if (strchr(line, '#')) ++ *(strchr(line, '#')) = '\0'; ++ ++ if (line[strlen(line) - 1] == '\n') ++ line[strlen(line) - 1] = '\0'; ++ ++ if (!strncmp(line, "LogFiles", 8)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ if ((confLog = (ConfigLogFile *)malloc(sizeof(ConfigLogFile))) == NULL) { ++ log_error("malloc() no free memory avail"); ++ continue; ++ } ++ confLog->name = strdup(token); ++ tmp = strchr(confLog->name, ':'); ++ *tmp = '\0'; ++ confLog->path = tmp; ++ confLog->path++; ++ ++ push_ctnr(LogFileList, confLog); ++ } ++ } ++ if (!strncmp(line, "Sensors", 7)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ confSensor = strdup(token); ++ push_ctnr(SensorList, confSensor); ++ } ++ } ++ } ++ ++ fclose(config); ++} ++ ++int sensorAvailable(const char *sensor) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(SensorList); i++) { ++ char* name = get_ctnr(SensorList, i); ++ if (!strcmp(name, sensor)) ++ return 1; ++ } ++ ++ return 0; ++} diff --git a/x11/kdebase4-runtime/files/patch-conf.h b/x11/kdebase4-runtime/files/patch-conf.h new file mode 100644 index 000000000000..8aba2e520205 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-conf.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.h Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _conf_h_ ++#define _conf_h_ ++ ++typedef struct { ++ char *name; ++ char *path; ++} ConfigLogFile; ++ ++void parseConfigFile(const char *filename); ++ ++int sensorAvailable(const char* sensor); ++ ++#endif diff --git a/x11/kdebase4-runtime/files/patch-diskstat.c b/x11/kdebase4-runtime/files/patch-diskstat.c new file mode 100644 index 000000000000..5535e580a673 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-diskstat.c @@ -0,0 +1,260 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.c Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,257 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/param.h> ++#include <sys/stat.h> ++#include <sys/ucred.h> ++#include <sys/mount.h> ++#include <time.h> ++#include <unistd.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "diskstat.h" ++#include "ksysguardd.h" ++ ++typedef struct { ++ char device[256]; ++ char mntpnt[256]; ++ long blocks; ++ long bfree; ++ long bused; ++ int bused_percent; ++} DiskInfo; ++ ++static CONTAINER DiskStatList = 0; ++ ++char *getMntPnt(const char *cmd) ++{ ++ static char device[1024]; ++ char *ptr; ++ ++ memset(device, 0, sizeof(device)); ++ sscanf(cmd, "partitions%1024s", device); ++ ++ ptr = (char *)rindex(device, '/'); ++ *ptr = '\0'; ++ ++ return (char *)device; ++} ++ ++int numMntPnt(void) ++{ ++ struct statfs *fs_info; ++ int i, n, counter = 0; ++ ++ n = getmntinfo(&fs_info, MNT_WAIT); ++ for (i = 0; i < n; i++) ++ if (strcmp(fs_info[i].f_fstypename, "procfs") && strcmp(fs_info[i].f_fstypename, "swap") && strcmp(fs_info[i].f_fstypename, "devfs")) ++ counter++; ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initDiskStat(void) ++{ ++ char monitor[1024]; ++ int i; ++ ++ DiskStatList = new_ctnr(CT_DLL); ++ ++ updateDiskStat(); ++ ++ registerMonitor("partitions/list", "listview", printDiskStat, printDiskStatInfo); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatUsed, printDiskStatUsedInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatFree, printDiskStatFreeInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatPercent, printDiskStatPercentInfo); ++ } ++} ++ ++void checkDiskStat(void) ++{ ++ if (numMntPnt() != level_ctnr(DiskStatList)) { ++ /* a filesystem was mounted or unmounted ++ so we do a reset */ ++ exitDiskStat(); ++ initDiskStat(); ++ } ++} ++ ++void exitDiskStat(void) ++{ ++ DiskInfo *disk_info; ++ char monitor[1024]; ++ int i; ++ ++ removeMonitor("partitions/list"); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ disk_info = remove_ctnr(DiskStatList, i--); ++ ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ removeMonitor(monitor); ++ ++ free(disk_info); ++ } ++ ++ if (DiskStatList) ++ destr_ctnr(DiskStatList, free); ++} ++ ++int updateDiskStat(void) ++{ ++ struct statfs *fs_info; ++ struct statfs fs; ++ float percent; ++ int i, mntcount; ++ DiskInfo *disk_info; ++ ++ /* let's hope there is no difference between the DiskStatList and ++ the number of mounted filesystems */ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) ++ free(remove_ctnr(DiskStatList, i--)); ++ ++ mntcount = getmntinfo(&fs_info, MNT_WAIT); ++ ++ for (i = 0; i < mntcount; i++) { ++ fs = fs_info[i]; ++ if (strcmp(fs.f_fstypename, "procfs") && strcmp(fs.f_fstypename, "devfs") && strcmp(fs.f_fstypename, "devfs")) { ++ percent = (((float)fs.f_blocks - (float)fs.f_bfree)/(float)fs.f_blocks); ++ percent = percent * 100; ++ if ((disk_info = (DiskInfo *)malloc(sizeof(DiskInfo))) == NULL) { ++ continue; ++ } ++ memset(disk_info, 0, sizeof(DiskInfo)); ++ strncpy(disk_info->device, fs.f_mntfromname, 255); ++ if (!strcmp(fs.f_mntonname, "/")) { ++ strncpy(disk_info->mntpnt, "/root", 6); ++ } else { ++ strncpy(disk_info->mntpnt, fs.f_mntonname, 255); ++ } ++ disk_info->blocks = fs.f_blocks; ++ disk_info->bfree = fs.f_bfree; ++ disk_info->bused = (fs.f_blocks - fs.f_bfree); ++ disk_info->bused_percent = (int)percent; ++ ++ push_ctnr(DiskStatList, disk_info); ++ } ++ } ++ ++ return 0; ++} ++ ++void printDiskStat(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%d\t%s\n", ++ disk_info->device, ++ disk_info->blocks, ++ disk_info->bused, ++ disk_info->bfree, ++ disk_info->bused_percent, ++ disk_info->mntpnt); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Device\tBlocks\tUsed\tAvailable\tUsed %%\tMountPoint\n"); ++} ++ ++void printDiskStatUsed(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bused); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatUsedInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatFree(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bfree); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatFreeInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Free Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatPercent(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%d\n", disk_info->bused_percent); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatPercentInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t100\t%%\n"); ++} diff --git a/x11/kdebase4-runtime/files/patch-diskstat.h b/x11/kdebase4-runtime/files/patch-diskstat.h new file mode 100644 index 000000000000..3b5bf11b89c7 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-diskstat.h @@ -0,0 +1,44 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.h Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,41 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _diskstat_h_ ++#define _diskstat_h_ ++ ++void initDiskStat(void); ++void exitDiskStat(void); ++ ++int updateDiskStat(void); ++void checkDiskStat(void); ++ ++void printDiskStat(const char* cmd); ++void printDiskStatInfo(const char* cmd); ++ ++void printDiskStatUsed(const char* cmd); ++void printDiskStatUsedInfo(const char* cmd); ++void printDiskStatFree(const char* cmd); ++void printDiskStatFreeInfo(const char* cmd); ++void printDiskStatPercent(const char* cmd); ++void printDiskStatPercentInfo(const char* cmd); ++ ++#endif diff --git a/x11/kdebase4-runtime/files/patch-ksysguardd.c b/x11/kdebase4-runtime/files/patch-ksysguardd.c new file mode 100644 index 000000000000..940aa4d327a5 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-ksysguardd.c @@ -0,0 +1,15 @@ +--- ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 02:01:46 1.5 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 06:16:15 1.6 +@@ -17,9 +17,11 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +- $Id: ksysguardd.c,v 1.2.6.1 2001/11/08 10:48:51 tokoe Exp $ ++ $Id: ksysguardd.c,v 1.6 2001/11/17 06:16:15 waba Exp $ + */ + ++#include <config.h> ++ + #include <ctype.h> + #include <fcntl.h> + #include <netdb.h> diff --git a/x11/kdebase4-runtime/files/patch-ksysguardd.h b/x11/kdebase4-runtime/files/patch-ksysguardd.h new file mode 100644 index 000000000000..1545b83d39d7 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-ksysguardd.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.h Mon Nov 19 17:07:38 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 1999-2001 Chris Schlaeger <cs@kde.org> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: ksysguardd.h,v 1.2 2001/11/08 10:52:55 tokoe Exp $ ++*/ ++ ++#ifndef _ksysguardd_h_ ++#define _ksysguardd_h_ ++ ++#include <stdio.h> ++ ++extern int QuitApp; ++extern int RunAsDaemon; ++extern FILE* CurrentClient; ++ ++void updateModules(void); ++void checkModules(void); ++ ++#endif diff --git a/x11/kdebase4-runtime/files/patch-loadavg.c b/x11/kdebase4-runtime/files/patch-loadavg.c new file mode 100644 index 000000000000..ced78fa5ad68 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-loadavg.c @@ -0,0 +1,100 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.c Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,97 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "loadavg.h" ++ ++static double LoadAvg[3]; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initLoadAvg(void) ++{ ++ if (updateLoadAvg() < 0) ++ return; ++ ++ registerMonitor("cpu/loadavg1", "float", printLoadAvg1, ++ printLoadAvg1Info); ++ registerMonitor("cpu/loadavg5", "float", printLoadAvg5, ++ printLoadAvg5Info); ++ registerMonitor("cpu/loadavg15", "float", printLoadAvg15, ++ printLoadAvg15Info); ++} ++ ++void ++exitLoadAvg(void) ++{ ++ removeMonitor("cpu/loadavg1"); ++ removeMonitor("cpu/loadavg5"); ++ removeMonitor("cpu/loadavg15"); ++} ++ ++int ++updateLoadAvg(void) ++{ ++ return getloadavg(LoadAvg, 3); ++} ++ ++void ++printLoadAvg1(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[0]); ++} ++ ++void ++printLoadAvg1Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 1 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg5(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[1]); ++} ++ ++void ++printLoadAvg5Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 5 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg15(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[2]); ++} ++ ++void ++printLoadAvg15Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 15 min\t0\t0\t\n"); ++} diff --git a/x11/kdebase4-runtime/files/patch-loadavg.h b/x11/kdebase4-runtime/files/patch-loadavg.h new file mode 100644 index 000000000000..cdc680cbd492 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-loadavg.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.h Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _loadavg_h_ ++#define _loadavg_h_ ++ ++void initLoadAvg(void); ++void exitLoadAvg(void); ++int updateLoadAvg(void); ++ ++void printLoadAvg1(const char*); ++void printLoadAvg1Info(const char*); ++void printLoadAvg5(const char*); ++void printLoadAvg5Info(const char*); ++void printLoadAvg15(const char*); ++void printLoadAvg15Info(const char*); ++ ++#endif diff --git a/x11/kdebase4-runtime/files/patch-logfile.c b/x11/kdebase4-runtime/files/patch-logfile.c new file mode 100644 index 000000000000..5fd3def1ae6b --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-logfile.c @@ -0,0 +1,184 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.c Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,181 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++#include "ksysguardd.h" ++#include "logfile.h" ++ ++static CONTAINER LogFiles = 0; ++static unsigned long counter = 1; ++ ++typedef struct { ++ char name[256]; ++ FILE* fh; ++ unsigned long id; ++} LogFileEntry; ++ ++extern CONTAINER LogFileList; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void initLogFile(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ registerCommand("logfile_register", registerLogFile); ++ registerCommand("logfile_unregister", unregisterLogFile); ++ registerCommand("logfile_registered", printRegistered); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) ++ { ++ FILE* fp; ++ ConfigLogFile *entry = get_ctnr(LogFileList, i); ++ /* register the log file if we can actually read the file. */ ++ if ((fp = fopen(entry->path, "r")) != NULL) ++ { ++ fclose(fp); ++ snprintf(monitor, 1024, "logfiles/%s", entry->name); ++ registerMonitor(monitor, "logfile", printLogFile, ++ printLogFileInfo); ++ } ++ } ++ ++ LogFiles = new_ctnr(CT_DLL); ++} ++ ++void exitLogFile(void) ++{ ++ if (LogFiles) ++ destr_ctnr(LogFiles, free); ++} ++ ++void printLogFile(const char* cmd) ++{ ++ char line[1024]; ++ unsigned long id; ++ int i; ++ char ch; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ while (fgets(line, sizeof(line), entry->fh) != NULL) { ++ fprintf(CurrentClient, "%s", line); ++ } ++ clearerr(entry->fh); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printLogFileInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "LogFile\n"); ++} ++ ++void registerLogFile(const char* cmd) ++{ ++ char name[256]; ++ FILE* file; ++ LogFileEntry *entry; ++ int i; ++ ++ memset(name, 0, sizeof(name)); ++ sscanf(cmd, "%*s %256s", name); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) { ++ ConfigLogFile *conf = get_ctnr(LogFileList, i); ++ if (!strcmp(conf->name, name)) { ++ if ((file = fopen(conf->path, "r")) == NULL) { ++ print_error("fopen()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ fseek(file, 0, SEEK_END); ++ ++ if ((entry = (LogFileEntry *)malloc(sizeof(LogFileEntry))) == NULL) { ++ print_error("malloc()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ entry->fh = file; ++ strncpy(entry->name, conf->name, 256); ++ entry->id = counter; ++ ++ push_ctnr(LogFiles, entry); ++ ++ fprintf(CurrentClient, "%lu\n", counter); ++ counter++; ++ ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "0\n"); ++} ++ ++void unregisterLogFile(const char* cmd) ++{ ++ unsigned long id; ++ int i; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ fclose(entry->fh); ++ free(remove_ctnr(LogFiles, i)); ++ fprintf(CurrentClient, "\n"); ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printRegistered(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ fprintf(CurrentClient, "%s:%lu\n", entry->name, entry->id); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} diff --git a/x11/kdebase4-runtime/files/patch-logfile.h b/x11/kdebase4-runtime/files/patch-logfile.h new file mode 100644 index 000000000000..69b8d6ed1ca6 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-logfile.h @@ -0,0 +1,40 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.h Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,37 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _logfile_h_ ++#define _logfile_h_ ++ ++void initLogFile(void); ++void exitLogFile(void); ++ ++void printLogFile(const char* cmd); ++void printLogFileInfo(const char* cmd); ++ ++void registerLogFile(const char* cmd); ++void unregisterLogFile(const char* cmd); ++ ++/* debug command */ ++void printRegistered(const char* cmd); ++ ++#endif diff --git a/x11/kdebase4-runtime/files/patch-netdev.c b/x11/kdebase4-runtime/files/patch-netdev.c new file mode 100644 index 000000000000..2c0f473ebbcf --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-netdev.c @@ -0,0 +1,322 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.c Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,319 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <sys/socket.h> ++#include <net/if.h> ++#include <net/if_mib.h> ++#include <stdio.h> ++#include <string.h> ++#include <sys/sysctl.h> ++#include <sys/time.h> ++#include <sys/types.h> ++#include <unistd.h> ++ ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "netdev.h" ++ ++ ++typedef struct { ++ char name[32]; ++ u_long recBytes; ++ u_long recPacks; ++ u_long recErrs; ++ u_long recDrop; ++ u_long recMulticast; ++ u_long sentBytes; ++ u_long sentPacks; ++ u_long sentErrs; ++ u_long sentMulticast; ++ u_long sentColls; ++} NetDevInfo; ++ ++#define MAXNETDEVS 64 ++static NetDevInfo NetDevs[MAXNETDEVS]; ++static int NetDevCnt = 0; ++ ++char **parseCommand(const char *cmd) ++{ ++ char tmp_cmd[1024]; ++ char *begin; ++ static char sensor[100]; ++ static char interface[100]; ++ static char* retval[2]; ++ ++ strncpy(tmp_cmd, cmd, 1024); ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin++; ++ strcpy(sensor, begin); ++ retval[1] = sensor; ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin = rindex(tmp_cmd, '/'); ++ begin++; ++ strcpy(interface, begin); ++ retval[0] = interface; ++ ++ return retval; ++} ++ ++int numActivIfaces(void) ++{ ++ int counter = 0; ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) ++ counter++; ++ } ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ updateNetDev(); ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ } ++} ++ ++void exitNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ removeMonitor(monitor); ++ } ++} ++ ++void updateNetDev(void) ++{ ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ NetDevCnt = 0; ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) { ++ strncpy(NetDevs[NetDevCnt].name, ifmd.ifmd_name, 32); ++ NetDevs[NetDevCnt].recBytes = ifmd.ifmd_data.ifi_ibytes - NetDevs[NetDevCnt].recBytes; ++ NetDevs[NetDevCnt].recPacks = ifmd.ifmd_data.ifi_ipackets - NetDevs[NetDevCnt].recPacks; ++ NetDevs[NetDevCnt].recErrs = ifmd.ifmd_data.ifi_ierrors - NetDevs[NetDevCnt].recErrs; ++ NetDevs[NetDevCnt].recDrop = ifmd.ifmd_data.ifi_iqdrops - NetDevs[NetDevCnt].recDrop; ++ NetDevs[NetDevCnt].recMulticast = ifmd.ifmd_data.ifi_imcasts - NetDevs[NetDevCnt].recMulticast; ++ NetDevs[NetDevCnt].sentBytes = ifmd.ifmd_data.ifi_obytes - NetDevs[NetDevCnt].sentBytes; ++ NetDevs[NetDevCnt].sentPacks = ifmd.ifmd_data.ifi_opackets - NetDevs[NetDevCnt].sentPacks; ++ NetDevs[NetDevCnt].sentErrs = ifmd.ifmd_data.ifi_oerrors - NetDevs[NetDevCnt].sentErrs; ++ NetDevs[NetDevCnt].sentMulticast = ifmd.ifmd_data.ifi_omcasts - NetDevs[NetDevCnt].sentMulticast; ++ NetDevs[NetDevCnt].sentColls = ifmd.ifmd_data.ifi_collisions - NetDevs[NetDevCnt].sentColls; ++ NetDevCnt++; ++ } ++ } ++} ++ ++void checkNetDev(void) ++{ ++ if (numActivIfaces() != NetDevCnt) { ++ /* interface has been added or removed ++ so we do a reset */ ++ exitNetDev(); ++ initNetDev(); ++ } ++} ++ ++void printNetDevRecBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recErrs); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recDrop); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recMulticast); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevRecBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Received Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Received Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Receiver Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "Receiver Drops\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Received Multicast Packets\t0\t0\t1/s\n"); ++} ++ ++void printNetDevSentBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentErrs); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentMulticast); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentColls); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevSentBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Sent Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Sent Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Transmitter Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Sent Multicast Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "Transmitter Collisions\t0\t0\t1/s\n"); ++} diff --git a/x11/kdebase4-runtime/files/patch-netdev.h b/x11/kdebase4-runtime/files/patch-netdev.h new file mode 100644 index 000000000000..3c291f85dc9e --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-netdev.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.h Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _netdev_h_ ++#define _netdev_h_ ++ ++void initNetDev(void); ++void exitNetDev(void); ++ ++void updateNetDev(void); ++void checkNetDev(void); ++ ++void printNetDevRecBytes(const char* cmd); ++void printNetDevRecBytesInfo(const char* cmd); ++void printNetDevSentBytes(const char* cmd); ++void printNetDevSentBytesInfo(const char* cmd); ++ ++#endif diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist index 5466b74bfbc6..3b9d7855dd8d 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/pkg-plist @@ -229,7 +229,6 @@ lib/kde2/libkcm_kwinoptions.la lib/kde2/libkcm_kwinoptions.so lib/kde2/libkcm_launch.la lib/kde2/libkcm_launch.so -lib/kde2/libkcm_launch.so.0 lib/kde2/libkcm_locale.la lib/kde2/libkcm_locale.so lib/kde2/libkcm_midi.la @@ -277,7 +276,6 @@ lib/kde2/libkonqsidebartree_dirtree.la lib/kde2/libkonqsidebartree_dirtree.so lib/kde2/libkonqsidebartree_history.la lib/kde2/libkonqsidebartree_history.so -lib/kde2/libkonqsidebartree_history.so.0 lib/kde2/libkonqsound.la lib/kde2/libkonqsound.so lib/kde2/libkonqtree.la @@ -1146,9 +1144,6 @@ share/apps/konsole/konsole_part.rc share/apps/konsole/linux.desktop share/apps/konsole/linux.keytab share/apps/konsole/mc.desktop -share/apps/konsole/pics/brightness.png -share/apps/konsole/pics/colourness.png -share/apps/konsole/pics/contrast.png share/apps/konsole/shell.desktop share/apps/konsole/su.desktop share/apps/konsole/sumc.desktop @@ -1284,8 +1279,14 @@ share/config/imsmaprc share/config/interferencerc share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 +share/config/kdm/Xaccess +share/config/kdm/Xreset +share/config/kdm/Xservers +share/config/kdm/Xsession +share/config/kdm/Xsetup +share/config/kdm/Xstartup +share/config/kdm/Xwilling share/config/kdm/kdmrc -share/config/kdm/README share/config/klipperrc share/config/konqsidebartng.rc share/config/konsolerc @@ -2158,6 +2159,8 @@ share/locale/l10n/hr/entry.desktop share/locale/l10n/hr/flag.png share/locale/l10n/hu/entry.desktop share/locale/l10n/hu/flag.png +share/locale/l10n/id/entry.desktop +share/locale/l10n/id/flag.png share/locale/l10n/ie/entry.desktop share/locale/l10n/ie/flag.png share/locale/l10n/il/entry.desktop @@ -2426,18 +2429,12 @@ share/wallpapers/simple_wallpaper.jpg share/wallpapers/sunday_brunch.jpg share/wallpapers/vegetative_fog.jpg @dirrm share/wallpapers -@exec mkdir %D/share/templates/.source/emptydir -@exec chmod 644 %D/share/templates/.source/emptydir -@unexec rmdir %D/share/templates/.source/emptydir +@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds -@dirrm share/servicetypes @dirrm share/services/useragentstrings @dirrm share/services/searchproviders -@dirrm share/services/kded -@dirrm share/services -@dirrm share/mimelnk/application @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ve @dirrm share/locale/l10n/vc @@ -2479,6 +2476,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/is @dirrm share/locale/l10n/il @dirrm share/locale/l10n/ie +@dirrm share/locale/l10n/id @dirrm share/locale/l10n/hu @dirrm share/locale/l10n/hr @dirrm share/locale/l10n/hn @@ -2512,22 +2510,13 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/ag @dirrm share/locale/l10n/C @dirrm share/locale/l10n -@dirrm share/locale/C -@dirrm share/locale @dirrm share/icons/locolor/32x32/apps @dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/filesystems @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32/actions -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/16x16/filesystems -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @@ -2552,9 +2541,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook -@dirrm share/doc/HTML/en @dirrm share/config/kdm -@dirrm share/config @dirrm share/autostart @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2572,7 +2559,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer -@dirrm share/apps/konsole/pics @dirrm share/apps/konsole @dirrm share/apps/konqueror/tiles @dirrm share/apps/konqueror/profiles @@ -2658,7 +2644,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol -@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2755,6 +2740,5 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/applnk/Applications @dirrm share/applnk/.hidden @dirrm share/applnk -@dirrm lib/kde2 @dirrm include/kwin @dirrm include/kate diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index ee69d6cb95bb..f8e6c70e010f 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -6,8 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2.2 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -15,6 +14,9 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -27,8 +29,13 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --without-ldap \ - --disable-closure + --without-ldap --disable-closure --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes .include <bsd.port.pre.mk> @@ -56,6 +63,15 @@ post-extract: @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/libkonq/Makefile.in ${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo index f0d9e99b49aa..251c4afefe28 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-workspace/distinfo @@ -1 +1 @@ -MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a +MD5 (KDE/kdebase-2.2.2.tar.bz2) = 39635e42056ab2afb8e6f2ff761eea38 diff --git a/x11/kdebase4-workspace/files/patch-apm.c b/x11/kdebase4-workspace/files/patch-apm.c new file mode 100644 index 000000000000..08925da1dee5 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-apm.c @@ -0,0 +1,101 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.c Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,98 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <machine/apm_bios.h> ++#include <stdio.h> ++ ++#include "Command.h" ++#include "apm.h" ++#include "ksysguardd.h" ++ ++static int ApmFD, BattFill, BattTime; ++ ++#define APMDEV "/dev/apm" ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initApm(void) ++{ ++ if ((ApmFD = open(APMDEV, O_RDONLY)) < 0) ++ return; ++ ++ if (updateApm() < 0) ++ return; ++ ++ registerMonitor("apm/batterycharge", "integer", printApmBatFill, ++ printApmBatFillInfo); ++ registerMonitor("apm/remainingtime", "integer", printApmBatTime, ++ printApmBatTimeInfo); ++} ++ ++void ++exitApm(void) ++{ ++ removeMonitor("apm/batterycharge"); ++ removeMonitor("apm/remainingtime"); ++ ++ close(ApmFD); ++} ++ ++int ++updateApm(void) ++{ ++ struct apm_info info; ++ int retval; ++ ++ retval = ioctl(ApmFD, APMIO_GETINFO, &info); ++ ++ BattFill = info.ai_batt_life; ++ BattTime = info.ai_batt_time; ++ ++ return retval; ++} ++ ++void ++printApmBatFill(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattFill); ++} ++ ++void ++printApmBatFillInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Battery charge\t0\t100\t%%\n"); ++} ++ ++void ++printApmBatTime(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattTime); ++} ++ ++void ++printApmBatTimeInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); ++} diff --git a/x11/kdebase4-workspace/files/patch-apm.h b/x11/kdebase4-workspace/files/patch-apm.h new file mode 100644 index 000000000000..73e509bdd61b --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-apm.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.h Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _apm_h_ ++#define _apm_h_ ++ ++void initApm(void); ++void exitApm(void); ++int updateApm(void); ++ ++void printApmBatFill(const char*); ++void printApmBatFillInfo(const char*); ++void printApmBatTime(const char*); ++void printApmBatTimeInfo(const char*); ++ ++#endif diff --git a/x11/kdebase4-workspace/files/patch-conf.c b/x11/kdebase4-workspace/files/patch-conf.c new file mode 100644 index 000000000000..a4de97379b10 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-conf.c @@ -0,0 +1,136 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.c Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,133 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.c,v 1.3 2001/11/05 23:24:19 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++ ++CONTAINER LogFileList = 0; ++CONTAINER SensorList = 0; ++ ++void parseConfigFile(const char *filename) ++{ ++ FILE* config; ++ char line[2048]; ++ char *begin, *token, *tmp, *confSensor; ++ ConfigLogFile *confLog; ++ ++ ++ if (LogFileList) ++ destr_ctnr(LogFileList, free); ++ ++ if (SensorList) ++ destr_ctnr(SensorList, free); ++ ++ LogFileList = new_ctnr(CT_DLL); ++ SensorList = new_ctnr(CT_DLL); ++ ++ if ((config = fopen(filename, "r")) == NULL) { ++ log_error("can't open config file '%s'", filename); ++ ++ /* if we can't open a config file we have to add the ++ available sensors manually ++ */ ++ ++ confSensor = strdup("ProcessList"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Memory"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Stat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetDev"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("CpuInfo"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LoadAvg"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("DiskStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LogFile"); ++ push_ctnr(SensorList, confSensor); ++ ++ return; ++ } ++ ++ while (fgets(line, sizeof(line), config) != NULL) { ++ if ((line[0] == '#') || (strlen(line) == 0)) { ++ continue; ++ } ++ ++ if (strchr(line, '#')) ++ *(strchr(line, '#')) = '\0'; ++ ++ if (line[strlen(line) - 1] == '\n') ++ line[strlen(line) - 1] = '\0'; ++ ++ if (!strncmp(line, "LogFiles", 8)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ if ((confLog = (ConfigLogFile *)malloc(sizeof(ConfigLogFile))) == NULL) { ++ log_error("malloc() no free memory avail"); ++ continue; ++ } ++ confLog->name = strdup(token); ++ tmp = strchr(confLog->name, ':'); ++ *tmp = '\0'; ++ confLog->path = tmp; ++ confLog->path++; ++ ++ push_ctnr(LogFileList, confLog); ++ } ++ } ++ if (!strncmp(line, "Sensors", 7)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ confSensor = strdup(token); ++ push_ctnr(SensorList, confSensor); ++ } ++ } ++ } ++ ++ fclose(config); ++} ++ ++int sensorAvailable(const char *sensor) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(SensorList); i++) { ++ char* name = get_ctnr(SensorList, i); ++ if (!strcmp(name, sensor)) ++ return 1; ++ } ++ ++ return 0; ++} diff --git a/x11/kdebase4-workspace/files/patch-conf.h b/x11/kdebase4-workspace/files/patch-conf.h new file mode 100644 index 000000000000..8aba2e520205 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-conf.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.h Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _conf_h_ ++#define _conf_h_ ++ ++typedef struct { ++ char *name; ++ char *path; ++} ConfigLogFile; ++ ++void parseConfigFile(const char *filename); ++ ++int sensorAvailable(const char* sensor); ++ ++#endif diff --git a/x11/kdebase4-workspace/files/patch-diskstat.c b/x11/kdebase4-workspace/files/patch-diskstat.c new file mode 100644 index 000000000000..5535e580a673 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-diskstat.c @@ -0,0 +1,260 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.c Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,257 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/param.h> ++#include <sys/stat.h> ++#include <sys/ucred.h> ++#include <sys/mount.h> ++#include <time.h> ++#include <unistd.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "diskstat.h" ++#include "ksysguardd.h" ++ ++typedef struct { ++ char device[256]; ++ char mntpnt[256]; ++ long blocks; ++ long bfree; ++ long bused; ++ int bused_percent; ++} DiskInfo; ++ ++static CONTAINER DiskStatList = 0; ++ ++char *getMntPnt(const char *cmd) ++{ ++ static char device[1024]; ++ char *ptr; ++ ++ memset(device, 0, sizeof(device)); ++ sscanf(cmd, "partitions%1024s", device); ++ ++ ptr = (char *)rindex(device, '/'); ++ *ptr = '\0'; ++ ++ return (char *)device; ++} ++ ++int numMntPnt(void) ++{ ++ struct statfs *fs_info; ++ int i, n, counter = 0; ++ ++ n = getmntinfo(&fs_info, MNT_WAIT); ++ for (i = 0; i < n; i++) ++ if (strcmp(fs_info[i].f_fstypename, "procfs") && strcmp(fs_info[i].f_fstypename, "swap") && strcmp(fs_info[i].f_fstypename, "devfs")) ++ counter++; ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initDiskStat(void) ++{ ++ char monitor[1024]; ++ int i; ++ ++ DiskStatList = new_ctnr(CT_DLL); ++ ++ updateDiskStat(); ++ ++ registerMonitor("partitions/list", "listview", printDiskStat, printDiskStatInfo); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatUsed, printDiskStatUsedInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatFree, printDiskStatFreeInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatPercent, printDiskStatPercentInfo); ++ } ++} ++ ++void checkDiskStat(void) ++{ ++ if (numMntPnt() != level_ctnr(DiskStatList)) { ++ /* a filesystem was mounted or unmounted ++ so we do a reset */ ++ exitDiskStat(); ++ initDiskStat(); ++ } ++} ++ ++void exitDiskStat(void) ++{ ++ DiskInfo *disk_info; ++ char monitor[1024]; ++ int i; ++ ++ removeMonitor("partitions/list"); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ disk_info = remove_ctnr(DiskStatList, i--); ++ ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ removeMonitor(monitor); ++ ++ free(disk_info); ++ } ++ ++ if (DiskStatList) ++ destr_ctnr(DiskStatList, free); ++} ++ ++int updateDiskStat(void) ++{ ++ struct statfs *fs_info; ++ struct statfs fs; ++ float percent; ++ int i, mntcount; ++ DiskInfo *disk_info; ++ ++ /* let's hope there is no difference between the DiskStatList and ++ the number of mounted filesystems */ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) ++ free(remove_ctnr(DiskStatList, i--)); ++ ++ mntcount = getmntinfo(&fs_info, MNT_WAIT); ++ ++ for (i = 0; i < mntcount; i++) { ++ fs = fs_info[i]; ++ if (strcmp(fs.f_fstypename, "procfs") && strcmp(fs.f_fstypename, "devfs") && strcmp(fs.f_fstypename, "devfs")) { ++ percent = (((float)fs.f_blocks - (float)fs.f_bfree)/(float)fs.f_blocks); ++ percent = percent * 100; ++ if ((disk_info = (DiskInfo *)malloc(sizeof(DiskInfo))) == NULL) { ++ continue; ++ } ++ memset(disk_info, 0, sizeof(DiskInfo)); ++ strncpy(disk_info->device, fs.f_mntfromname, 255); ++ if (!strcmp(fs.f_mntonname, "/")) { ++ strncpy(disk_info->mntpnt, "/root", 6); ++ } else { ++ strncpy(disk_info->mntpnt, fs.f_mntonname, 255); ++ } ++ disk_info->blocks = fs.f_blocks; ++ disk_info->bfree = fs.f_bfree; ++ disk_info->bused = (fs.f_blocks - fs.f_bfree); ++ disk_info->bused_percent = (int)percent; ++ ++ push_ctnr(DiskStatList, disk_info); ++ } ++ } ++ ++ return 0; ++} ++ ++void printDiskStat(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%d\t%s\n", ++ disk_info->device, ++ disk_info->blocks, ++ disk_info->bused, ++ disk_info->bfree, ++ disk_info->bused_percent, ++ disk_info->mntpnt); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Device\tBlocks\tUsed\tAvailable\tUsed %%\tMountPoint\n"); ++} ++ ++void printDiskStatUsed(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bused); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatUsedInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatFree(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bfree); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatFreeInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Free Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatPercent(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%d\n", disk_info->bused_percent); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatPercentInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t100\t%%\n"); ++} diff --git a/x11/kdebase4-workspace/files/patch-diskstat.h b/x11/kdebase4-workspace/files/patch-diskstat.h new file mode 100644 index 000000000000..3b5bf11b89c7 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-diskstat.h @@ -0,0 +1,44 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.h Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,41 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _diskstat_h_ ++#define _diskstat_h_ ++ ++void initDiskStat(void); ++void exitDiskStat(void); ++ ++int updateDiskStat(void); ++void checkDiskStat(void); ++ ++void printDiskStat(const char* cmd); ++void printDiskStatInfo(const char* cmd); ++ ++void printDiskStatUsed(const char* cmd); ++void printDiskStatUsedInfo(const char* cmd); ++void printDiskStatFree(const char* cmd); ++void printDiskStatFreeInfo(const char* cmd); ++void printDiskStatPercent(const char* cmd); ++void printDiskStatPercentInfo(const char* cmd); ++ ++#endif diff --git a/x11/kdebase4-workspace/files/patch-ksysguardd.c b/x11/kdebase4-workspace/files/patch-ksysguardd.c new file mode 100644 index 000000000000..940aa4d327a5 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-ksysguardd.c @@ -0,0 +1,15 @@ +--- ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 02:01:46 1.5 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 06:16:15 1.6 +@@ -17,9 +17,11 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +- $Id: ksysguardd.c,v 1.2.6.1 2001/11/08 10:48:51 tokoe Exp $ ++ $Id: ksysguardd.c,v 1.6 2001/11/17 06:16:15 waba Exp $ + */ + ++#include <config.h> ++ + #include <ctype.h> + #include <fcntl.h> + #include <netdb.h> diff --git a/x11/kdebase4-workspace/files/patch-ksysguardd.h b/x11/kdebase4-workspace/files/patch-ksysguardd.h new file mode 100644 index 000000000000..1545b83d39d7 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-ksysguardd.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.h Mon Nov 19 17:07:38 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 1999-2001 Chris Schlaeger <cs@kde.org> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: ksysguardd.h,v 1.2 2001/11/08 10:52:55 tokoe Exp $ ++*/ ++ ++#ifndef _ksysguardd_h_ ++#define _ksysguardd_h_ ++ ++#include <stdio.h> ++ ++extern int QuitApp; ++extern int RunAsDaemon; ++extern FILE* CurrentClient; ++ ++void updateModules(void); ++void checkModules(void); ++ ++#endif diff --git a/x11/kdebase4-workspace/files/patch-loadavg.c b/x11/kdebase4-workspace/files/patch-loadavg.c new file mode 100644 index 000000000000..ced78fa5ad68 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-loadavg.c @@ -0,0 +1,100 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.c Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,97 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "loadavg.h" ++ ++static double LoadAvg[3]; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initLoadAvg(void) ++{ ++ if (updateLoadAvg() < 0) ++ return; ++ ++ registerMonitor("cpu/loadavg1", "float", printLoadAvg1, ++ printLoadAvg1Info); ++ registerMonitor("cpu/loadavg5", "float", printLoadAvg5, ++ printLoadAvg5Info); ++ registerMonitor("cpu/loadavg15", "float", printLoadAvg15, ++ printLoadAvg15Info); ++} ++ ++void ++exitLoadAvg(void) ++{ ++ removeMonitor("cpu/loadavg1"); ++ removeMonitor("cpu/loadavg5"); ++ removeMonitor("cpu/loadavg15"); ++} ++ ++int ++updateLoadAvg(void) ++{ ++ return getloadavg(LoadAvg, 3); ++} ++ ++void ++printLoadAvg1(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[0]); ++} ++ ++void ++printLoadAvg1Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 1 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg5(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[1]); ++} ++ ++void ++printLoadAvg5Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 5 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg15(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[2]); ++} ++ ++void ++printLoadAvg15Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 15 min\t0\t0\t\n"); ++} diff --git a/x11/kdebase4-workspace/files/patch-loadavg.h b/x11/kdebase4-workspace/files/patch-loadavg.h new file mode 100644 index 000000000000..cdc680cbd492 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-loadavg.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.h Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _loadavg_h_ ++#define _loadavg_h_ ++ ++void initLoadAvg(void); ++void exitLoadAvg(void); ++int updateLoadAvg(void); ++ ++void printLoadAvg1(const char*); ++void printLoadAvg1Info(const char*); ++void printLoadAvg5(const char*); ++void printLoadAvg5Info(const char*); ++void printLoadAvg15(const char*); ++void printLoadAvg15Info(const char*); ++ ++#endif diff --git a/x11/kdebase4-workspace/files/patch-logfile.c b/x11/kdebase4-workspace/files/patch-logfile.c new file mode 100644 index 000000000000..5fd3def1ae6b --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-logfile.c @@ -0,0 +1,184 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.c Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,181 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++#include "ksysguardd.h" ++#include "logfile.h" ++ ++static CONTAINER LogFiles = 0; ++static unsigned long counter = 1; ++ ++typedef struct { ++ char name[256]; ++ FILE* fh; ++ unsigned long id; ++} LogFileEntry; ++ ++extern CONTAINER LogFileList; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void initLogFile(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ registerCommand("logfile_register", registerLogFile); ++ registerCommand("logfile_unregister", unregisterLogFile); ++ registerCommand("logfile_registered", printRegistered); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) ++ { ++ FILE* fp; ++ ConfigLogFile *entry = get_ctnr(LogFileList, i); ++ /* register the log file if we can actually read the file. */ ++ if ((fp = fopen(entry->path, "r")) != NULL) ++ { ++ fclose(fp); ++ snprintf(monitor, 1024, "logfiles/%s", entry->name); ++ registerMonitor(monitor, "logfile", printLogFile, ++ printLogFileInfo); ++ } ++ } ++ ++ LogFiles = new_ctnr(CT_DLL); ++} ++ ++void exitLogFile(void) ++{ ++ if (LogFiles) ++ destr_ctnr(LogFiles, free); ++} ++ ++void printLogFile(const char* cmd) ++{ ++ char line[1024]; ++ unsigned long id; ++ int i; ++ char ch; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ while (fgets(line, sizeof(line), entry->fh) != NULL) { ++ fprintf(CurrentClient, "%s", line); ++ } ++ clearerr(entry->fh); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printLogFileInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "LogFile\n"); ++} ++ ++void registerLogFile(const char* cmd) ++{ ++ char name[256]; ++ FILE* file; ++ LogFileEntry *entry; ++ int i; ++ ++ memset(name, 0, sizeof(name)); ++ sscanf(cmd, "%*s %256s", name); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) { ++ ConfigLogFile *conf = get_ctnr(LogFileList, i); ++ if (!strcmp(conf->name, name)) { ++ if ((file = fopen(conf->path, "r")) == NULL) { ++ print_error("fopen()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ fseek(file, 0, SEEK_END); ++ ++ if ((entry = (LogFileEntry *)malloc(sizeof(LogFileEntry))) == NULL) { ++ print_error("malloc()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ entry->fh = file; ++ strncpy(entry->name, conf->name, 256); ++ entry->id = counter; ++ ++ push_ctnr(LogFiles, entry); ++ ++ fprintf(CurrentClient, "%lu\n", counter); ++ counter++; ++ ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "0\n"); ++} ++ ++void unregisterLogFile(const char* cmd) ++{ ++ unsigned long id; ++ int i; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ fclose(entry->fh); ++ free(remove_ctnr(LogFiles, i)); ++ fprintf(CurrentClient, "\n"); ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printRegistered(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ fprintf(CurrentClient, "%s:%lu\n", entry->name, entry->id); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} diff --git a/x11/kdebase4-workspace/files/patch-logfile.h b/x11/kdebase4-workspace/files/patch-logfile.h new file mode 100644 index 000000000000..69b8d6ed1ca6 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-logfile.h @@ -0,0 +1,40 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.h Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,37 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _logfile_h_ ++#define _logfile_h_ ++ ++void initLogFile(void); ++void exitLogFile(void); ++ ++void printLogFile(const char* cmd); ++void printLogFileInfo(const char* cmd); ++ ++void registerLogFile(const char* cmd); ++void unregisterLogFile(const char* cmd); ++ ++/* debug command */ ++void printRegistered(const char* cmd); ++ ++#endif diff --git a/x11/kdebase4-workspace/files/patch-netdev.c b/x11/kdebase4-workspace/files/patch-netdev.c new file mode 100644 index 000000000000..2c0f473ebbcf --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-netdev.c @@ -0,0 +1,322 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.c Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,319 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <sys/socket.h> ++#include <net/if.h> ++#include <net/if_mib.h> ++#include <stdio.h> ++#include <string.h> ++#include <sys/sysctl.h> ++#include <sys/time.h> ++#include <sys/types.h> ++#include <unistd.h> ++ ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "netdev.h" ++ ++ ++typedef struct { ++ char name[32]; ++ u_long recBytes; ++ u_long recPacks; ++ u_long recErrs; ++ u_long recDrop; ++ u_long recMulticast; ++ u_long sentBytes; ++ u_long sentPacks; ++ u_long sentErrs; ++ u_long sentMulticast; ++ u_long sentColls; ++} NetDevInfo; ++ ++#define MAXNETDEVS 64 ++static NetDevInfo NetDevs[MAXNETDEVS]; ++static int NetDevCnt = 0; ++ ++char **parseCommand(const char *cmd) ++{ ++ char tmp_cmd[1024]; ++ char *begin; ++ static char sensor[100]; ++ static char interface[100]; ++ static char* retval[2]; ++ ++ strncpy(tmp_cmd, cmd, 1024); ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin++; ++ strcpy(sensor, begin); ++ retval[1] = sensor; ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin = rindex(tmp_cmd, '/'); ++ begin++; ++ strcpy(interface, begin); ++ retval[0] = interface; ++ ++ return retval; ++} ++ ++int numActivIfaces(void) ++{ ++ int counter = 0; ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) ++ counter++; ++ } ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ updateNetDev(); ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ } ++} ++ ++void exitNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ removeMonitor(monitor); ++ } ++} ++ ++void updateNetDev(void) ++{ ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ NetDevCnt = 0; ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) { ++ strncpy(NetDevs[NetDevCnt].name, ifmd.ifmd_name, 32); ++ NetDevs[NetDevCnt].recBytes = ifmd.ifmd_data.ifi_ibytes - NetDevs[NetDevCnt].recBytes; ++ NetDevs[NetDevCnt].recPacks = ifmd.ifmd_data.ifi_ipackets - NetDevs[NetDevCnt].recPacks; ++ NetDevs[NetDevCnt].recErrs = ifmd.ifmd_data.ifi_ierrors - NetDevs[NetDevCnt].recErrs; ++ NetDevs[NetDevCnt].recDrop = ifmd.ifmd_data.ifi_iqdrops - NetDevs[NetDevCnt].recDrop; ++ NetDevs[NetDevCnt].recMulticast = ifmd.ifmd_data.ifi_imcasts - NetDevs[NetDevCnt].recMulticast; ++ NetDevs[NetDevCnt].sentBytes = ifmd.ifmd_data.ifi_obytes - NetDevs[NetDevCnt].sentBytes; ++ NetDevs[NetDevCnt].sentPacks = ifmd.ifmd_data.ifi_opackets - NetDevs[NetDevCnt].sentPacks; ++ NetDevs[NetDevCnt].sentErrs = ifmd.ifmd_data.ifi_oerrors - NetDevs[NetDevCnt].sentErrs; ++ NetDevs[NetDevCnt].sentMulticast = ifmd.ifmd_data.ifi_omcasts - NetDevs[NetDevCnt].sentMulticast; ++ NetDevs[NetDevCnt].sentColls = ifmd.ifmd_data.ifi_collisions - NetDevs[NetDevCnt].sentColls; ++ NetDevCnt++; ++ } ++ } ++} ++ ++void checkNetDev(void) ++{ ++ if (numActivIfaces() != NetDevCnt) { ++ /* interface has been added or removed ++ so we do a reset */ ++ exitNetDev(); ++ initNetDev(); ++ } ++} ++ ++void printNetDevRecBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recErrs); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recDrop); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recMulticast); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevRecBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Received Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Received Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Receiver Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "Receiver Drops\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Received Multicast Packets\t0\t0\t1/s\n"); ++} ++ ++void printNetDevSentBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentErrs); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentMulticast); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentColls); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevSentBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Sent Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Sent Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Transmitter Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Sent Multicast Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "Transmitter Collisions\t0\t0\t1/s\n"); ++} diff --git a/x11/kdebase4-workspace/files/patch-netdev.h b/x11/kdebase4-workspace/files/patch-netdev.h new file mode 100644 index 000000000000..3c291f85dc9e --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-netdev.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.h Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _netdev_h_ ++#define _netdev_h_ ++ ++void initNetDev(void); ++void exitNetDev(void); ++ ++void updateNetDev(void); ++void checkNetDev(void); ++ ++void printNetDevRecBytes(const char* cmd); ++void printNetDevRecBytesInfo(const char* cmd); ++void printNetDevSentBytes(const char* cmd); ++void printNetDevSentBytesInfo(const char* cmd); ++ ++#endif diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist index 5466b74bfbc6..3b9d7855dd8d 100644 --- a/x11/kdebase4-workspace/pkg-plist +++ b/x11/kdebase4-workspace/pkg-plist @@ -229,7 +229,6 @@ lib/kde2/libkcm_kwinoptions.la lib/kde2/libkcm_kwinoptions.so lib/kde2/libkcm_launch.la lib/kde2/libkcm_launch.so -lib/kde2/libkcm_launch.so.0 lib/kde2/libkcm_locale.la lib/kde2/libkcm_locale.so lib/kde2/libkcm_midi.la @@ -277,7 +276,6 @@ lib/kde2/libkonqsidebartree_dirtree.la lib/kde2/libkonqsidebartree_dirtree.so lib/kde2/libkonqsidebartree_history.la lib/kde2/libkonqsidebartree_history.so -lib/kde2/libkonqsidebartree_history.so.0 lib/kde2/libkonqsound.la lib/kde2/libkonqsound.so lib/kde2/libkonqtree.la @@ -1146,9 +1144,6 @@ share/apps/konsole/konsole_part.rc share/apps/konsole/linux.desktop share/apps/konsole/linux.keytab share/apps/konsole/mc.desktop -share/apps/konsole/pics/brightness.png -share/apps/konsole/pics/colourness.png -share/apps/konsole/pics/contrast.png share/apps/konsole/shell.desktop share/apps/konsole/su.desktop share/apps/konsole/sumc.desktop @@ -1284,8 +1279,14 @@ share/config/imsmaprc share/config/interferencerc share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 +share/config/kdm/Xaccess +share/config/kdm/Xreset +share/config/kdm/Xservers +share/config/kdm/Xsession +share/config/kdm/Xsetup +share/config/kdm/Xstartup +share/config/kdm/Xwilling share/config/kdm/kdmrc -share/config/kdm/README share/config/klipperrc share/config/konqsidebartng.rc share/config/konsolerc @@ -2158,6 +2159,8 @@ share/locale/l10n/hr/entry.desktop share/locale/l10n/hr/flag.png share/locale/l10n/hu/entry.desktop share/locale/l10n/hu/flag.png +share/locale/l10n/id/entry.desktop +share/locale/l10n/id/flag.png share/locale/l10n/ie/entry.desktop share/locale/l10n/ie/flag.png share/locale/l10n/il/entry.desktop @@ -2426,18 +2429,12 @@ share/wallpapers/simple_wallpaper.jpg share/wallpapers/sunday_brunch.jpg share/wallpapers/vegetative_fog.jpg @dirrm share/wallpapers -@exec mkdir %D/share/templates/.source/emptydir -@exec chmod 644 %D/share/templates/.source/emptydir -@unexec rmdir %D/share/templates/.source/emptydir +@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds -@dirrm share/servicetypes @dirrm share/services/useragentstrings @dirrm share/services/searchproviders -@dirrm share/services/kded -@dirrm share/services -@dirrm share/mimelnk/application @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ve @dirrm share/locale/l10n/vc @@ -2479,6 +2476,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/is @dirrm share/locale/l10n/il @dirrm share/locale/l10n/ie +@dirrm share/locale/l10n/id @dirrm share/locale/l10n/hu @dirrm share/locale/l10n/hr @dirrm share/locale/l10n/hn @@ -2512,22 +2510,13 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/ag @dirrm share/locale/l10n/C @dirrm share/locale/l10n -@dirrm share/locale/C -@dirrm share/locale @dirrm share/icons/locolor/32x32/apps @dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/filesystems @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32/actions -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/16x16/filesystems -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @@ -2552,9 +2541,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook -@dirrm share/doc/HTML/en @dirrm share/config/kdm -@dirrm share/config @dirrm share/autostart @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2572,7 +2559,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer -@dirrm share/apps/konsole/pics @dirrm share/apps/konsole @dirrm share/apps/konqueror/tiles @dirrm share/apps/konqueror/profiles @@ -2658,7 +2644,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol -@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2755,6 +2740,5 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/applnk/Applications @dirrm share/applnk/.hidden @dirrm share/applnk -@dirrm lib/kde2 @dirrm include/kwin @dirrm include/kate diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index ee69d6cb95bb..f8e6c70e010f 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -6,8 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2.2 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -15,6 +14,9 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ + automake14:${PORTSDIR}/devel/automake14 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 @@ -27,8 +29,13 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --without-ldap \ - --disable-closure + --without-ldap --disable-closure --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif USE_GMAKE= yes .include <bsd.port.pre.mk> @@ -56,6 +63,15 @@ post-extract: @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/libkonq/Makefile.in ${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index f0d9e99b49aa..251c4afefe28 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a +MD5 (KDE/kdebase-2.2.2.tar.bz2) = 39635e42056ab2afb8e6f2ff761eea38 diff --git a/x11/kdebase4/files/patch-apm.c b/x11/kdebase4/files/patch-apm.c new file mode 100644 index 000000000000..08925da1dee5 --- /dev/null +++ b/x11/kdebase4/files/patch-apm.c @@ -0,0 +1,101 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.c Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,98 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <machine/apm_bios.h> ++#include <stdio.h> ++ ++#include "Command.h" ++#include "apm.h" ++#include "ksysguardd.h" ++ ++static int ApmFD, BattFill, BattTime; ++ ++#define APMDEV "/dev/apm" ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initApm(void) ++{ ++ if ((ApmFD = open(APMDEV, O_RDONLY)) < 0) ++ return; ++ ++ if (updateApm() < 0) ++ return; ++ ++ registerMonitor("apm/batterycharge", "integer", printApmBatFill, ++ printApmBatFillInfo); ++ registerMonitor("apm/remainingtime", "integer", printApmBatTime, ++ printApmBatTimeInfo); ++} ++ ++void ++exitApm(void) ++{ ++ removeMonitor("apm/batterycharge"); ++ removeMonitor("apm/remainingtime"); ++ ++ close(ApmFD); ++} ++ ++int ++updateApm(void) ++{ ++ struct apm_info info; ++ int retval; ++ ++ retval = ioctl(ApmFD, APMIO_GETINFO, &info); ++ ++ BattFill = info.ai_batt_life; ++ BattTime = info.ai_batt_time; ++ ++ return retval; ++} ++ ++void ++printApmBatFill(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattFill); ++} ++ ++void ++printApmBatFillInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Battery charge\t0\t100\t%%\n"); ++} ++ ++void ++printApmBatTime(const char* c) ++{ ++ fprintf(CurrentClient, "%d\n", BattTime); ++} ++ ++void ++printApmBatTimeInfo(const char* c) ++{ ++ fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); ++} diff --git a/x11/kdebase4/files/patch-apm.h b/x11/kdebase4/files/patch-apm.h new file mode 100644 index 000000000000..73e509bdd61b --- /dev/null +++ b/x11/kdebase4/files/patch-apm.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.h Mon Nov 19 17:06:33 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: apm.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _apm_h_ ++#define _apm_h_ ++ ++void initApm(void); ++void exitApm(void); ++int updateApm(void); ++ ++void printApmBatFill(const char*); ++void printApmBatFillInfo(const char*); ++void printApmBatTime(const char*); ++void printApmBatTimeInfo(const char*); ++ ++#endif diff --git a/x11/kdebase4/files/patch-conf.c b/x11/kdebase4/files/patch-conf.c new file mode 100644 index 000000000000..a4de97379b10 --- /dev/null +++ b/x11/kdebase4/files/patch-conf.c @@ -0,0 +1,136 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.c Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,133 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.c,v 1.3 2001/11/05 23:24:19 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++ ++CONTAINER LogFileList = 0; ++CONTAINER SensorList = 0; ++ ++void parseConfigFile(const char *filename) ++{ ++ FILE* config; ++ char line[2048]; ++ char *begin, *token, *tmp, *confSensor; ++ ConfigLogFile *confLog; ++ ++ ++ if (LogFileList) ++ destr_ctnr(LogFileList, free); ++ ++ if (SensorList) ++ destr_ctnr(SensorList, free); ++ ++ LogFileList = new_ctnr(CT_DLL); ++ SensorList = new_ctnr(CT_DLL); ++ ++ if ((config = fopen(filename, "r")) == NULL) { ++ log_error("can't open config file '%s'", filename); ++ ++ /* if we can't open a config file we have to add the ++ available sensors manually ++ */ ++ ++ confSensor = strdup("ProcessList"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Memory"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("Stat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetDev"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("NetStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("CpuInfo"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LoadAvg"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("DiskStat"); ++ push_ctnr(SensorList, confSensor); ++ confSensor = strdup("LogFile"); ++ push_ctnr(SensorList, confSensor); ++ ++ return; ++ } ++ ++ while (fgets(line, sizeof(line), config) != NULL) { ++ if ((line[0] == '#') || (strlen(line) == 0)) { ++ continue; ++ } ++ ++ if (strchr(line, '#')) ++ *(strchr(line, '#')) = '\0'; ++ ++ if (line[strlen(line) - 1] == '\n') ++ line[strlen(line) - 1] = '\0'; ++ ++ if (!strncmp(line, "LogFiles", 8)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ if ((confLog = (ConfigLogFile *)malloc(sizeof(ConfigLogFile))) == NULL) { ++ log_error("malloc() no free memory avail"); ++ continue; ++ } ++ confLog->name = strdup(token); ++ tmp = strchr(confLog->name, ':'); ++ *tmp = '\0'; ++ confLog->path = tmp; ++ confLog->path++; ++ ++ push_ctnr(LogFileList, confLog); ++ } ++ } ++ if (!strncmp(line, "Sensors", 7)) { ++ begin = strchr(line, '='); ++ begin++; ++ ++ for (token = strtok(begin, ","); token; token = strtok(NULL, ",")) { ++ confSensor = strdup(token); ++ push_ctnr(SensorList, confSensor); ++ } ++ } ++ } ++ ++ fclose(config); ++} ++ ++int sensorAvailable(const char *sensor) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(SensorList); i++) { ++ char* name = get_ctnr(SensorList, i); ++ if (!strcmp(name, sensor)) ++ return 1; ++ } ++ ++ return 0; ++} diff --git a/x11/kdebase4/files/patch-conf.h b/x11/kdebase4/files/patch-conf.h new file mode 100644 index 000000000000..8aba2e520205 --- /dev/null +++ b/x11/kdebase4/files/patch-conf.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/conf.h Mon Nov 19 17:06:50 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: conf.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _conf_h_ ++#define _conf_h_ ++ ++typedef struct { ++ char *name; ++ char *path; ++} ConfigLogFile; ++ ++void parseConfigFile(const char *filename); ++ ++int sensorAvailable(const char* sensor); ++ ++#endif diff --git a/x11/kdebase4/files/patch-diskstat.c b/x11/kdebase4/files/patch-diskstat.c new file mode 100644 index 000000000000..5535e580a673 --- /dev/null +++ b/x11/kdebase4/files/patch-diskstat.c @@ -0,0 +1,260 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.c Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,257 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/param.h> ++#include <sys/stat.h> ++#include <sys/ucred.h> ++#include <sys/mount.h> ++#include <time.h> ++#include <unistd.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "diskstat.h" ++#include "ksysguardd.h" ++ ++typedef struct { ++ char device[256]; ++ char mntpnt[256]; ++ long blocks; ++ long bfree; ++ long bused; ++ int bused_percent; ++} DiskInfo; ++ ++static CONTAINER DiskStatList = 0; ++ ++char *getMntPnt(const char *cmd) ++{ ++ static char device[1024]; ++ char *ptr; ++ ++ memset(device, 0, sizeof(device)); ++ sscanf(cmd, "partitions%1024s", device); ++ ++ ptr = (char *)rindex(device, '/'); ++ *ptr = '\0'; ++ ++ return (char *)device; ++} ++ ++int numMntPnt(void) ++{ ++ struct statfs *fs_info; ++ int i, n, counter = 0; ++ ++ n = getmntinfo(&fs_info, MNT_WAIT); ++ for (i = 0; i < n; i++) ++ if (strcmp(fs_info[i].f_fstypename, "procfs") && strcmp(fs_info[i].f_fstypename, "swap") && strcmp(fs_info[i].f_fstypename, "devfs")) ++ counter++; ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initDiskStat(void) ++{ ++ char monitor[1024]; ++ int i; ++ ++ DiskStatList = new_ctnr(CT_DLL); ++ ++ updateDiskStat(); ++ ++ registerMonitor("partitions/list", "listview", printDiskStat, printDiskStatInfo); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatUsed, printDiskStatUsedInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatFree, printDiskStatFreeInfo); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ registerMonitor(monitor, "integer", printDiskStatPercent, printDiskStatPercentInfo); ++ } ++} ++ ++void checkDiskStat(void) ++{ ++ if (numMntPnt() != level_ctnr(DiskStatList)) { ++ /* a filesystem was mounted or unmounted ++ so we do a reset */ ++ exitDiskStat(); ++ initDiskStat(); ++ } ++} ++ ++void exitDiskStat(void) ++{ ++ DiskInfo *disk_info; ++ char monitor[1024]; ++ int i; ++ ++ removeMonitor("partitions/list"); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ disk_info = remove_ctnr(DiskStatList, i--); ++ ++ snprintf(monitor, sizeof(monitor), "partitions%s/usedspace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/freespace", disk_info->mntpnt); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "partitions%s/filllevel", disk_info->mntpnt); ++ removeMonitor(monitor); ++ ++ free(disk_info); ++ } ++ ++ if (DiskStatList) ++ destr_ctnr(DiskStatList, free); ++} ++ ++int updateDiskStat(void) ++{ ++ struct statfs *fs_info; ++ struct statfs fs; ++ float percent; ++ int i, mntcount; ++ DiskInfo *disk_info; ++ ++ /* let's hope there is no difference between the DiskStatList and ++ the number of mounted filesystems */ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) ++ free(remove_ctnr(DiskStatList, i--)); ++ ++ mntcount = getmntinfo(&fs_info, MNT_WAIT); ++ ++ for (i = 0; i < mntcount; i++) { ++ fs = fs_info[i]; ++ if (strcmp(fs.f_fstypename, "procfs") && strcmp(fs.f_fstypename, "devfs") && strcmp(fs.f_fstypename, "devfs")) { ++ percent = (((float)fs.f_blocks - (float)fs.f_bfree)/(float)fs.f_blocks); ++ percent = percent * 100; ++ if ((disk_info = (DiskInfo *)malloc(sizeof(DiskInfo))) == NULL) { ++ continue; ++ } ++ memset(disk_info, 0, sizeof(DiskInfo)); ++ strncpy(disk_info->device, fs.f_mntfromname, 255); ++ if (!strcmp(fs.f_mntonname, "/")) { ++ strncpy(disk_info->mntpnt, "/root", 6); ++ } else { ++ strncpy(disk_info->mntpnt, fs.f_mntonname, 255); ++ } ++ disk_info->blocks = fs.f_blocks; ++ disk_info->bfree = fs.f_bfree; ++ disk_info->bused = (fs.f_blocks - fs.f_bfree); ++ disk_info->bused_percent = (int)percent; ++ ++ push_ctnr(DiskStatList, disk_info); ++ } ++ } ++ ++ return 0; ++} ++ ++void printDiskStat(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%d\t%s\n", ++ disk_info->device, ++ disk_info->blocks, ++ disk_info->bused, ++ disk_info->bfree, ++ disk_info->bused_percent, ++ disk_info->mntpnt); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Device\tBlocks\tUsed\tAvailable\tUsed %%\tMountPoint\n"); ++} ++ ++void printDiskStatUsed(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bused); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatUsedInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatFree(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%ld\n", disk_info->bfree); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatFreeInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Free Blocks\t0\t-\tBlocks\n"); ++} ++ ++void printDiskStatPercent(const char* cmd) ++{ ++ int i; ++ char *mntpnt = (char *)getMntPnt(cmd); ++ ++ for (i = 0; i < level_ctnr(DiskStatList); i++) { ++ DiskInfo* disk_info = get_ctnr(DiskStatList, i); ++ if (!strcmp(mntpnt, disk_info->mntpnt)) { ++ fprintf(CurrentClient, "%d\n", disk_info->bused_percent); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printDiskStatPercentInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "Used Blocks\t0\t100\t%%\n"); ++} diff --git a/x11/kdebase4/files/patch-diskstat.h b/x11/kdebase4/files/patch-diskstat.h new file mode 100644 index 000000000000..3b5bf11b89c7 --- /dev/null +++ b/x11/kdebase4/files/patch-diskstat.h @@ -0,0 +1,44 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/diskstat.h Mon Nov 19 17:07:01 2001 +@@ -0,0 +1,41 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: diskstat.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _diskstat_h_ ++#define _diskstat_h_ ++ ++void initDiskStat(void); ++void exitDiskStat(void); ++ ++int updateDiskStat(void); ++void checkDiskStat(void); ++ ++void printDiskStat(const char* cmd); ++void printDiskStatInfo(const char* cmd); ++ ++void printDiskStatUsed(const char* cmd); ++void printDiskStatUsedInfo(const char* cmd); ++void printDiskStatFree(const char* cmd); ++void printDiskStatFreeInfo(const char* cmd); ++void printDiskStatPercent(const char* cmd); ++void printDiskStatPercentInfo(const char* cmd); ++ ++#endif diff --git a/x11/kdebase4/files/patch-ksysguardd.c b/x11/kdebase4/files/patch-ksysguardd.c new file mode 100644 index 000000000000..940aa4d327a5 --- /dev/null +++ b/x11/kdebase4/files/patch-ksysguardd.c @@ -0,0 +1,15 @@ +--- ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 02:01:46 1.5 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.c 2001/11/17 06:16:15 1.6 +@@ -17,9 +17,11 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +- $Id: ksysguardd.c,v 1.2.6.1 2001/11/08 10:48:51 tokoe Exp $ ++ $Id: ksysguardd.c,v 1.6 2001/11/17 06:16:15 waba Exp $ + */ + ++#include <config.h> ++ + #include <ctype.h> + #include <fcntl.h> + #include <netdb.h> diff --git a/x11/kdebase4/files/patch-ksysguardd.h b/x11/kdebase4/files/patch-ksysguardd.h new file mode 100644 index 000000000000..1545b83d39d7 --- /dev/null +++ b/x11/kdebase4/files/patch-ksysguardd.h @@ -0,0 +1,37 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/ksysguardd.h Mon Nov 19 17:07:38 2001 +@@ -0,0 +1,34 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 1999-2001 Chris Schlaeger <cs@kde.org> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: ksysguardd.h,v 1.2 2001/11/08 10:52:55 tokoe Exp $ ++*/ ++ ++#ifndef _ksysguardd_h_ ++#define _ksysguardd_h_ ++ ++#include <stdio.h> ++ ++extern int QuitApp; ++extern int RunAsDaemon; ++extern FILE* CurrentClient; ++ ++void updateModules(void); ++void checkModules(void); ++ ++#endif diff --git a/x11/kdebase4/files/patch-loadavg.c b/x11/kdebase4/files/patch-loadavg.c new file mode 100644 index 000000000000..ced78fa5ad68 --- /dev/null +++ b/x11/kdebase4/files/patch-loadavg.c @@ -0,0 +1,100 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.c Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,97 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "loadavg.h" ++ ++static double LoadAvg[3]; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void ++initLoadAvg(void) ++{ ++ if (updateLoadAvg() < 0) ++ return; ++ ++ registerMonitor("cpu/loadavg1", "float", printLoadAvg1, ++ printLoadAvg1Info); ++ registerMonitor("cpu/loadavg5", "float", printLoadAvg5, ++ printLoadAvg5Info); ++ registerMonitor("cpu/loadavg15", "float", printLoadAvg15, ++ printLoadAvg15Info); ++} ++ ++void ++exitLoadAvg(void) ++{ ++ removeMonitor("cpu/loadavg1"); ++ removeMonitor("cpu/loadavg5"); ++ removeMonitor("cpu/loadavg15"); ++} ++ ++int ++updateLoadAvg(void) ++{ ++ return getloadavg(LoadAvg, 3); ++} ++ ++void ++printLoadAvg1(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[0]); ++} ++ ++void ++printLoadAvg1Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 1 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg5(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[1]); ++} ++ ++void ++printLoadAvg5Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 5 min\t0\t0\t\n"); ++} ++ ++void ++printLoadAvg15(const char* c) ++{ ++ fprintf(CurrentClient, "%f\n", LoadAvg[2]); ++} ++ ++void ++printLoadAvg15Info(const char* c) ++{ ++ fprintf(CurrentClient, "Load average 15 min\t0\t0\t\n"); ++} diff --git a/x11/kdebase4/files/patch-loadavg.h b/x11/kdebase4/files/patch-loadavg.h new file mode 100644 index 000000000000..cdc680cbd492 --- /dev/null +++ b/x11/kdebase4/files/patch-loadavg.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/loadavg.h Mon Nov 19 17:07:47 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: loadavg.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _loadavg_h_ ++#define _loadavg_h_ ++ ++void initLoadAvg(void); ++void exitLoadAvg(void); ++int updateLoadAvg(void); ++ ++void printLoadAvg1(const char*); ++void printLoadAvg1Info(const char*); ++void printLoadAvg5(const char*); ++void printLoadAvg5Info(const char*); ++void printLoadAvg15(const char*); ++void printLoadAvg15Info(const char*); ++ ++#endif diff --git a/x11/kdebase4/files/patch-logfile.c b/x11/kdebase4/files/patch-logfile.c new file mode 100644 index 000000000000..5fd3def1ae6b --- /dev/null +++ b/x11/kdebase4/files/patch-logfile.c @@ -0,0 +1,184 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.c Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,181 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "Command.h" ++#include "ccont.h" ++#include "conf.h" ++#include "ksysguardd.h" ++#include "logfile.h" ++ ++static CONTAINER LogFiles = 0; ++static unsigned long counter = 1; ++ ++typedef struct { ++ char name[256]; ++ FILE* fh; ++ unsigned long id; ++} LogFileEntry; ++ ++extern CONTAINER LogFileList; ++ ++/* ++================================ public part ================================= ++*/ ++ ++void initLogFile(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ registerCommand("logfile_register", registerLogFile); ++ registerCommand("logfile_unregister", unregisterLogFile); ++ registerCommand("logfile_registered", printRegistered); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) ++ { ++ FILE* fp; ++ ConfigLogFile *entry = get_ctnr(LogFileList, i); ++ /* register the log file if we can actually read the file. */ ++ if ((fp = fopen(entry->path, "r")) != NULL) ++ { ++ fclose(fp); ++ snprintf(monitor, 1024, "logfiles/%s", entry->name); ++ registerMonitor(monitor, "logfile", printLogFile, ++ printLogFileInfo); ++ } ++ } ++ ++ LogFiles = new_ctnr(CT_DLL); ++} ++ ++void exitLogFile(void) ++{ ++ if (LogFiles) ++ destr_ctnr(LogFiles, free); ++} ++ ++void printLogFile(const char* cmd) ++{ ++ char line[1024]; ++ unsigned long id; ++ int i; ++ char ch; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ while (fgets(line, sizeof(line), entry->fh) != NULL) { ++ fprintf(CurrentClient, "%s", line); ++ } ++ clearerr(entry->fh); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printLogFileInfo(const char* cmd) ++{ ++ fprintf(CurrentClient, "LogFile\n"); ++} ++ ++void registerLogFile(const char* cmd) ++{ ++ char name[256]; ++ FILE* file; ++ LogFileEntry *entry; ++ int i; ++ ++ memset(name, 0, sizeof(name)); ++ sscanf(cmd, "%*s %256s", name); ++ ++ for (i = 0; i < level_ctnr(LogFileList); i++) { ++ ConfigLogFile *conf = get_ctnr(LogFileList, i); ++ if (!strcmp(conf->name, name)) { ++ if ((file = fopen(conf->path, "r")) == NULL) { ++ print_error("fopen()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ fseek(file, 0, SEEK_END); ++ ++ if ((entry = (LogFileEntry *)malloc(sizeof(LogFileEntry))) == NULL) { ++ print_error("malloc()"); ++ fprintf(CurrentClient, "0\n"); ++ return; ++ } ++ ++ entry->fh = file; ++ strncpy(entry->name, conf->name, 256); ++ entry->id = counter; ++ ++ push_ctnr(LogFiles, entry); ++ ++ fprintf(CurrentClient, "%lu\n", counter); ++ counter++; ++ ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "0\n"); ++} ++ ++void unregisterLogFile(const char* cmd) ++{ ++ unsigned long id; ++ int i; ++ ++ sscanf(cmd, "%*s %lu", &id); ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ ++ if (entry->id == id) { ++ fclose(entry->fh); ++ free(remove_ctnr(LogFiles, i)); ++ fprintf(CurrentClient, "\n"); ++ return; ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printRegistered(const char* cmd) ++{ ++ int i; ++ ++ for (i = 0; i < level_ctnr(LogFiles); i++) { ++ LogFileEntry *entry = get_ctnr(LogFiles, i); ++ fprintf(CurrentClient, "%s:%lu\n", entry->name, entry->id); ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} diff --git a/x11/kdebase4/files/patch-logfile.h b/x11/kdebase4/files/patch-logfile.h new file mode 100644 index 000000000000..69b8d6ed1ca6 --- /dev/null +++ b/x11/kdebase4/files/patch-logfile.h @@ -0,0 +1,40 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/logfile.h Mon Nov 19 17:07:55 2001 +@@ -0,0 +1,37 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: logfile.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _logfile_h_ ++#define _logfile_h_ ++ ++void initLogFile(void); ++void exitLogFile(void); ++ ++void printLogFile(const char* cmd); ++void printLogFileInfo(const char* cmd); ++ ++void registerLogFile(const char* cmd); ++void unregisterLogFile(const char* cmd); ++ ++/* debug command */ ++void printRegistered(const char* cmd); ++ ++#endif diff --git a/x11/kdebase4/files/patch-netdev.c b/x11/kdebase4/files/patch-netdev.c new file mode 100644 index 000000000000..2c0f473ebbcf --- /dev/null +++ b/x11/kdebase4/files/patch-netdev.c @@ -0,0 +1,322 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.c Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,319 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#include <fcntl.h> ++#include <sys/socket.h> ++#include <net/if.h> ++#include <net/if_mib.h> ++#include <stdio.h> ++#include <string.h> ++#include <sys/sysctl.h> ++#include <sys/time.h> ++#include <sys/types.h> ++#include <unistd.h> ++ ++ ++#include "Command.h" ++#include "ksysguardd.h" ++#include "netdev.h" ++ ++ ++typedef struct { ++ char name[32]; ++ u_long recBytes; ++ u_long recPacks; ++ u_long recErrs; ++ u_long recDrop; ++ u_long recMulticast; ++ u_long sentBytes; ++ u_long sentPacks; ++ u_long sentErrs; ++ u_long sentMulticast; ++ u_long sentColls; ++} NetDevInfo; ++ ++#define MAXNETDEVS 64 ++static NetDevInfo NetDevs[MAXNETDEVS]; ++static int NetDevCnt = 0; ++ ++char **parseCommand(const char *cmd) ++{ ++ char tmp_cmd[1024]; ++ char *begin; ++ static char sensor[100]; ++ static char interface[100]; ++ static char* retval[2]; ++ ++ strncpy(tmp_cmd, cmd, 1024); ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin++; ++ strcpy(sensor, begin); ++ retval[1] = sensor; ++ ++ begin = rindex(tmp_cmd, '/'); ++ *begin = '\0'; ++ begin = rindex(tmp_cmd, '/'); ++ begin++; ++ strcpy(interface, begin); ++ retval[0] = interface; ++ ++ return retval; ++} ++ ++int numActivIfaces(void) ++{ ++ int counter = 0; ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) ++ counter++; ++ } ++ ++ return counter; ++} ++ ++/* ------------------------------ public part --------------------------- */ ++ ++void initNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ updateNetDev(); ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); ++ } ++} ++ ++void exitNetDev(void) ++{ ++ int i; ++ char monitor[1024]; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); ++ removeMonitor(monitor); ++ snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); ++ removeMonitor(monitor); ++ } ++} ++ ++void updateNetDev(void) ++{ ++ int name[6]; ++ int num_iface, i; ++ size_t len; ++ struct ifmibdata ifmd; ++ ++ len = sizeof(num_iface); ++ sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); ++ ++ NetDevCnt = 0; ++ for (i = 1; i < num_iface + 1; i++) { ++ name[0] = CTL_NET; ++ name[1] = PF_LINK; ++ name[2] = NETLINK_GENERIC; ++ name[3] = IFMIB_IFDATA; ++ name[4] = i; ++ name[5] = IFDATA_GENERAL; ++ ++ len = sizeof(ifmd); ++ sysctl(name, 6, &ifmd, &len, NULL, 0); ++ if (ifmd.ifmd_flags & IFF_UP) { ++ strncpy(NetDevs[NetDevCnt].name, ifmd.ifmd_name, 32); ++ NetDevs[NetDevCnt].recBytes = ifmd.ifmd_data.ifi_ibytes - NetDevs[NetDevCnt].recBytes; ++ NetDevs[NetDevCnt].recPacks = ifmd.ifmd_data.ifi_ipackets - NetDevs[NetDevCnt].recPacks; ++ NetDevs[NetDevCnt].recErrs = ifmd.ifmd_data.ifi_ierrors - NetDevs[NetDevCnt].recErrs; ++ NetDevs[NetDevCnt].recDrop = ifmd.ifmd_data.ifi_iqdrops - NetDevs[NetDevCnt].recDrop; ++ NetDevs[NetDevCnt].recMulticast = ifmd.ifmd_data.ifi_imcasts - NetDevs[NetDevCnt].recMulticast; ++ NetDevs[NetDevCnt].sentBytes = ifmd.ifmd_data.ifi_obytes - NetDevs[NetDevCnt].sentBytes; ++ NetDevs[NetDevCnt].sentPacks = ifmd.ifmd_data.ifi_opackets - NetDevs[NetDevCnt].sentPacks; ++ NetDevs[NetDevCnt].sentErrs = ifmd.ifmd_data.ifi_oerrors - NetDevs[NetDevCnt].sentErrs; ++ NetDevs[NetDevCnt].sentMulticast = ifmd.ifmd_data.ifi_omcasts - NetDevs[NetDevCnt].sentMulticast; ++ NetDevs[NetDevCnt].sentColls = ifmd.ifmd_data.ifi_collisions - NetDevs[NetDevCnt].sentColls; ++ NetDevCnt++; ++ } ++ } ++} ++ ++void checkNetDev(void) ++{ ++ if (numActivIfaces() != NetDevCnt) { ++ /* interface has been added or removed ++ so we do a reset */ ++ exitNetDev(); ++ initNetDev(); ++ } ++} ++ ++void printNetDevRecBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recErrs); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recDrop); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].recMulticast); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevRecBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Received Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Received Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Receiver Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "drops", 5)) ++ fprintf(CurrentClient, "Receiver Drops\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Received Multicast Packets\t0\t0\t1/s\n"); ++} ++ ++void printNetDevSentBytes(const char *cmd) ++{ ++ int i; ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[0] == NULL || retval[1] == NULL) ++ return; ++ ++ for (i = 0; i < NetDevCnt; i++) { ++ if (!strcmp(NetDevs[i].name, retval[0])) { ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentBytes); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentPacks); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentErrs); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentMulticast); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "%lu", NetDevs[i].sentColls); ++ } ++ } ++ ++ fprintf(CurrentClient, "\n"); ++} ++ ++void printNetDevSentBytesInfo(const char *cmd) ++{ ++ char **retval; ++ ++ retval = parseCommand(cmd); ++ ++ if (retval[1] == NULL) ++ return; ++ ++ if (!strncmp(retval[1], "data", 4)) ++ fprintf(CurrentClient, "Sent Data\t0\t0\tkBytes/s\n"); ++ if (!strncmp(retval[1], "packets", 7)) ++ fprintf(CurrentClient, "Sent Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "errors", 6)) ++ fprintf(CurrentClient, "Transmitter Errors\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "multicast", 9)) ++ fprintf(CurrentClient, "Sent Multicast Packets\t0\t0\t1/s\n"); ++ if (!strncmp(retval[1], "collisions", 10)) ++ fprintf(CurrentClient, "Transmitter Collisions\t0\t0\t1/s\n"); ++} diff --git a/x11/kdebase4/files/patch-netdev.h b/x11/kdebase4/files/patch-netdev.h new file mode 100644 index 000000000000..3c291f85dc9e --- /dev/null +++ b/x11/kdebase4/files/patch-netdev.h @@ -0,0 +1,39 @@ +--- /dev/null Mon Nov 19 17:14:17 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.h Mon Nov 19 17:08:04 2001 +@@ -0,0 +1,36 @@ ++/* ++ KSysGuard, the KDE System Guard ++ ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of version 2 of the GNU General Public ++ License as published by the Free Software Foundation. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++ $Id: netdev.h,v 1.2 2001/09/18 14:03:53 tokoe Exp $ ++*/ ++ ++#ifndef _netdev_h_ ++#define _netdev_h_ ++ ++void initNetDev(void); ++void exitNetDev(void); ++ ++void updateNetDev(void); ++void checkNetDev(void); ++ ++void printNetDevRecBytes(const char* cmd); ++void printNetDevRecBytesInfo(const char* cmd); ++void printNetDevSentBytes(const char* cmd); ++void printNetDevSentBytesInfo(const char* cmd); ++ ++#endif diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist index 5466b74bfbc6..3b9d7855dd8d 100644 --- a/x11/kdebase4/pkg-plist +++ b/x11/kdebase4/pkg-plist @@ -229,7 +229,6 @@ lib/kde2/libkcm_kwinoptions.la lib/kde2/libkcm_kwinoptions.so lib/kde2/libkcm_launch.la lib/kde2/libkcm_launch.so -lib/kde2/libkcm_launch.so.0 lib/kde2/libkcm_locale.la lib/kde2/libkcm_locale.so lib/kde2/libkcm_midi.la @@ -277,7 +276,6 @@ lib/kde2/libkonqsidebartree_dirtree.la lib/kde2/libkonqsidebartree_dirtree.so lib/kde2/libkonqsidebartree_history.la lib/kde2/libkonqsidebartree_history.so -lib/kde2/libkonqsidebartree_history.so.0 lib/kde2/libkonqsound.la lib/kde2/libkonqsound.so lib/kde2/libkonqtree.la @@ -1146,9 +1144,6 @@ share/apps/konsole/konsole_part.rc share/apps/konsole/linux.desktop share/apps/konsole/linux.keytab share/apps/konsole/mc.desktop -share/apps/konsole/pics/brightness.png -share/apps/konsole/pics/colourness.png -share/apps/konsole/pics/contrast.png share/apps/konsole/shell.desktop share/apps/konsole/su.desktop share/apps/konsole/sumc.desktop @@ -1284,8 +1279,14 @@ share/config/imsmaprc share/config/interferencerc share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 +share/config/kdm/Xaccess +share/config/kdm/Xreset +share/config/kdm/Xservers +share/config/kdm/Xsession +share/config/kdm/Xsetup +share/config/kdm/Xstartup +share/config/kdm/Xwilling share/config/kdm/kdmrc -share/config/kdm/README share/config/klipperrc share/config/konqsidebartng.rc share/config/konsolerc @@ -2158,6 +2159,8 @@ share/locale/l10n/hr/entry.desktop share/locale/l10n/hr/flag.png share/locale/l10n/hu/entry.desktop share/locale/l10n/hu/flag.png +share/locale/l10n/id/entry.desktop +share/locale/l10n/id/flag.png share/locale/l10n/ie/entry.desktop share/locale/l10n/ie/flag.png share/locale/l10n/il/entry.desktop @@ -2426,18 +2429,12 @@ share/wallpapers/simple_wallpaper.jpg share/wallpapers/sunday_brunch.jpg share/wallpapers/vegetative_fog.jpg @dirrm share/wallpapers -@exec mkdir %D/share/templates/.source/emptydir -@exec chmod 644 %D/share/templates/.source/emptydir -@unexec rmdir %D/share/templates/.source/emptydir +@dirrm share/templates/.source/emptydir @dirrm share/templates/.source @dirrm share/templates @dirrm share/sounds -@dirrm share/servicetypes @dirrm share/services/useragentstrings @dirrm share/services/searchproviders -@dirrm share/services/kded -@dirrm share/services -@dirrm share/mimelnk/application @dirrm share/locale/l10n/za @dirrm share/locale/l10n/ve @dirrm share/locale/l10n/vc @@ -2479,6 +2476,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/is @dirrm share/locale/l10n/il @dirrm share/locale/l10n/ie +@dirrm share/locale/l10n/id @dirrm share/locale/l10n/hu @dirrm share/locale/l10n/hr @dirrm share/locale/l10n/hn @@ -2512,22 +2510,13 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/locale/l10n/ag @dirrm share/locale/l10n/C @dirrm share/locale/l10n -@dirrm share/locale/C -@dirrm share/locale @dirrm share/icons/locolor/32x32/apps @dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/16x16/apps @dirrm share/icons/locolor/16x16 @dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/filesystems @dirrm share/icons/hicolor/48x48/apps -@dirrm share/icons/hicolor/32x32/filesystems @dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32/actions -@dirrm share/icons/hicolor/22x22/actions -@dirrm share/icons/hicolor/16x16/filesystems -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16/actions @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/HTML/en/kwrite @@ -2552,9 +2541,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/doc/HTML/en/kaddressbook -@dirrm share/doc/HTML/en @dirrm share/config/kdm -@dirrm share/config @dirrm share/autostart @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @@ -2572,7 +2559,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kscreensaver @dirrm share/apps/kpersonalizer/pics @dirrm share/apps/kpersonalizer -@dirrm share/apps/konsole/pics @dirrm share/apps/konsole @dirrm share/apps/konqueror/tiles @dirrm share/apps/konqueror/profiles @@ -2658,7 +2644,6 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kdcop @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol -@dirrm share/apps/kconf_update @dirrm share/apps/kcmusb @dirrm share/apps/kcmlocale/pics @dirrm share/apps/kcmlocale @@ -2755,6 +2740,5 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/applnk/Applications @dirrm share/applnk/.hidden @dirrm share/applnk -@dirrm lib/kde2 @dirrm include/kwin @dirrm include/kate diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 2fe7dd86c537..0db309ff14e8 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdelibs -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,12 +14,16 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 \ + autoconf213:${PORTSDIR}/devel/autoconf213 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ fam.0:${PORTSDIR}/devel/fam \ - cups.2:${PORTSDIR}/print/cups \ xml2.5:${PORTSDIR}/textproc/libxml2 \ - pcre.0:${PORTSDIR}/devel/pcre + pcre.0:${PORTSDIR}/devel/pcre \ + cups.2:${PORTSDIR}/print/cups-base \ + xslt.1:${PORTSDIR}/textproc/libxslt .if !exists(/usr/bin/bzip2) LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif @@ -32,7 +36,13 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install \ - --disable-final + --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif .if ${MACHINE_ARCH} == "alpha" CFLAGS= -O0 ${KDE_CFLAGS} @@ -68,6 +78,15 @@ pre-extract: .endif pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@-O2@-O0@g; s@\"-lfam@\"-L${LOCALBASE}/lib -lfam@g" ${WRKSRC}/configure ${PERL} -pi -e "s@kspell api@@g" ${WRKSRC}/doc/Makefile.in (find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \ @@ -80,8 +99,8 @@ post-configure: post-install: ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh > ${PREFIX}/etc/rc.d/kdelibs.sh ${CHMOD} 755 ${PREFIX}/etc/rc.d/kdelibs.sh -.for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \ - kparts kspell ksycoca kjava +.for LIB in DCOP kab kdecore kdesu kdeui kfile kio kjs kparts kspell \ + ksycoca kjava @${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${SOMAJOR} ${PREFIX}/lib/lib${LIB}.so .endfor .for LIB in artsc artsflow artsflow_idl kmid kmedia2_idl qtmcop soundserver_idl diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo index 0fe3f4482c9a..ebfd9d6443b2 100644 --- a/x11/kdelibs2/distinfo +++ b/x11/kdelibs2/distinfo @@ -1 +1 @@ -MD5 (KDE/kdelibs-2.2.1.tar.bz2) = 3aa73b3fe7095b3bab3081bece73f56f +MD5 (KDE/kdelibs-2.2.2.tar.bz2) = 51ec17dce9c62b50a3c2e97e4511cdcf diff --git a/x11/kdelibs2/files/patch-kdeprint::imagetops b/x11/kdelibs2/files/patch-kdeprint::imagetops new file mode 100644 index 000000000000..518e0b981e59 --- /dev/null +++ b/x11/kdelibs2/files/patch-kdeprint::imagetops @@ -0,0 +1,25 @@ +--- kdeprint/filters/imagetops.orig Wed Nov 28 12:25:21 2001 ++++ kdeprint/filters/imagetops Wed Nov 28 12:29:50 2001 +@@ -27,11 +27,17 @@ + # check the file mime type, and set the command correspondingly + cmd= + magic=`file -bi $FILE` +-if [[ $magic != image/* ]] ; then +- echo "Not an image" +- exit 1; +-fi +-case ${magic/image\//} in ++ ++case $magic in ++ image/*) ++ ;; ++ *) ++ echo "Not an image" ++ exit 1; ++ ;; ++esac ++ ++case ${magic##image\/} in + jpeg) + cmd="djpeg -pnm" + ;; diff --git a/x11/kdelibs2/files/patch-kio::job.cpp b/x11/kdelibs2/files/patch-kio::job.cpp new file mode 100644 index 000000000000..113a0eb1a13e --- /dev/null +++ b/x11/kdelibs2/files/patch-kio::job.cpp @@ -0,0 +1,11 @@ +--- kio/job.cpp.20011019 Fri Oct 19 16:09:57 2001 ++++ kio/job.cpp Tue Oct 30 21:49:15 2001 +@@ -2472,7 +2472,7 @@ + // But for files coming from TAR, we want to preserve permissions -> we use default perms only if from remote + // The real fix would be KProtocolInfo::inputType(protocol) == T_FILESYSTEM, but we can't access ksycoca from here ! + bool remoteSource = !(*it).uSource.isLocalFile() && ((*it).uSource.protocol() != "tar"); // HACK +- mode_t permissions = ( remoteSource && (*it).uDest.isLocalFile() ) ? (mode_t)-1 : (*it).permissions; ++ int permissions = ( remoteSource && (*it).uDest.isLocalFile() ) ? -1 : (*it).permissions; + KIO::FileCopyJob * copyJob = KIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ ); + copyJob->setSourceSize( (*it).size ); + newjob = copyJob; diff --git a/x11/kdelibs2/pkg-plist b/x11/kdelibs2/pkg-plist index 990f3f257b84..db707e19d87e 100644 --- a/x11/kdelibs2/pkg-plist +++ b/x11/kdelibs2/pkg-plist @@ -1,4 +1,3 @@ -@exec %%LDCONFIG%% -m %D/lib/kde2 bin/artsc-config bin/artscat bin/artsd @@ -156,6 +155,7 @@ include/kallocator.h include/kalphapainter.h include/kanimwidget.h include/kapp.h +include/kapplication.h include/karrowbutton.h include/kasyncio.h include/kaudioplayer.h @@ -407,6 +407,7 @@ include/ksslpkcs12.h include/ksslsettings.h include/ksslutils.h include/ksslx509map.h +include/kstandarddirs.h include/kstartupinfo.h include/kstaticdeleter.h include/kstatusbar.h @@ -433,6 +434,7 @@ include/ktoolbarbutton.h include/ktoolbarradiogroup.h include/ktrader.h include/kuniqueapp.h +include/kuniqueapplication.h include/kunload.h include/kurifilter.h include/kurl.h @@ -578,6 +580,8 @@ lib/libkab.so.4 lib/libkdecore.la lib/libkdecore.so lib/libkdecore.so.4 +lib/libkded_kssld.la +lib/libkded_kssld.so lib/libkdefakes.la lib/libkdefakes.so lib/libkdefakes.so.4 @@ -596,7 +600,6 @@ lib/libkdeui.so.4 lib/libkfile.la lib/libkfile.so lib/libkfile.so.4 -lib/libkformula.so lib/libkhtml.la lib/libkhtml.so lib/libkhtml.so.4 @@ -1009,20 +1012,6 @@ share/apps/ksgmltools2/customization/nl/entities/update-doc.docbook share/apps/ksgmltools2/customization/nl/lang.entities share/apps/ksgmltools2/customization/nl/strings.entities share/apps/ksgmltools2/customization/nl/user.entities -share/apps/ksgmltools2/customization/no/catalog -share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook -share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook -share/apps/ksgmltools2/customization/no/entities/lgpl-notice.docbook -share/apps/ksgmltools2/customization/no/entities/report-bugs.docbook -share/apps/ksgmltools2/customization/no/entities/underArtisticLicense.docbook -share/apps/ksgmltools2/customization/no/entities/underBSDLicense.docbook -share/apps/ksgmltools2/customization/no/entities/underFDL.docbook -share/apps/ksgmltools2/customization/no/entities/underGPL.docbook -share/apps/ksgmltools2/customization/no/entities/underX11License.docbook -share/apps/ksgmltools2/customization/no/entities/update-doc.docbook -share/apps/ksgmltools2/customization/no/lang.entities -share/apps/ksgmltools2/customization/no/strings.entities -share/apps/ksgmltools2/customization/no/user.entities share/apps/ksgmltools2/customization/no-NY/catalog share/apps/ksgmltools2/customization/no-NY/entities/fdl-notice.docbook share/apps/ksgmltools2/customization/no-NY/entities/gpl-notice.docbook @@ -1037,6 +1026,20 @@ share/apps/ksgmltools2/customization/no-NY/entities/update-doc.docbook share/apps/ksgmltools2/customization/no-NY/lang.entities share/apps/ksgmltools2/customization/no-NY/strings.entities share/apps/ksgmltools2/customization/no-NY/user.entities +share/apps/ksgmltools2/customization/no/catalog +share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook +share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook +share/apps/ksgmltools2/customization/no/entities/lgpl-notice.docbook +share/apps/ksgmltools2/customization/no/entities/report-bugs.docbook +share/apps/ksgmltools2/customization/no/entities/underArtisticLicense.docbook +share/apps/ksgmltools2/customization/no/entities/underBSDLicense.docbook +share/apps/ksgmltools2/customization/no/entities/underFDL.docbook +share/apps/ksgmltools2/customization/no/entities/underGPL.docbook +share/apps/ksgmltools2/customization/no/entities/underX11License.docbook +share/apps/ksgmltools2/customization/no/entities/update-doc.docbook +share/apps/ksgmltools2/customization/no/lang.entities +share/apps/ksgmltools2/customization/no/strings.entities +share/apps/ksgmltools2/customization/no/user.entities share/apps/ksgmltools2/customization/pl/catalog share/apps/ksgmltools2/customization/pl/entities/fdl-notice.docbook share/apps/ksgmltools2/customization/pl/entities/gpl-notice.docbook @@ -1051,20 +1054,6 @@ share/apps/ksgmltools2/customization/pl/entities/update-doc.docbook share/apps/ksgmltools2/customization/pl/lang.entities share/apps/ksgmltools2/customization/pl/strings.entities share/apps/ksgmltools2/customization/pl/user.entities -share/apps/ksgmltools2/customization/pt/catalog -share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook -share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook -share/apps/ksgmltools2/customization/pt/entities/lgpl-notice.docbook -share/apps/ksgmltools2/customization/pt/entities/report-bugs.docbook -share/apps/ksgmltools2/customization/pt/entities/underArtisticLicense.docbook -share/apps/ksgmltools2/customization/pt/entities/underBSDLicense.docbook -share/apps/ksgmltools2/customization/pt/entities/underFDL.docbook -share/apps/ksgmltools2/customization/pt/entities/underGPL.docbook -share/apps/ksgmltools2/customization/pt/entities/underX11License.docbook -share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook -share/apps/ksgmltools2/customization/pt/lang.entities -share/apps/ksgmltools2/customization/pt/strings.entities -share/apps/ksgmltools2/customization/pt/user.entities share/apps/ksgmltools2/customization/pt-BR/catalog share/apps/ksgmltools2/customization/pt-BR/entities/fdl-notice.docbook share/apps/ksgmltools2/customization/pt-BR/entities/gpl-notice.docbook @@ -1079,6 +1068,20 @@ share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook share/apps/ksgmltools2/customization/pt-BR/lang.entities share/apps/ksgmltools2/customization/pt-BR/strings.entities share/apps/ksgmltools2/customization/pt-BR/user.entities +share/apps/ksgmltools2/customization/pt/catalog +share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook +share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook +share/apps/ksgmltools2/customization/pt/entities/lgpl-notice.docbook +share/apps/ksgmltools2/customization/pt/entities/report-bugs.docbook +share/apps/ksgmltools2/customization/pt/entities/underArtisticLicense.docbook +share/apps/ksgmltools2/customization/pt/entities/underBSDLicense.docbook +share/apps/ksgmltools2/customization/pt/entities/underFDL.docbook +share/apps/ksgmltools2/customization/pt/entities/underGPL.docbook +share/apps/ksgmltools2/customization/pt/entities/underX11License.docbook +share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook +share/apps/ksgmltools2/customization/pt/lang.entities +share/apps/ksgmltools2/customization/pt/strings.entities +share/apps/ksgmltools2/customization/pt/user.entities share/apps/ksgmltools2/customization/ro/catalog share/apps/ksgmltools2/customization/ro/entities/fdl-notice.docbook share/apps/ksgmltools2/customization/ro/entities/gpl-notice.docbook @@ -1295,6 +1298,7 @@ share/apps/ksgmltools2/docbook/xsl/common/subtitles.xsl share/apps/ksgmltools2/docbook/xsl/common/sv.xml share/apps/ksgmltools2/docbook/xsl/common/titles.xsl share/apps/ksgmltools2/docbook/xsl/common/tr.xml +share/apps/ksgmltools2/docbook/xsl/common/xh.xml share/apps/ksgmltools2/docbook/xsl/common/zh_cn.xml share/apps/ksgmltools2/docbook/xsl/common/zh_tw.xml share/apps/ksgmltools2/docbook/xsl/html/ChangeLog @@ -2585,6 +2589,7 @@ share/services/kaclplugin.desktop share/services/kbzip2filter.desktop share/services/kcookiejar.desktop share/services/kded/kdeprintd.desktop +share/services/kded/kssld.desktop share/services/kgzipfilter.desktop share/services/khtml.desktop share/services/khtmlimage.desktop @@ -2687,15 +2692,15 @@ share/servicetypes/kurifilterplugin.desktop @dirrm share/apps/ksgmltools2/customization/ru @dirrm share/apps/ksgmltools2/customization/ro/entities @dirrm share/apps/ksgmltools2/customization/ro +@dirrm share/apps/ksgmltools2/customization/pt/entities @dirrm share/apps/ksgmltools2/customization/pt-BR/entities @dirrm share/apps/ksgmltools2/customization/pt-BR -@dirrm share/apps/ksgmltools2/customization/pt/entities @dirrm share/apps/ksgmltools2/customization/pt @dirrm share/apps/ksgmltools2/customization/pl/entities @dirrm share/apps/ksgmltools2/customization/pl +@dirrm share/apps/ksgmltools2/customization/no/entities @dirrm share/apps/ksgmltools2/customization/no-NY/entities @dirrm share/apps/ksgmltools2/customization/no-NY -@dirrm share/apps/ksgmltools2/customization/no/entities @dirrm share/apps/ksgmltools2/customization/no @dirrm share/apps/ksgmltools2/customization/nl/entities @dirrm share/apps/ksgmltools2/customization/nl diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 2fe7dd86c537..0db309ff14e8 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdelibs -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,12 +14,16 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 \ + autoconf213:${PORTSDIR}/devel/autoconf213 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ fam.0:${PORTSDIR}/devel/fam \ - cups.2:${PORTSDIR}/print/cups \ xml2.5:${PORTSDIR}/textproc/libxml2 \ - pcre.0:${PORTSDIR}/devel/pcre + pcre.0:${PORTSDIR}/devel/pcre \ + cups.2:${PORTSDIR}/print/cups-base \ + xslt.1:${PORTSDIR}/textproc/libxslt .if !exists(/usr/bin/bzip2) LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif @@ -32,7 +36,13 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install \ - --disable-final + --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif .if ${MACHINE_ARCH} == "alpha" CFLAGS= -O0 ${KDE_CFLAGS} @@ -68,6 +78,15 @@ pre-extract: .endif pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@-O2@-O0@g; s@\"-lfam@\"-L${LOCALBASE}/lib -lfam@g" ${WRKSRC}/configure ${PERL} -pi -e "s@kspell api@@g" ${WRKSRC}/doc/Makefile.in (find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \ @@ -80,8 +99,8 @@ post-configure: post-install: ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh > ${PREFIX}/etc/rc.d/kdelibs.sh ${CHMOD} 755 ${PREFIX}/etc/rc.d/kdelibs.sh -.for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \ - kparts kspell ksycoca kjava +.for LIB in DCOP kab kdecore kdesu kdeui kfile kio kjs kparts kspell \ + ksycoca kjava @${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${SOMAJOR} ${PREFIX}/lib/lib${LIB}.so .endfor .for LIB in artsc artsflow artsflow_idl kmid kmedia2_idl qtmcop soundserver_idl diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 0fe3f4482c9a..ebfd9d6443b2 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdelibs-2.2.1.tar.bz2) = 3aa73b3fe7095b3bab3081bece73f56f +MD5 (KDE/kdelibs-2.2.2.tar.bz2) = 51ec17dce9c62b50a3c2e97e4511cdcf diff --git a/x11/kdelibs3/files/patch-kdeprint::imagetops b/x11/kdelibs3/files/patch-kdeprint::imagetops new file mode 100644 index 000000000000..518e0b981e59 --- /dev/null +++ b/x11/kdelibs3/files/patch-kdeprint::imagetops @@ -0,0 +1,25 @@ +--- kdeprint/filters/imagetops.orig Wed Nov 28 12:25:21 2001 ++++ kdeprint/filters/imagetops Wed Nov 28 12:29:50 2001 +@@ -27,11 +27,17 @@ + # check the file mime type, and set the command correspondingly + cmd= + magic=`file -bi $FILE` +-if [[ $magic != image/* ]] ; then +- echo "Not an image" +- exit 1; +-fi +-case ${magic/image\//} in ++ ++case $magic in ++ image/*) ++ ;; ++ *) ++ echo "Not an image" ++ exit 1; ++ ;; ++esac ++ ++case ${magic##image\/} in + jpeg) + cmd="djpeg -pnm" + ;; diff --git a/x11/kdelibs3/files/patch-kio::job.cpp b/x11/kdelibs3/files/patch-kio::job.cpp new file mode 100644 index 000000000000..113a0eb1a13e --- /dev/null +++ b/x11/kdelibs3/files/patch-kio::job.cpp @@ -0,0 +1,11 @@ +--- kio/job.cpp.20011019 Fri Oct 19 16:09:57 2001 ++++ kio/job.cpp Tue Oct 30 21:49:15 2001 +@@ -2472,7 +2472,7 @@ + // But for files coming from TAR, we want to preserve permissions -> we use default perms only if from remote + // The real fix would be KProtocolInfo::inputType(protocol) == T_FILESYSTEM, but we can't access ksycoca from here ! + bool remoteSource = !(*it).uSource.isLocalFile() && ((*it).uSource.protocol() != "tar"); // HACK +- mode_t permissions = ( remoteSource && (*it).uDest.isLocalFile() ) ? (mode_t)-1 : (*it).permissions; ++ int permissions = ( remoteSource && (*it).uDest.isLocalFile() ) ? -1 : (*it).permissions; + KIO::FileCopyJob * copyJob = KIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ ); + copyJob->setSourceSize( (*it).size ); + newjob = copyJob; diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index 990f3f257b84..db707e19d87e 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -1,4 +1,3 @@ -@exec %%LDCONFIG%% -m %D/lib/kde2 bin/artsc-config bin/artscat bin/artsd @@ -156,6 +155,7 @@ include/kallocator.h include/kalphapainter.h include/kanimwidget.h include/kapp.h +include/kapplication.h include/karrowbutton.h include/kasyncio.h include/kaudioplayer.h @@ -407,6 +407,7 @@ include/ksslpkcs12.h include/ksslsettings.h include/ksslutils.h include/ksslx509map.h +include/kstandarddirs.h include/kstartupinfo.h include/kstaticdeleter.h include/kstatusbar.h @@ -433,6 +434,7 @@ include/ktoolbarbutton.h include/ktoolbarradiogroup.h include/ktrader.h include/kuniqueapp.h +include/kuniqueapplication.h include/kunload.h include/kurifilter.h include/kurl.h @@ -578,6 +580,8 @@ lib/libkab.so.4 lib/libkdecore.la lib/libkdecore.so lib/libkdecore.so.4 +lib/libkded_kssld.la +lib/libkded_kssld.so lib/libkdefakes.la lib/libkdefakes.so lib/libkdefakes.so.4 @@ -596,7 +600,6 @@ lib/libkdeui.so.4 lib/libkfile.la lib/libkfile.so lib/libkfile.so.4 -lib/libkformula.so lib/libkhtml.la lib/libkhtml.so lib/libkhtml.so.4 @@ -1009,20 +1012,6 @@ share/apps/ksgmltools2/customization/nl/entities/update-doc.docbook share/apps/ksgmltools2/customization/nl/lang.entities share/apps/ksgmltools2/customization/nl/strings.entities share/apps/ksgmltools2/customization/nl/user.entities -share/apps/ksgmltools2/customization/no/catalog -share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook -share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook -share/apps/ksgmltools2/customization/no/entities/lgpl-notice.docbook -share/apps/ksgmltools2/customization/no/entities/report-bugs.docbook -share/apps/ksgmltools2/customization/no/entities/underArtisticLicense.docbook -share/apps/ksgmltools2/customization/no/entities/underBSDLicense.docbook -share/apps/ksgmltools2/customization/no/entities/underFDL.docbook -share/apps/ksgmltools2/customization/no/entities/underGPL.docbook -share/apps/ksgmltools2/customization/no/entities/underX11License.docbook -share/apps/ksgmltools2/customization/no/entities/update-doc.docbook -share/apps/ksgmltools2/customization/no/lang.entities -share/apps/ksgmltools2/customization/no/strings.entities -share/apps/ksgmltools2/customization/no/user.entities share/apps/ksgmltools2/customization/no-NY/catalog share/apps/ksgmltools2/customization/no-NY/entities/fdl-notice.docbook share/apps/ksgmltools2/customization/no-NY/entities/gpl-notice.docbook @@ -1037,6 +1026,20 @@ share/apps/ksgmltools2/customization/no-NY/entities/update-doc.docbook share/apps/ksgmltools2/customization/no-NY/lang.entities share/apps/ksgmltools2/customization/no-NY/strings.entities share/apps/ksgmltools2/customization/no-NY/user.entities +share/apps/ksgmltools2/customization/no/catalog +share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook +share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook +share/apps/ksgmltools2/customization/no/entities/lgpl-notice.docbook +share/apps/ksgmltools2/customization/no/entities/report-bugs.docbook +share/apps/ksgmltools2/customization/no/entities/underArtisticLicense.docbook +share/apps/ksgmltools2/customization/no/entities/underBSDLicense.docbook +share/apps/ksgmltools2/customization/no/entities/underFDL.docbook +share/apps/ksgmltools2/customization/no/entities/underGPL.docbook +share/apps/ksgmltools2/customization/no/entities/underX11License.docbook +share/apps/ksgmltools2/customization/no/entities/update-doc.docbook +share/apps/ksgmltools2/customization/no/lang.entities +share/apps/ksgmltools2/customization/no/strings.entities +share/apps/ksgmltools2/customization/no/user.entities share/apps/ksgmltools2/customization/pl/catalog share/apps/ksgmltools2/customization/pl/entities/fdl-notice.docbook share/apps/ksgmltools2/customization/pl/entities/gpl-notice.docbook @@ -1051,20 +1054,6 @@ share/apps/ksgmltools2/customization/pl/entities/update-doc.docbook share/apps/ksgmltools2/customization/pl/lang.entities share/apps/ksgmltools2/customization/pl/strings.entities share/apps/ksgmltools2/customization/pl/user.entities -share/apps/ksgmltools2/customization/pt/catalog -share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook -share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook -share/apps/ksgmltools2/customization/pt/entities/lgpl-notice.docbook -share/apps/ksgmltools2/customization/pt/entities/report-bugs.docbook -share/apps/ksgmltools2/customization/pt/entities/underArtisticLicense.docbook -share/apps/ksgmltools2/customization/pt/entities/underBSDLicense.docbook -share/apps/ksgmltools2/customization/pt/entities/underFDL.docbook -share/apps/ksgmltools2/customization/pt/entities/underGPL.docbook -share/apps/ksgmltools2/customization/pt/entities/underX11License.docbook -share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook -share/apps/ksgmltools2/customization/pt/lang.entities -share/apps/ksgmltools2/customization/pt/strings.entities -share/apps/ksgmltools2/customization/pt/user.entities share/apps/ksgmltools2/customization/pt-BR/catalog share/apps/ksgmltools2/customization/pt-BR/entities/fdl-notice.docbook share/apps/ksgmltools2/customization/pt-BR/entities/gpl-notice.docbook @@ -1079,6 +1068,20 @@ share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook share/apps/ksgmltools2/customization/pt-BR/lang.entities share/apps/ksgmltools2/customization/pt-BR/strings.entities share/apps/ksgmltools2/customization/pt-BR/user.entities +share/apps/ksgmltools2/customization/pt/catalog +share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook +share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook +share/apps/ksgmltools2/customization/pt/entities/lgpl-notice.docbook +share/apps/ksgmltools2/customization/pt/entities/report-bugs.docbook +share/apps/ksgmltools2/customization/pt/entities/underArtisticLicense.docbook +share/apps/ksgmltools2/customization/pt/entities/underBSDLicense.docbook +share/apps/ksgmltools2/customization/pt/entities/underFDL.docbook +share/apps/ksgmltools2/customization/pt/entities/underGPL.docbook +share/apps/ksgmltools2/customization/pt/entities/underX11License.docbook +share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook +share/apps/ksgmltools2/customization/pt/lang.entities +share/apps/ksgmltools2/customization/pt/strings.entities +share/apps/ksgmltools2/customization/pt/user.entities share/apps/ksgmltools2/customization/ro/catalog share/apps/ksgmltools2/customization/ro/entities/fdl-notice.docbook share/apps/ksgmltools2/customization/ro/entities/gpl-notice.docbook @@ -1295,6 +1298,7 @@ share/apps/ksgmltools2/docbook/xsl/common/subtitles.xsl share/apps/ksgmltools2/docbook/xsl/common/sv.xml share/apps/ksgmltools2/docbook/xsl/common/titles.xsl share/apps/ksgmltools2/docbook/xsl/common/tr.xml +share/apps/ksgmltools2/docbook/xsl/common/xh.xml share/apps/ksgmltools2/docbook/xsl/common/zh_cn.xml share/apps/ksgmltools2/docbook/xsl/common/zh_tw.xml share/apps/ksgmltools2/docbook/xsl/html/ChangeLog @@ -2585,6 +2589,7 @@ share/services/kaclplugin.desktop share/services/kbzip2filter.desktop share/services/kcookiejar.desktop share/services/kded/kdeprintd.desktop +share/services/kded/kssld.desktop share/services/kgzipfilter.desktop share/services/khtml.desktop share/services/khtmlimage.desktop @@ -2687,15 +2692,15 @@ share/servicetypes/kurifilterplugin.desktop @dirrm share/apps/ksgmltools2/customization/ru @dirrm share/apps/ksgmltools2/customization/ro/entities @dirrm share/apps/ksgmltools2/customization/ro +@dirrm share/apps/ksgmltools2/customization/pt/entities @dirrm share/apps/ksgmltools2/customization/pt-BR/entities @dirrm share/apps/ksgmltools2/customization/pt-BR -@dirrm share/apps/ksgmltools2/customization/pt/entities @dirrm share/apps/ksgmltools2/customization/pt @dirrm share/apps/ksgmltools2/customization/pl/entities @dirrm share/apps/ksgmltools2/customization/pl +@dirrm share/apps/ksgmltools2/customization/no/entities @dirrm share/apps/ksgmltools2/customization/no-NY/entities @dirrm share/apps/ksgmltools2/customization/no-NY -@dirrm share/apps/ksgmltools2/customization/no/entities @dirrm share/apps/ksgmltools2/customization/no @dirrm share/apps/ksgmltools2/customization/nl/entities @dirrm share/apps/ksgmltools2/customization/nl diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 2fe7dd86c537..0db309ff14e8 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdelibs -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -14,12 +14,16 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org +BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 \ + autoconf213:${PORTSDIR}/devel/autoconf213 \ + objprelink:${PORTSDIR}/devel/objprelink LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ fam.0:${PORTSDIR}/devel/fam \ - cups.2:${PORTSDIR}/print/cups \ xml2.5:${PORTSDIR}/textproc/libxml2 \ - pcre.0:${PORTSDIR}/devel/pcre + pcre.0:${PORTSDIR}/devel/pcre \ + cups.2:${PORTSDIR}/print/cups-base \ + xslt.1:${PORTSDIR}/textproc/libxslt .if !exists(/usr/bin/bzip2) LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif @@ -32,7 +36,13 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install \ - --disable-final + --enable-objprelink +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) +CONFIGURE_ARGS+=--enable-final +.endif +.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif .if ${MACHINE_ARCH} == "alpha" CFLAGS= -O0 ${KDE_CFLAGS} @@ -68,6 +78,15 @@ pre-extract: .endif pre-configure: + ${MKDIR} ${WRKSRC}/auto-bin +.for AC in autoconf autoheader + ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} +.endfor +.for AM in automake aclocal + ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} +.endfor + cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \ + ${GMAKE} -f Makefile.cvs ${PERL} -pi -e "s@-O2@-O0@g; s@\"-lfam@\"-L${LOCALBASE}/lib -lfam@g" ${WRKSRC}/configure ${PERL} -pi -e "s@kspell api@@g" ${WRKSRC}/doc/Makefile.in (find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \ @@ -80,8 +99,8 @@ post-configure: post-install: ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh > ${PREFIX}/etc/rc.d/kdelibs.sh ${CHMOD} 755 ${PREFIX}/etc/rc.d/kdelibs.sh -.for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \ - kparts kspell ksycoca kjava +.for LIB in DCOP kab kdecore kdesu kdeui kfile kio kjs kparts kspell \ + ksycoca kjava @${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${SOMAJOR} ${PREFIX}/lib/lib${LIB}.so .endfor .for LIB in artsc artsflow artsflow_idl kmid kmedia2_idl qtmcop soundserver_idl diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 0fe3f4482c9a..ebfd9d6443b2 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1 +1 @@ -MD5 (KDE/kdelibs-2.2.1.tar.bz2) = 3aa73b3fe7095b3bab3081bece73f56f +MD5 (KDE/kdelibs-2.2.2.tar.bz2) = 51ec17dce9c62b50a3c2e97e4511cdcf diff --git a/x11/kdelibs4/files/patch-kdeprint::imagetops b/x11/kdelibs4/files/patch-kdeprint::imagetops new file mode 100644 index 000000000000..518e0b981e59 --- /dev/null +++ b/x11/kdelibs4/files/patch-kdeprint::imagetops @@ -0,0 +1,25 @@ +--- kdeprint/filters/imagetops.orig Wed Nov 28 12:25:21 2001 ++++ kdeprint/filters/imagetops Wed Nov 28 12:29:50 2001 +@@ -27,11 +27,17 @@ + # check the file mime type, and set the command correspondingly + cmd= + magic=`file -bi $FILE` +-if [[ $magic != image/* ]] ; then +- echo "Not an image" +- exit 1; +-fi +-case ${magic/image\//} in ++ ++case $magic in ++ image/*) ++ ;; ++ *) ++ echo "Not an image" ++ exit 1; ++ ;; ++esac ++ ++case ${magic##image\/} in + jpeg) + cmd="djpeg -pnm" + ;; diff --git a/x11/kdelibs4/files/patch-kio::job.cpp b/x11/kdelibs4/files/patch-kio::job.cpp new file mode 100644 index 000000000000..113a0eb1a13e --- /dev/null +++ b/x11/kdelibs4/files/patch-kio::job.cpp @@ -0,0 +1,11 @@ +--- kio/job.cpp.20011019 Fri Oct 19 16:09:57 2001 ++++ kio/job.cpp Tue Oct 30 21:49:15 2001 +@@ -2472,7 +2472,7 @@ + // But for files coming from TAR, we want to preserve permissions -> we use default perms only if from remote + // The real fix would be KProtocolInfo::inputType(protocol) == T_FILESYSTEM, but we can't access ksycoca from here ! + bool remoteSource = !(*it).uSource.isLocalFile() && ((*it).uSource.protocol() != "tar"); // HACK +- mode_t permissions = ( remoteSource && (*it).uDest.isLocalFile() ) ? (mode_t)-1 : (*it).permissions; ++ int permissions = ( remoteSource && (*it).uDest.isLocalFile() ) ? -1 : (*it).permissions; + KIO::FileCopyJob * copyJob = KIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ ); + copyJob->setSourceSize( (*it).size ); + newjob = copyJob; diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index 990f3f257b84..db707e19d87e 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -1,4 +1,3 @@ -@exec %%LDCONFIG%% -m %D/lib/kde2 bin/artsc-config bin/artscat bin/artsd @@ -156,6 +155,7 @@ include/kallocator.h include/kalphapainter.h include/kanimwidget.h include/kapp.h +include/kapplication.h include/karrowbutton.h include/kasyncio.h include/kaudioplayer.h @@ -407,6 +407,7 @@ include/ksslpkcs12.h include/ksslsettings.h include/ksslutils.h include/ksslx509map.h +include/kstandarddirs.h include/kstartupinfo.h include/kstaticdeleter.h include/kstatusbar.h @@ -433,6 +434,7 @@ include/ktoolbarbutton.h include/ktoolbarradiogroup.h include/ktrader.h include/kuniqueapp.h +include/kuniqueapplication.h include/kunload.h include/kurifilter.h include/kurl.h @@ -578,6 +580,8 @@ lib/libkab.so.4 lib/libkdecore.la lib/libkdecore.so lib/libkdecore.so.4 +lib/libkded_kssld.la +lib/libkded_kssld.so lib/libkdefakes.la lib/libkdefakes.so lib/libkdefakes.so.4 @@ -596,7 +600,6 @@ lib/libkdeui.so.4 lib/libkfile.la lib/libkfile.so lib/libkfile.so.4 -lib/libkformula.so lib/libkhtml.la lib/libkhtml.so lib/libkhtml.so.4 @@ -1009,20 +1012,6 @@ share/apps/ksgmltools2/customization/nl/entities/update-doc.docbook share/apps/ksgmltools2/customization/nl/lang.entities share/apps/ksgmltools2/customization/nl/strings.entities share/apps/ksgmltools2/customization/nl/user.entities -share/apps/ksgmltools2/customization/no/catalog -share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook -share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook -share/apps/ksgmltools2/customization/no/entities/lgpl-notice.docbook -share/apps/ksgmltools2/customization/no/entities/report-bugs.docbook -share/apps/ksgmltools2/customization/no/entities/underArtisticLicense.docbook -share/apps/ksgmltools2/customization/no/entities/underBSDLicense.docbook -share/apps/ksgmltools2/customization/no/entities/underFDL.docbook -share/apps/ksgmltools2/customization/no/entities/underGPL.docbook -share/apps/ksgmltools2/customization/no/entities/underX11License.docbook -share/apps/ksgmltools2/customization/no/entities/update-doc.docbook -share/apps/ksgmltools2/customization/no/lang.entities -share/apps/ksgmltools2/customization/no/strings.entities -share/apps/ksgmltools2/customization/no/user.entities share/apps/ksgmltools2/customization/no-NY/catalog share/apps/ksgmltools2/customization/no-NY/entities/fdl-notice.docbook share/apps/ksgmltools2/customization/no-NY/entities/gpl-notice.docbook @@ -1037,6 +1026,20 @@ share/apps/ksgmltools2/customization/no-NY/entities/update-doc.docbook share/apps/ksgmltools2/customization/no-NY/lang.entities share/apps/ksgmltools2/customization/no-NY/strings.entities share/apps/ksgmltools2/customization/no-NY/user.entities +share/apps/ksgmltools2/customization/no/catalog +share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook +share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook +share/apps/ksgmltools2/customization/no/entities/lgpl-notice.docbook +share/apps/ksgmltools2/customization/no/entities/report-bugs.docbook +share/apps/ksgmltools2/customization/no/entities/underArtisticLicense.docbook +share/apps/ksgmltools2/customization/no/entities/underBSDLicense.docbook +share/apps/ksgmltools2/customization/no/entities/underFDL.docbook +share/apps/ksgmltools2/customization/no/entities/underGPL.docbook +share/apps/ksgmltools2/customization/no/entities/underX11License.docbook +share/apps/ksgmltools2/customization/no/entities/update-doc.docbook +share/apps/ksgmltools2/customization/no/lang.entities +share/apps/ksgmltools2/customization/no/strings.entities +share/apps/ksgmltools2/customization/no/user.entities share/apps/ksgmltools2/customization/pl/catalog share/apps/ksgmltools2/customization/pl/entities/fdl-notice.docbook share/apps/ksgmltools2/customization/pl/entities/gpl-notice.docbook @@ -1051,20 +1054,6 @@ share/apps/ksgmltools2/customization/pl/entities/update-doc.docbook share/apps/ksgmltools2/customization/pl/lang.entities share/apps/ksgmltools2/customization/pl/strings.entities share/apps/ksgmltools2/customization/pl/user.entities -share/apps/ksgmltools2/customization/pt/catalog -share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook -share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook -share/apps/ksgmltools2/customization/pt/entities/lgpl-notice.docbook -share/apps/ksgmltools2/customization/pt/entities/report-bugs.docbook -share/apps/ksgmltools2/customization/pt/entities/underArtisticLicense.docbook -share/apps/ksgmltools2/customization/pt/entities/underBSDLicense.docbook -share/apps/ksgmltools2/customization/pt/entities/underFDL.docbook -share/apps/ksgmltools2/customization/pt/entities/underGPL.docbook -share/apps/ksgmltools2/customization/pt/entities/underX11License.docbook -share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook -share/apps/ksgmltools2/customization/pt/lang.entities -share/apps/ksgmltools2/customization/pt/strings.entities -share/apps/ksgmltools2/customization/pt/user.entities share/apps/ksgmltools2/customization/pt-BR/catalog share/apps/ksgmltools2/customization/pt-BR/entities/fdl-notice.docbook share/apps/ksgmltools2/customization/pt-BR/entities/gpl-notice.docbook @@ -1079,6 +1068,20 @@ share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook share/apps/ksgmltools2/customization/pt-BR/lang.entities share/apps/ksgmltools2/customization/pt-BR/strings.entities share/apps/ksgmltools2/customization/pt-BR/user.entities +share/apps/ksgmltools2/customization/pt/catalog +share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook +share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook +share/apps/ksgmltools2/customization/pt/entities/lgpl-notice.docbook +share/apps/ksgmltools2/customization/pt/entities/report-bugs.docbook +share/apps/ksgmltools2/customization/pt/entities/underArtisticLicense.docbook +share/apps/ksgmltools2/customization/pt/entities/underBSDLicense.docbook +share/apps/ksgmltools2/customization/pt/entities/underFDL.docbook +share/apps/ksgmltools2/customization/pt/entities/underGPL.docbook +share/apps/ksgmltools2/customization/pt/entities/underX11License.docbook +share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook +share/apps/ksgmltools2/customization/pt/lang.entities +share/apps/ksgmltools2/customization/pt/strings.entities +share/apps/ksgmltools2/customization/pt/user.entities share/apps/ksgmltools2/customization/ro/catalog share/apps/ksgmltools2/customization/ro/entities/fdl-notice.docbook share/apps/ksgmltools2/customization/ro/entities/gpl-notice.docbook @@ -1295,6 +1298,7 @@ share/apps/ksgmltools2/docbook/xsl/common/subtitles.xsl share/apps/ksgmltools2/docbook/xsl/common/sv.xml share/apps/ksgmltools2/docbook/xsl/common/titles.xsl share/apps/ksgmltools2/docbook/xsl/common/tr.xml +share/apps/ksgmltools2/docbook/xsl/common/xh.xml share/apps/ksgmltools2/docbook/xsl/common/zh_cn.xml share/apps/ksgmltools2/docbook/xsl/common/zh_tw.xml share/apps/ksgmltools2/docbook/xsl/html/ChangeLog @@ -2585,6 +2589,7 @@ share/services/kaclplugin.desktop share/services/kbzip2filter.desktop share/services/kcookiejar.desktop share/services/kded/kdeprintd.desktop +share/services/kded/kssld.desktop share/services/kgzipfilter.desktop share/services/khtml.desktop share/services/khtmlimage.desktop @@ -2687,15 +2692,15 @@ share/servicetypes/kurifilterplugin.desktop @dirrm share/apps/ksgmltools2/customization/ru @dirrm share/apps/ksgmltools2/customization/ro/entities @dirrm share/apps/ksgmltools2/customization/ro +@dirrm share/apps/ksgmltools2/customization/pt/entities @dirrm share/apps/ksgmltools2/customization/pt-BR/entities @dirrm share/apps/ksgmltools2/customization/pt-BR -@dirrm share/apps/ksgmltools2/customization/pt/entities @dirrm share/apps/ksgmltools2/customization/pt @dirrm share/apps/ksgmltools2/customization/pl/entities @dirrm share/apps/ksgmltools2/customization/pl +@dirrm share/apps/ksgmltools2/customization/no/entities @dirrm share/apps/ksgmltools2/customization/no-NY/entities @dirrm share/apps/ksgmltools2/customization/no-NY -@dirrm share/apps/ksgmltools2/customization/no/entities @dirrm share/apps/ksgmltools2/customization/no @dirrm share/apps/ksgmltools2/customization/nl/entities @dirrm share/apps/ksgmltools2/customization/nl |