ports/185440: net/nakenchat update to 3.00b1

Fri Jan 3 11:50:01 UTC 2014

>Number:         185440
>Category:       ports
>Synopsis:       net/nakenchat update to 3.00b1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 03 11:50:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Oleg Ginzburg
>Release:        
>Organization:
>Environment:
>Description:
- update to 3.00b1
- fix build with clang
- STAGE-ing support
- Add License
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN nakenchat.bak/Makefile nakenchat/Makefile

--- nakenchat.bak/Makefile	2014-01-01 03:58:48.000000000 +0400
+++ nakenchat/Makefile	2014-01-03 15:36:54.000000000 +0400
@@ -2,26 +2,30 @@
 # $FreeBSD: head/net/nakenchat/Makefile 327755 2013-09-20 22:10:23Z bapt $
 
 PORTNAME=	nakenchat
-PORTVERSION=	2.12
+PORTVERSION=	3.00b1
 CATEGORIES=	net
-MASTER_SITES=	http://downloads.mikekohn.net/nakenchat/
+MASTER_SITES=	http://downloads.mikekohn.net/nakenchat/ \
+		http://www.bsdstore.ru/downloads/
 
 MAINTAINER=	olevole at olevole.ru
 COMMENT=	Small (under 50k) chat server with many features
 
+LICENSE=	GPLv2
+
 HAS_CONFIGURE=	yes
 USE_RC_SUBR=	nakenchat
 
 OPTIONS_DEFINE=	NOKEEPALIVE NOUSERCHANLIST DEBUG HIDDENCAVES DOTQ \
-		FUSERLIST ELITEFILTER
+		FUSERLIST ELITEFILTER OPENSSL
 
-NOKEEPALIVE_DESC=	Disable socket keepalive option
-NOUSERCHANLIST_DESC=	Disable userlist based on channel
-DEBUG_DESC=		Compile in debug code
-HIDDENCAVES_DESC=	Enable hidden caves feature
-DOTQ_DESC=		Compile in .Q option
-FUSERLIST_DESC=		Support saving current userlist to a file
-ELITEFILTER_DESC=	Enable the 3li73 filter
+NOKEEPALIVE_DESC=	"Disable socket keepalive option"
+NOUSERCHANLIST_DESC=	"Disable userlist based on channel"
+DEBUG_DESC=		"Compile in debug code"
+HIDDENCAVES_DESC=	"Enable hidden caves feature"
+DOTQ_DESC=		"Compile in .Q option"
+FUSERLIST_DESC=		"Support saving current userlist to a file"
+ELITEFILTER_DESC=	"Enable the 3li73 filter"
+OPENSSL_DESC=		"Enable OpenSSL encryption"
 
 NOKEEPALIVE_CONFIGURE_ON=	--disable-keepalive
 NOUSERCHANLIST_CONFIGURE_ON=	--disable-userchanlist
@@ -30,13 +34,17 @@
 DOTQ_CONFIGURE_ON=		--enable-dotQ
 FUSERLIST_CONFIGURE_ON=		--enable-whofile
 ELITEFILTER_CONFIGURE_ON=	--enable-elite
+OPENSSL_CONFIGURE_ON=		--enable-ssl
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/nakenchat ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/nakenchat.conf ${STAGEDIR}${PREFIX}/etc/nakenchat.conf.sample
+
 post-install:
-	@if [ ! -f ${PREFIX}/etc/nakenchat.conf ]; then \
-		${CP} -p ${PREFIX}/etc/nakenchat.conf.sample ${PREFIX}/etc/nakenchat.conf ; \
+	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/nakenchat.conf ]; then \
+		${CP} -p ${STAGEDIR}${PREFIX}/etc/nakenchat.conf.sample ${STAGEDIR}${PREFIX}/etc/nakenchat.conf ; \
 	fi
 
 .include <bsd.port.mk>
