- Update to 2.1.0

PR:		ports/61141
Submitted by:	Eyal Soha <esoha@attbi.com> (maintainer)

5 files changed, 28 insertions, 24 deletions

diff --git a/dns/noip/Makefile b/dns/noip/Makefile
index 5dfc5bdea93b..b431973a7677 100644
--- a/dns/noip/Makefile
+++ b/dns/noip/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	noip
-PORTVERSION=	2.0.12
+PORTVERSION=	2.1.0
 CATEGORIES=	dns
 MASTER_SITES=	http://www.no-ip.com/client/linux/
 
@@ -26,9 +26,9 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/noip2 ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/noip.sh ${PREFIX}/etc/rc.d
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	${INSTALL_MAN} ${WRKSRC}/README.FIRST ${PREFIX}/share/doc/${PORTNAME}
-	${INSTALL_MAN} ${WRKSRC}/COPYING ${PREFIX}/share/doc/${PORTNAME}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/README.FIRST ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/COPYING ${DOCSDIR}
 .endif
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" ${PKGMESSAGE} | ${SED} "s|%%WRKSRC%%|${WRKSRC}|g"
 
diff --git a/dns/noip/distinfo b/dns/noip/distinfo
index 6e9a5c06f117..4c10315cb56d 100644
--- a/dns/noip/distinfo
+++ b/dns/noip/distinfo
@@ -1 +1 @@
-MD5 (noip-2.0.12.tar.gz) = 72053672a5125d39b861a130aa4532f1
+MD5 (noip-2.1.0.tar.gz) = 59d26e089a2bff15f512d808dad2cd1c
diff --git a/dns/noip/files/patch-noip2.c b/dns/noip/files/patch-noip2.c
index 8ddeeaad96d4..d96af6ac48f8 100644
--- a/dns/noip/files/patch-noip2.c
+++ b/dns/noip/files/patch-noip2.c
@@ -1,15 +1,15 @@
---- noip2.c.orig	Sat May 24 00:55:14 2003
-+++ noip2.c	Fri Aug 29 10:50:06 2003
-@@ -141,7 +141,7 @@
+--- noip2.c.orig	Fri Jan  2 18:14:09 2004
++++ noip2.c	Thu Jan  8 14:45:57 2004
+@@ -153,7 +153,7 @@
+ #define CLIENT_IP_PORT		8245
  
- #define VERSION			"2.0.12"
- #define NOIP_NAME		"dynupdate.no-ip.com"
--#define USER_AGENT		"User-Agent: Linux DUC "VERSION
-+#define USER_AGENT		"User-Agent: FreeBSD DUC "VERSION
+ #define VERSION			"2.1"
+-#define USER_AGENT		"User-Agent: Linux-DUC/"VERSION
++#define USER_AGENT		"User-Agent: FreeBSD-DUC/"VERSION
  #define SETTING_SCRIPT		"settings.php?"
  #define USTRNG			"username="
  #define PWDSTRNG		"&pass="
-@@ -246,7 +246,7 @@
+@@ -258,7 +258,7 @@
  #define CMSG21	"Please select the Internet interface from this list.\n"
  #define CMSG22	"By typing the number associated with it."
  #define CMSG23	"Too many network devices.  Limit is %d"
@@ -18,7 +18,7 @@
  #define CMSG25	"Can't create config file (%s)"
  #define CMSG25a	"Re-run noip, adding '-c configfilename' as a parameter."
  #define CMSG26	"Can't rename config file (%s)"
-@@ -438,7 +438,7 @@
+@@ -450,7 +450,7 @@
          fprintf(stderr, "[ -d][ -D pid]");
  #endif                                                                          
  	fprintf(stderr, "[ -i addr][ -S][ -M][ -h]");
@@ -27,9 +27,12 @@
  	fprintf(stderr, "Options: -C               create configuration data\n");
  	fprintf(stderr, "         -F               force NAT off\n");
  	fprintf(stderr, "         -Y               select all hosts/groups\n");
-@@ -1884,12 +1884,10 @@
+@@ -1935,17 +1935,12 @@
+ 	dq = devs;     // point at name list
  	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
  		if (ifa->ifa_addr->sa_family == AF_LINK) {
+-// FreeBSD doesn't define some of these!
+-#ifdef IFT_PFLOG
  			struct if_data *ifd = (struct if_data *) ifa->ifa_data;
 -			if (ifd->ifi_type == IFT_PFLOG
 -				 || ifd->ifi_type == IFT_PFSYNC
@@ -38,9 +41,11 @@
 -				 || ifd->ifi_type == IFT_OTHER
 -				 || ifd->ifi_type == IFT_GIF)
 +			if (ifd->ifi_type == IFT_OTHER
-+				|| ifd->ifi_type == IFT_GIF
-+				|| ifd->ifi_type == IFT_LOOP
-+				|| ifd->ifi_type == IFT_FAITH)
++				 || ifd->ifi_type == IFT_GIF
++				 || ifd->ifi_type == IFT_LOOP
++				 || ifd->ifi_type == IFT_FAITH)
  		 	   continue;
+-#endif
  			q = dq;     // add new name into list
  			p = ifa->ifa_name;
+ 			devnum++;
diff --git a/dns/noip/pkg-deinstall b/dns/noip/pkg-deinstall
index 93a3036c7d43..af2d76af57ab 100644
--- a/dns/noip/pkg-deinstall
+++ b/dns/noip/pkg-deinstall
@@ -8,9 +8,8 @@ PW=/usr/sbin/pw
 ECHO=echo
 USER=noip
 GROUP=${USER}
-
-if [ -f ${PKG_PREFIX}/etc/no-ip.conf ]; then
-    ${ECHO} "To delete noip configuration permanently: rm ${PKG_PREFIX}/etc/no-ip.conf"
+if [ -f ${PKG_PREFIX}/etc/no-ip2.conf ]; then
+    ${ECHO} "To delete noip configuration permanently: rm ${PKG_PREFIX}/etc/no-ip2.conf"
 fi
 if ${PW} usershow "${USER}" 2>/dev/null 1>&2; then
     ${ECHO} "To delete noip user permanently: ${PW} userdel ${USER}"
diff --git a/dns/noip/pkg-plist b/dns/noip/pkg-plist
index 4791aa7930fc..e335c7d00351 100644
--- a/dns/noip/pkg-plist
+++ b/dns/noip/pkg-plist
@@ -1,5 +1,5 @@
 bin/noip2
 etc/rc.d/noip.sh
-%%PORTDOCS%%share/doc/noip/README.FIRST
-%%PORTDOCS%%share/doc/noip/COPYING
-%%PORTDOCS%%@dirrm share/doc/noip
+%%PORTDOCS%%%%DOCSDIR%%/README.FIRST
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%@dirrm %%DOCSDIR%%