diff options
| -rw-r--r-- | net/kphone/Makefile | 9 | ||||
| -rw-r--r-- | net/kphone/distinfo | 4 | ||||
| -rw-r--r-- | net/kphone/files/patch-dissipate2-siputil.cpp | 34 |
3 files changed, 10 insertions, 37 deletions
diff --git a/net/kphone/Makefile b/net/kphone/Makefile index fdcfa43d1534..4a7a27992dc8 100644 --- a/net/kphone/Makefile +++ b/net/kphone/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= kphone -PORTVERSION= 4.0.5 +PORTVERSION= 4.1.0 CATEGORIES= net MASTER_SITES= http://www.wirlab.net/kphone/ @@ -19,11 +19,12 @@ USE_OPENSSL= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= QTDIR="${QT_PREFIX}" +CONFIGURE_ENV= QTDIR="${QT_PREFIX}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" post-patch: - @${REINPLACE_CMD} -e 's,-O3,,g ; \ - s,-Wall,$$CFLAGS,g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e "s|-O3||g ; \ + s|-Wall|${CFLAGS}|g;s|-L/usr/X11R6/lib64|${PTHREAD_LIBS}|g; \ + s|-lssl|-lssl -lcrypto|g" ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's,make -C,$$(MAKE) -C,g ; \ s,/apps/,/,g ; \ diff --git a/net/kphone/distinfo b/net/kphone/distinfo index 03140e6895a7..99323fb13668 100644 --- a/net/kphone/distinfo +++ b/net/kphone/distinfo @@ -1,2 +1,2 @@ -MD5 (kphone-4.0.5.tar.gz) = 30939e432fd0039d4dc8228f21e2c54b -SIZE (kphone-4.0.5.tar.gz) = 258159 +MD5 (kphone-4.1.0.tar.gz) = d226b44d34e99887e3169ddd52a4684d +SIZE (kphone-4.1.0.tar.gz) = 278918 diff --git a/net/kphone/files/patch-dissipate2-siputil.cpp b/net/kphone/files/patch-dissipate2-siputil.cpp index c6eb2c645edd..fa588c0462b2 100644 --- a/net/kphone/files/patch-dissipate2-siputil.cpp +++ b/net/kphone/files/patch-dissipate2-siputil.cpp @@ -1,5 +1,5 @@ ---- dissipate2/siputil.cpp.orig Sun Oct 17 15:37:31 2004 -+++ dissipate2/siputil.cpp Sun Oct 17 15:37:15 2004 +--- dissipate2/siputil.cpp.orig Tue Dec 7 09:59:37 2004 ++++ dissipate2/siputil.cpp Tue Dec 21 21:05:35 2004 @@ -5,6 +5,9 @@ #include <sys/time.h> #include <sys/errno.h> @@ -99,39 +99,11 @@ if ( if_count == 1 ) { strncpy( if_name[j], netconf.ifc_req[0].ifr_name, 20 ); strncpy( if_addr[j], inet_ntoa(((struct sockaddr_in*)(&netconf.ifc_req[0].ifr_addr))->sin_addr), 20 ); -@@ -120,13 +158,15 @@ +@@ -120,6 +158,7 @@ } } } +#endif /* not FreeBSD or NetBSD */ -+ if( j == 1 ) { dissipate_our_fqdn = strdup( if_addr[0] ); } else { - default_ifName = getdefaultdev(); -- if( default_ifName != NULL) { -+ /*if( default_ifName != NULL) {*/ - for( i = 0; i < j; i++ ) { -- if( strcmp( if_name[i], default_ifName ) == 0 ) { -+ if( default_ifName != NULL && strcmp( if_name[i], default_ifName ) == 0 ) { - QMessageBox mb( "KPhone", - "KPhone found more than one interface.\n" - "Do you want to use the default interface:\n\n" + -@@ -147,7 +187,7 @@ - } - } - for( i = 0; i < j; i++ ) { -- if( strcmp( if_name[i], default_ifName ) != 0 ) { -+ if(default_ifName == NULL || strcmp( if_name[i], default_ifName ) != 0 ) { - if( i == j-1 ) { - QMessageBox mb( "KPhone", - "Do you want to use " + QString(if_name[i]) + " (IP:\"" + QString(if_addr[i]) + "\")", -@@ -181,7 +221,7 @@ - } - } - } -- } -+ /*}*/ - } - } - |