From nobody@FreeBSD.org  Fri Jan  3 11:41:51 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 5F6CBDFD
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  3 Jan 2014 11:41:51 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 3EC78145A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  3 Jan 2014 11:41:51 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id s03Bfowe048014
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 3 Jan 2014 11:41:50 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id s03BfovC048007;
	Fri, 3 Jan 2014 11:41:50 GMT
	(envelope-from nobody)
Message-Id: <201401031141.s03BfovC048007@oldred.freebsd.org>
Date: Fri, 3 Jan 2014 11:41:50 GMT
From: Oleg Ginzburg <olevole@olevole.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: net/nakenchat update to 3.00b1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         185440
>Category:       ports
>Synopsis:       net/nakenchat update to 3.00b1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marino
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 03 11:50:01 UTC 2014
>Closed-Date:    Sat Feb 22 08:23:20 UTC 2014
>Last-Modified:  Sat Feb 22 08:23:20 UTC 2014
>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@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:
Class-Changed-From-To: sw-bug->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Fri Jan 3 11:50:09 UTC 2014 
Class-Changed-Why:  
Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185440 
Responsible-Changed-From-To: freebsd-ports-bugs->vg 
Responsible-Changed-By: vg 
Responsible-Changed-When: Fri Jan 3 20:22:24 UTC 2014 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185440 
Responsible-Changed-From-To: vg->marino 
Responsible-Changed-By: marino 
Responsible-Changed-When: Fri Feb 21 13:59:42 UTC 2014 
Responsible-Changed-Why:  
I'll overtake it (it is broken almost everywhere) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185440 

From: John Marino <freebsd.contact@marino.st>
To: bug-followup@FreeBSD.org, olevole@olevole.ru
Cc:  
Subject: Re: ports/185440: net/nakenchat update to 3.00b1
Date: Fri, 21 Feb 2014 15:07:43 +0100

 What is the rationale for updating to 3.00 beta instead of the 2.22
 release?  I'm not fond of using Beta software unless there is a very
 good reason.
 
 John

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185440: commit references a PR
Date: Fri, 21 Feb 2014 15:31:33 +0000 (UTC)

 Author: marino
 Date: Fri Feb 21 15:31:25 2014
 New Revision: 345486
 URL: http://svnweb.freebsd.org/changeset/ports/345486
 QAT: https://qat.redports.org/buildarchive/r345486/
 
 Log:
   net/nakenchat: upgrade from 2.12 to 2.22 and unbreak
   
   Nakenchat has been broken everywhere for some kind of installation issue.
   Adding stage support fixes that issue, but let's update to the latest
   stable version of 2.22 while here.  A license was also added.  Per a
   pending PR, nakenpasswd was removed.  It's now a bash script rather than
   a compiled program, but I guess the maintainer thought putting bash as
   a run dependency wasn't worth it.  Most of the PR was used, but it
   requested an upgrade to a beta version 3.00b.  I'm holding off on that
   upgrade pending feedback.
   
   PR:	ports/185440
 
 Deleted:
   head/net/nakenchat/files/patch-Makefile
 Modified:
   head/net/nakenchat/Makefile
   head/net/nakenchat/distinfo
   head/net/nakenchat/pkg-plist
 
 Modified: head/net/nakenchat/Makefile
 ==============================================================================
 --- head/net/nakenchat/Makefile	Fri Feb 21 15:26:23 2014	(r345485)
 +++ head/net/nakenchat/Makefile	Fri Feb 21 15:31:25 2014	(r345486)
 @@ -2,13 +2,15 @@
  # $FreeBSD$
  
  PORTNAME=	nakenchat
 -PORTVERSION=	2.12
 +PORTVERSION=	2.22
  CATEGORIES=	net
  MASTER_SITES=	http://downloads.mikekohn.net/nakenchat/
  
  MAINTAINER=	olevole@olevole.ru
  COMMENT=	Small (under 50k) chat server with many features
  
 +LICENSE=	GPLv2
 +
  HAS_CONFIGURE=	yes
  USE_RC_SUBR=	nakenchat
  
 @@ -31,12 +33,12 @@ DOTQ_CONFIGURE_ON=		--enable-dotQ
  FUSERLIST_CONFIGURE_ON=		--enable-whofile
  ELITEFILTER_CONFIGURE_ON=	--enable-elite
  
 -NO_STAGE=	yes
  .include <bsd.port.options.mk>
  
 -post-install:
 -	@if [ ! -f ${PREFIX}/etc/nakenchat.conf ]; then \
 -		${CP} -p ${PREFIX}/etc/nakenchat.conf.sample ${PREFIX}/etc/nakenchat.conf ; \
 -	fi
 +do-install:
 +	${INSTALL_PROGRAM} ${WRKSRC}/src/nakenchat \
 +		${STAGEDIR}${PREFIX}/bin/
 +	${INSTALL_DATA} ${WRKSRC}/nakenchat.conf \
 +		${STAGEDIR}${PREFIX}/etc/nakenchat.conf.sample
  
  .include <bsd.port.mk>
 
 Modified: head/net/nakenchat/distinfo
 ==============================================================================
 --- head/net/nakenchat/distinfo	Fri Feb 21 15:26:23 2014	(r345485)
 +++ head/net/nakenchat/distinfo	Fri Feb 21 15:31:25 2014	(r345486)
 @@ -1,2 +1,2 @@
 -SHA256 (nakenchat-2.12.tar.gz) = 1597d7759b3849f9b53ada323fa72f7cfc238d4e0c741dccafab3fae66bd900b
 -SIZE (nakenchat-2.12.tar.gz) = 41839
 +SHA256 (nakenchat-2.22.tar.gz) = 7a0e935974e00908298a1877bbf8cba48a27b9e5fefc1129e06bf35575459342
 +SIZE (nakenchat-2.22.tar.gz) = 47909
 
 Modified: head/net/nakenchat/pkg-plist
 ==============================================================================
 --- head/net/nakenchat/pkg-plist	Fri Feb 21 15:26:23 2014	(r345485)
 +++ head/net/nakenchat/pkg-plist	Fri Feb 21 15:31:25 2014	(r345486)
 @@ -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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: Oleg Ginzburg <olevole@olevole.ru>
To: marino@freebsd.org
Cc: bug-followup@freebsd.org
Subject: Re: ports/185440: net/nakenchat update to 3.00b1
Date: Sat, 22 Feb 2014 10:31:02 +0400

 Hi,
 
 I confirm this changes to 2.22. No serious rationale to 3.00 beta. Thanks.
 
 
 
State-Changed-From-To: open->closed 
State-Changed-By: marino 
State-Changed-When: Sat Feb 22 08:23:20 UTC 2014 
State-Changed-Why:  
Ok good, the work is done then.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185440 
>Unformatted:
