From ddb723375395ad63410c36ba306d6064ea2f6398 Mon Sep 17 00:00:00 2001 From: "Chris D. Faulhaber" Date: Tue, 27 Nov 2001 12:55:50 +0000 Subject: [PATCH] Update knapster to 0.3 (which supports kde2). Submitted by: R Joseph Wright --- audio/knapster/Makefile | 6 +-- audio/knapster/distinfo | 2 +- audio/knapster/files/patch-ag | 10 ---- audio/knapster/files/patch-aj | 96 ----------------------------------- audio/knapster/pkg-plist | 49 +++++++++--------- 5 files changed, 28 insertions(+), 135 deletions(-) delete mode 100644 audio/knapster/files/patch-ag delete mode 100644 audio/knapster/files/patch-aj diff --git a/audio/knapster/Makefile b/audio/knapster/Makefile index 2bb38160a5a3..78530792383b 100644 --- a/audio/knapster/Makefile +++ b/audio/knapster/Makefile @@ -6,15 +6,15 @@ # PORTNAME= knapster -PORTVERSION= 0.13 -PORTREVISION= 1 +PORTVERSION= 0.3 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} +DISTNAME= ${PORTNAME}2-${PORTVERSION} MAINTAINER= jedgar@FreeBSD.org -USE_KDEBASE_VER=1 +USE_KDEBASE_VER=2 USE_AUTOCONF= yes USE_GMAKE= yes diff --git a/audio/knapster/distinfo b/audio/knapster/distinfo index 678c9e96b6a8..462c7eff1f4e 100644 --- a/audio/knapster/distinfo +++ b/audio/knapster/distinfo @@ -1 +1 @@ -MD5 (knapster-0.13.tar.gz) = 0abffe35faa30d8392f5269d9a53dab0 +MD5 (knapster2-0.3.tar.gz) = d1abb909d2a7941d8bb9bb460854a798 diff --git a/audio/knapster/files/patch-ag b/audio/knapster/files/patch-ag deleted file mode 100644 index 05f1e8e82bdd..000000000000 --- a/audio/knapster/files/patch-ag +++ /dev/null @@ -1,10 +0,0 @@ ---- knapster/socks5.cpp.orig Sat Feb 26 01:36:14 2000 -+++ knapster/socks5.cpp Fri Mar 10 21:00:19 2000 -@@ -15,6 +15,7 @@ - * * - ***************************************************************************/ - #include -+#include - #include - #include - #include diff --git a/audio/knapster/files/patch-aj b/audio/knapster/files/patch-aj deleted file mode 100644 index cbff9400caee..000000000000 --- a/audio/knapster/files/patch-aj +++ /dev/null @@ -1,96 +0,0 @@ ---- knapster/icmp.cpp.orig Tue Jul 25 04:09:45 2000 -+++ knapster/icmp.cpp Sun Oct 15 02:43:08 2000 -@@ -30,6 +30,7 @@ - #include - #include - -+#include - #include - #include - #include -@@ -39,6 +40,17 @@ - #include - #include - -+/* -+ * Linux compatibility crap. -+ */ -+ -+#ifndef ICMP_DEST_UNREACH -+#define ICMP_DEST_UNREACH ICMP_UNREACH -+#endif -+#ifndef ICMP_TIME_EXCEEDED -+#define ICMP_TIME_EXCEEDED ICMP_TIMXCEED -+#endif -+ - // Default length of the data in the icmp packet. - #define DATALEN (64 - 8) - -@@ -78,7 +90,7 @@ - // Packet data ... note that it is uninitialized, and the 1st bit will - // be used for time info - u_char outpack[65535 - 60 - 8]; // Max packet size (???) -- struct icmphdr *icp; -+ struct icmp *icp; - - if (IcmpPing::rawSkt < 0) - return; -@@ -88,18 +100,18 @@ - to->sin_family = AF_INET; - to->sin_addr.s_addr = ip_addr; - -- icp = (struct icmphdr *)outpack; -- icp->type = ICMP_ECHO; -- icp->code = 0; -- icp->checksum = 0; -- icp->un.echo.sequence = 0; // Assuming we only transfer one to each host -- icp->un.echo.id = 0; // Not using ID... -+ icp = (struct icmp *)outpack; -+ icp->icmp_type = ICMP_ECHO; -+ icp->icmp_code = 0; -+ icp->icmp_cksum = 0; -+ icp->icmp_hun.ih_idseq.icd_seq = 0; // Assuming we only transfer one to each host -+ icp->icmp_hun.ih_idseq.icd_id = 0; // Not using ID... - - // Insert time into packet - gettimeofday((struct timeval *)&outpack[8], - (struct timezone *)NULL); - -- icp->checksum = in_cksum((u_short *)icp, DATALEN + 8); -+ icp->icmp_cksum = in_cksum((u_short *)icp, DATALEN + 8); - - // would the MSG_DONTWAIT flag speed this up? - sendto(IcmpPing::rawSkt, (char *)outpack, DATALEN + 8, 0, -@@ -118,8 +130,8 @@ - int pktSize; - size_t fromlen; - u_char packet[PKTLEN]; -- struct iphdr *ip; -- struct icmphdr *icp; -+ struct ip *ip; -+ struct icmp *icp; - int hdrLen; - struct timeval curTime, *pktTime; - -@@ -137,11 +149,11 @@ - else - { - // TODO: add check for packet length -- ip = (struct iphdr *) packet; -- hdrLen = ip->ihl << 2; -- icp = (struct icmphdr *)(packet + hdrLen); -+ ip = (struct ip *) packet; -+ hdrLen = ip->ip_hl << 2; -+ icp = (struct icmp *)(packet + hdrLen); - -- switch (icp->type) { -+ switch (icp->icmp_type) { - case ICMP_ECHOREPLY : - gettimeofday(&curTime, (struct timezone *) NULL); - -@@ -217,4 +229,4 @@ - out->tv_usec += 1000000; - } - out->tv_sec -= in->tv_sec; --} -+} diff --git a/audio/knapster/pkg-plist b/audio/knapster/pkg-plist index db29df369525..4ef74fce8289 100644 --- a/audio/knapster/pkg-plist +++ b/audio/knapster/pkg-plist @@ -1,25 +1,24 @@ -bin/knapster -share/applnk/Applications/knapster.kdelnk -share/doc/HTML/en/knapster/index-1.html -share/doc/HTML/en/knapster/index-2.html -share/doc/HTML/en/knapster/index-3.html -share/doc/HTML/en/knapster/index-4.html -share/doc/HTML/en/knapster/index-5.html -share/doc/HTML/en/knapster/index-6.html -share/doc/HTML/en/knapster/index-7.html -share/doc/HTML/en/knapster/index-8.html -share/doc/HTML/en/knapster/index-9.html -share/doc/HTML/en/knapster/index.html -share/doc/HTML/en/knapster/logotp3.png -@dirrm share/doc/HTML/en/knapster -share/icons/knapster.xpm -share/icons/mini/knapster.xpm -share/locale/da/LC_MESSAGES/knapster.mo -share/locale/de/LC_MESSAGES/knapster.mo -share/locale/fr/LC_MESSAGES/knapster.mo -share/locale/ja/LC_MESSAGES/knapster.mo -share/locale/pt_BR/LC_MESSAGES/knapster.mo -share/locale/sv/LC_MESSAGES/knapster.mo -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/locale/* 2>/dev/null || true -@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true +bin/knapster2 +share/apps/knapster2/knapster2ui.rc +share/applnk/Applications/knapster2.desktop +share/icons/locolor/32x32/apps/knapster2.xpm +share/icons/locolor/16x16/apps/knapster2.png +share/doc/HTML/en/knapster2/.anchors +share/doc/HTML/en/knapster2/h1-0.html +share/doc/HTML/en/knapster2/h1-1.html +share/doc/HTML/en/knapster2/h1-2.html +share/doc/HTML/en/knapster2/h1-3.html +share/doc/HTML/en/knapster2/h1-4.html +share/doc/HTML/en/knapster2/h1-5.html +share/doc/HTML/en/knapster2/h2-1.html +share/doc/HTML/en/knapster2/h2-2.html +share/doc/HTML/en/knapster2/h2-4.html +share/doc/HTML/en/knapster2/h2-5.html +share/doc/HTML/en/knapster2/h2-6.html +share/doc/HTML/en/knapster2/index.html +share/doc/HTML/en/knapster2/common +share/doc/HTML/en/knapster2/knapster-welcome.html +share/doc/HTML/en/knapster2/knapster-title.gif +share/doc/HTML/en/knapster2/index.docbook +@dirrm share/doc/HTML/en/knapster2 +@dirrm share/apps/knapster2