update net/naim: 0.11.5.9 -> 0.11.6

PR:		54962
Submitted by:	Ryan T. Dean <rtdean-dated-1060379941.153f97@cytherianage.net> (maintainer)

10 files changed, 74 insertions, 44 deletions

diff --git a/net-im/naim/Makefile b/net-im/naim/Makefile
index 0e3a07e6ac09..26a10a5d4337 100644
--- a/net-im/naim/Makefile
+++ b/net-im/naim/Makefile
@@ -6,25 +6,33 @@
 #
 
 PORTNAME=	naim
-PORTVERSION=	0.11.5.9
-CATEGORIES=	net
+PORTVERSION=	0.11.6
+CATEGORIES=	net irc
 MASTER_SITES=	http://shell.n.ml.org/n/naim/
 
 MAINTAINER=	rtdean@cytherianage.net
 COMMENT=	Curses based AOL Instant Messager implementation
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--disable-nirc-manlink
+CONFIGURE_ARGS=		--disable-nirc-manlink \
+			--with-pkgdocdir=${DOCSDIR}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL=		yes
 
 MAN1=		naim.1
 MLINKS=		naim.1 nirc.1 naim.1 nicq.1 naim.1 nlily.1
 
-post-install:
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/naim.hlp ${DOCSDIR}
+.if defined(WITH_DETACH)
+BUILD_DEPENDS=	screen:${PORTSDIR}/misc/screen
+RUN_DEPENDS=	screen:${PORTSDIR}/misc/screen
+
+CONFIGURE_ARGS+=	--enable-detach
 .endif
 
+pre-fetch:
+	@ ${ECHO} ""
+	@ ${ECHO} "You can use the following build option(s):"
+	@ ${ECHO} ""
+	@ ${ECHO} "     WITH_DETACH=yes         Enables /detach (requires screen)"
+	@ ${ECHO} ""
+
 .include <bsd.port.mk>
diff --git a/net-im/naim/distinfo b/net-im/naim/distinfo
index 44e0bb82962e..f5ac6bad8985 100644
--- a/net-im/naim/distinfo
+++ b/net-im/naim/distinfo
@@ -1 +1 @@
-MD5 (naim-0.11.5.9.tar.gz) = 03e9d56b0b39049b2345fd2413a34661
+MD5 (naim-0.11.6.tar.gz) = 1843dc1ab9660cf8a2412acd9dbbb0e9
diff --git a/net-im/naim/files/patch-Makefile.in b/net-im/naim/files/patch-Makefile.in
new file mode 100644
index 000000000000..7c365c46ec73
--- /dev/null
+++ b/net-im/naim/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.old    Fri Jul 25 14:13:27 2003
++++ Makefile.in        Fri Jul 25 14:09:57 2003
+@@ -158,7 +158,7 @@  
+
+
+ man_MANS = naim.1
+-bin_SCRIPTS = contrib/sendim.sh
++#bin_SCRIPTS = contrib/sendim.sh
+ pkginclude_HEADERS = include/naim/naim.h include/naim/modutil.h include/naim/secs.h
+
+ pkgtbz2 = `echo ${pkgtarball} | sed 's/gz$$/bz2/'`  
diff --git a/net-im/naim/pkg-descr b/net-im/naim/pkg-descr
index 385e5c371afb..6285bb6bfdb8 100644
--- a/net-im/naim/pkg-descr
+++ b/net-im/naim/pkg-descr
@@ -3,4 +3,4 @@ name naim is derived from n's AIM client, but it could also have been
 derived from ncurses AIM client because of naim's use of the ncurses
 text-mode screen library.
 
-WWW: http://site.rpi-acm.org/info/naim
+WWW: http://naim.n.ml.org
diff --git a/net-im/naim/pkg-plist b/net-im/naim/pkg-plist
index cddd6dfd8c59..e7d9d492621a 100644
--- a/net-im/naim/pkg-plist
+++ b/net-im/naim/pkg-plist
@@ -2,18 +2,14 @@ bin/naim
 bin/nicq
 bin/nirc
 bin/nlily
-bin/sendim.sh
-lib/naim/libnsocket.la
-lib/naim/libnsocket.so
-lib/naim/libnsocket.so.0
-lib/naim/libnstatus.la
-lib/naim/libnstatus.so
-lib/naim/libnstatus.so.0
-share/doc/naim/commands.txt
+include/firetalk.h
+include/naim/modutil.h
+include/naim/naim.h
+include/naim/secs.h
 share/doc/naim/COLORS
 share/doc/naim/FAQ
-share/doc/naim/keyboard.txt
 share/doc/naim/README