diff -ruN nakenchat.bak/distinfo nakenchat/distinfo
--- nakenchat.bak/distinfo	2014-01-01 03:58:48.000000000 +0400
+++ nakenchat/distinfo	2014-01-03 14:45:14.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (nakenchat-2.12.tar.gz) = 1597d7759b3849f9b53ada323fa72f7cfc238d4e0c741dccafab3fae66bd900b
-SIZE (nakenchat-2.12.tar.gz) = 41839
+SHA256 (nakenchat-3.00b1.tar.gz) = 00a46e8431584ef7412079eb1657fe6ac6ad205af793444a57852d0ff171205f
+SIZE (nakenchat-3.00b1.tar.gz) = 49330
diff -ruN nakenchat.bak/files/patch-Makefile nakenchat/files/patch-Makefile
--- nakenchat.bak/files/patch-Makefile	2014-01-01 03:58:48.000000000 +0400
+++ nakenchat/files/patch-Makefile	1970-01-01 03:00:00.000000000 +0300
@@ -1,20 +0,0 @@
---- ./Makefile.orig	2007-06-27 22:06:34.000000000 -0400
-+++ ./Makefile	2008-11-23 14:24:11.028905510 -0500
-@@ -28,14 +28,9 @@
- install:
- 	@if [ ! -d $(PREFIX)/bin ]; then mkdir $(PREFIX)/bin; fi;
- 	@if [ ! -d $(PREFIX)/etc ]; then mkdir $(PREFIX)/etc; fi;
--	cp nakenchat $(PREFIX)/bin
--	cp nakenpasswd $(PREFIX)/bin
--	@echo "cp nakenchat.conf $(PREFIX)/etc"
--	@if [ -f $(PREFIX)/etc/nakenchat.conf ]; then \
--	  echo "$(PREFIX)/etc/nakenchat.conf exists."; \
--	else \
--	   cp nakenchat.conf $(PREFIX)/etc; \
--	fi
-+	cp src/nakenchat $(PREFIX)/bin
-+	cp src/nakenpasswd $(PREFIX)/bin
-+	cp nakenchat.conf $(PREFIX)/etc/nakenchat.conf.sample;
- 
- clean:
- 	cd src && make clean
diff -ruN nakenchat.bak/files/patch-configure nakenchat/files/patch-configure
--- nakenchat.bak/files/patch-configure	2014-01-01 03:58:48.000000000 +0400
+++ nakenchat/files/patch-configure	2014-01-03 15:07:24.000000000 +0400
@@ -1,13 +1,11 @@
---- ./configure.orig	2007-06-27 22:06:34.000000000 -0400
-+++ ./configure	2008-11-23 14:23:54.364898213 -0500
-@@ -2,11 +2,11 @@
- 
+--- configure.orig	2013-07-04 22:47:19.000000000 +0400
++++ configure	2014-01-03 15:07:12.000000000 +0400
+@@ -3,10 +3,10 @@
  # Based on FFMPEG's configure (http://ffmpeg.sourceforge.net/)
  
--PREFIX=/usr/local
+ PREFIX=/usr/local
 -CC=gcc
-+PREFIX=${PREFIX:=/usr/local}
-+CC=${CC:=gcc}
++CC=${CC:=cc}
  COMPILER_PREFIX=
  FLAGS=""
 -CFLAGS="-Wall"
@@ -15,26 +13,12 @@
  LDFLAGS=""
  LANGUAGE="english"
  CONFIG_USER_CHAN_LIST="-DUSER_LIST_CHAN"
-@@ -134,7 +134,7 @@
-   case "$option" in
-   --help) show_help
-   ;;
--  --cflags=*) CFLAGS="${CFLAGS} $optval"
-+  --cflags=*) CFLAGS="$optval"
-   ;;
-   --compiler-prefix=*) COMPILER_PREFIX="$optval"
-   ;;
-@@ -158,12 +158,9 @@
+@@ -260,7 +260,7 @@
+ FLAGS="${FLAGS} -DLANGUAGE_${CONFIG_LANG} ${CONFIG_USER_CHAN_LIST} ${CONFIG_KEEPALIVE} ${CONFIG_REALIDLETIME}"
  
- done
+ if ! instr "-O" "${CFLAGS}"; then CFLAGS="${CFLAGS} -O2"; fi
+-if ! instr "-DDEBUG" "${FLAGS}"; then CFLAGS="${CFLAGS} -s"; fi
++if ! instr "-DDEBUG" "${FLAGS}"; then CFLAGS="${CFLAGS}"; fi
  
--if test_compiler "gcc"
-+if ! test_compiler $CC
+ if ! instr "WINDOWS" "${FLAGS}"
  then
-   CC="gcc"
--elif test_compiler "cc"
--then
--  CC="cc"
- fi
- 
- if test_lib "-lpthread"; then LDFLAGS="${LDFLAGS} -lpthread"; fi
diff -ruN nakenchat.bak/pkg-plist nakenchat/pkg-plist
--- nakenchat.bak/pkg-plist	2014-01-01 03:58:48.000000000 +0400
+++ nakenchat/pkg-plist	2014-01-03 15:33:23.000000000 +0400
@@ -1,5 +1,4 @@
 bin/nakenchat
-bin/nakenpasswd
 @unexec if cmp -s %D/etc/nakenchat.conf.sample %D/etc/nakenchat.conf; then rm -f %D/etc/nakenchat.conf; fi
 etc/nakenchat.conf.sample
 @exec if [ ! -f %D/etc/nakenchat.conf ] ; then cp -p %D/%F %B/nakenchat.conf; fi


>Release-Note:
>Audit-Trail:
>Unformatted:
