5 files changed, 11 insertions, 58 deletions

diff --git a/dns/noip/Makefile b/dns/noip/Makefile
index 88cb08658c84..e51dceb8a4d7 100644
--- a/dns/noip/Makefile
+++ b/dns/noip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	noip
 PORTVERSION=	2.1.9
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://www.no-ip.com/client/linux/ \
 		CRITICAL
@@ -21,9 +22,12 @@ USE_RC_SUBR=	noip
 
 LICENSE=	GPLv2
 
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
-		${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+CFLAGS+=	-Dbsd_with_getifaddrs
+
+USERS=		noip
+GROUPS=		noip
+
+PLIST_SUB+=	USER="${USERS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/noip2 ${PREFIX}/bin
diff --git a/dns/noip/files/patch-Makefile b/dns/noip/files/patch-Makefile
index e1b1c0917eb3..9f3b90b30c12 100644
--- a/dns/noip/files/patch-Makefile
+++ b/dns/noip/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2009-11-17 20:19:54.000000000 +0100
-+++ Makefile	2009-11-17 20:22:51.000000000 +0100
+--- Makefile.orig	2008-11-21 23:27:15.000000000 +0100
++++ Makefile	2011-03-28 18:15:31.000000000 +0200
 @@ -1,8 +1,8 @@
  TGT=noip2
 -CC=gcc
@@ -25,7 +25,7 @@
  
  ${TGT}: Makefile ${TGT}.c 
 -	${CC} -Wall -g -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}
-+	${CC} -Wall -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}
++	${CC} ${CFLAGS} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}
  
  install: ${TGT} 
  	if [ ! -d ${BINDIR} ]; then mkdir -p ${BINDIR};fi
diff --git a/dns/noip/pkg-deinstall b/dns/noip/pkg-deinstall
deleted file mode 100644
index af2d76af57ab..000000000000
--- a/dns/noip/pkg-deinstall
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-    exit 0
-fi
-
-PW=/usr/sbin/pw
-ECHO=echo
-USER=noip
-GROUP=${USER}
-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}"
-fi
-if ${PW} groupshow "${GROUP}" 2>/dev/null 1>&2; then
-    ${ECHO} "To delete noip group permanently: ${PW} groupdel ${GROUP}"
-fi
-exit 0
diff --git a/dns/noip/pkg-install b/dns/noip/pkg-install
deleted file mode 100644
index 4ecf257c5072..000000000000
--- a/dns/noip/pkg-install
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-PW=/usr/sbin/pw
-ECHO=echo
-USER=noip
-GROUP=${USER}
-
-if ! ${PW} groupshow "${GROUP}" 2>/dev/null 1>&2; then
-	if ${PW} groupadd ${GROUP}; then
-		${ECHO} "Added group \"${GROUP}\"."
-	else
-                ${ECHO} "Adding group \"${GROUP}\" failed..."
-                exit 1
-        fi
-fi
-
-if ! ${PW} usershow "${USER}" 2>/dev/null 1>&2; then
-        if ${PW} useradd ${USER} -g ${GROUP} -h - \
-                -s "/sbin/nologin" -d "/nonexistent" \
-                -c "noip pseudo-user"; \
-        then
-                ${ECHO} "Added user \"${USER}\"."
-        else
-                ${ECHO} "Adding user \"${USER}\" failed..."
-                exit 1
-        fi
-fi
-exit 0
diff --git a/dns/noip/pkg-plist b/dns/noip/pkg-plist
index df5779ee6c00..1805c440329e 100644
--- a/dns/noip/pkg-plist
+++ b/dns/noip/pkg-plist
@@ -2,3 +2,4 @@ bin/noip2
 %%PORTDOCS%%%%DOCSDIR%%/README.FIRST
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec printf "\nTo delete %%USER%% user/group permanently:\npw userdel %%USER%%\n\n"