-%%PORTDOCS%%share/doc/naim/naim.hlp
-@dirrm share/doc/naim
-@dirrm lib/naim
+share/doc/naim/commands.txt
+share/doc/naim/keyboard.txt
+@dirrm include/naim
+@dirrm share/doc/naim
\ No newline at end of file
diff --git a/net/naim/Makefile b/net/naim/Makefile
index 0e3a07e6ac09..26a10a5d4337 100644
--- a/net/naim/Makefile
+++ b/net/naim/Makefile
@@ -6,25 +6,33 @@
 #
 
 PORTNAME=	naim
-PORTVERSION=	0.11.5.9
-CATEGORIES=	net
+PORTVERSION=	0.11.6
+CATEGORIES=	net irc
 MASTER_SITES=	http://shell.n.ml.org/n/naim/
 
 MAINTAINER=	rtdean@cytherianage.net
 COMMENT=	Curses based AOL Instant Messager implementation
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--disable-nirc-manlink
+CONFIGURE_ARGS=		--disable-nirc-manlink \
+			--with-pkgdocdir=${DOCSDIR}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL=		yes
 
 MAN1=		naim.1
 MLINKS=		naim.1 nirc.1 naim.1 nicq.1 naim.1 nlily.1
 
-post-install:
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/naim.hlp ${DOCSDIR}
+.if defined(WITH_DETACH)
+BUILD_DEPENDS=	screen:${PORTSDIR}/misc/screen
+RUN_DEPENDS=	screen:${PORTSDIR}/misc/screen
+
+CONFIGURE_ARGS+=	--enable-detach
 .endif
 
+pre-fetch:
+	@ ${ECHO} ""
+	@ ${ECHO} "You can use the following build option(s):"
+	@ ${ECHO} ""
+	@ ${ECHO} "     WITH_DETACH=yes         Enables /detach (requires screen)"
+	@ ${ECHO} ""
+
 .include <bsd.port.mk>
diff --git a/net/naim/distinfo b/net/naim/distinfo
index 44e0bb82962e..f5ac6bad8985 100644
--- a/net/naim/distinfo
+++ b/net/naim/distinfo
@@ -1 +1 @@
-MD5 (naim-0.11.5.9.tar.gz) = 03e9d56b0b39049b2345fd2413a34661
+MD5 (naim-0.11.6.tar.gz) = 1843dc1ab9660cf8a2412acd9dbbb0e9
diff --git a/net/naim/files/patch-Makefile.in b/net/naim/files/patch-Makefile.in
new file mode 100644
index 000000000000..7c365c46ec73
--- /dev/null
+++ b/net/naim/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.old    Fri Jul 25 14:13:27 2003
++++ Makefile.in        Fri Jul 25 14:09:57 2003
+@@ -158,7 +158,7 @@  
+
+
+ man_MANS = naim.1
+-bin_SCRIPTS = contrib/sendim.sh
++#bin_SCRIPTS = contrib/sendim.sh
+ pkginclude_HEADERS = include/naim/naim.h include/naim/modutil.h include/naim/secs.h
+
+ pkgtbz2 = `echo ${pkgtarball} | sed 's/gz$$/bz2/'`  
diff --git a/net/naim/pkg-descr b/net/naim/pkg-descr
index 385e5c371afb..6285bb6bfdb8 100644
--- a/net/naim/pkg-descr
+++ b/net/naim/pkg-descr
@@ -3,4 +3,4 @@ name naim is derived from n's AIM client, but it could also have been
 derived from ncurses AIM client because of naim's use of the ncurses
 text-mode screen library.
 
-WWW: http://site.rpi-acm.org/info/naim
+WWW: http://naim.n.ml.org
diff --git a/net/naim/pkg-plist b/net/naim/pkg-plist
index cddd6dfd8c59..e7d9d492621a 100644
--- a/net/naim/pkg-plist
+++ b/net/naim/pkg-plist
@@ -2,18 +2,14 @@ bin/naim
 bin/nicq
 bin/nirc
 bin/nlily
-bin/sendim.sh
-lib/naim/libnsocket.la
-lib/naim/libnsocket.so
-lib/naim/libnsocket.so.0
-lib/naim/libnstatus.la
-lib/naim/libnstatus.so
-lib/naim/libnstatus.so.0
-share/doc/naim/commands.txt
+include/firetalk.h
+include/naim/modutil.h
+include/naim/naim.h
+include/naim/secs.h
 share/doc/naim/COLORS
 share/doc/naim/FAQ
-share/doc/naim/keyboard.txt
 share/doc/naim/README
-%%PORTDOCS%%share/doc/naim/naim.hlp
-@dirrm share/doc/naim
-@dirrm lib/naim
+share/doc/naim/commands.txt
+share/doc/naim/keyboard.txt
+@dirrm include/naim
+@dirrm share/doc/naim
\ No newline at end of file