svn commit: r413217 - in head/www/nostromo: . files

[Mikhail Teterin]

Author: mi
Date: Wed Apr 13 16:42:11 2016
New Revision: 413217
URL: https://svnweb.freebsd.org/changeset/ports/413217

Log:
  Upgrade from 1.9.5 to 1.9.6. Change-log can be found here:
  
  	http://www.nazgul.ch/dev/nostromo_cl.txt
  
  Notified by:	portscout

Deleted:
  head/www/nostromo/files/patch-src-libmy-strb64d.c
  head/www/nostromo/files/patch-src-nhttpd-main
Modified:
  head/www/nostromo/Makefile
  head/www/nostromo/distinfo
  head/www/nostromo/files/nostromo.in
  head/www/nostromo/files/patch-src-libmy-Makefile
  head/www/nostromo/files/patch-src-nhttpd-Makefile
  head/www/nostromo/files/patch-src-tools-Makefile

Modified: head/www/nostromo/Makefile
==============================================================================
--- head/www/nostromo/Makefile	Wed Apr 13 16:26:59 2016	(r413216)
+++ head/www/nostromo/Makefile	Wed Apr 13 16:42:11 2016	(r413217)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nostromo
-PORTVERSION=	1.9.5
-PORTREVISION=	4
+PORTVERSION=	1.9.6
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.nazgul.ch/dev/
 

Modified: head/www/nostromo/distinfo
==============================================================================
--- head/www/nostromo/distinfo	Wed Apr 13 16:26:59 2016	(r413216)
+++ head/www/nostromo/distinfo	Wed Apr 13 16:42:11 2016	(r413217)
@@ -1,2 +1,2 @@
-SHA256 (nostromo-1.9.5.tar.gz) = 5f62578285e02449406b46cf06a7888fe3dc4a90bedf58cc18523bad62f6b914
-SIZE (nostromo-1.9.5.tar.gz) = 47798
+SHA256 (nostromo-1.9.6.tar.gz) = 541494ecfeafec58c0876ccc90cc23b06e0144f6f42029af44c7cdb1f411e8eb
+SIZE (nostromo-1.9.6.tar.gz) = 50937

Modified: head/www/nostromo/files/nostromo.in
==============================================================================
--- head/www/nostromo/files/nostromo.in	Wed Apr 13 16:26:59 2016	(r413216)
+++ head/www/nostromo/files/nostromo.in	Wed Apr 13 16:42:11 2016	(r413217)
@@ -18,10 +18,10 @@
 name=nostromo
 rcvar=nostromo_enable
 
-command=/usr/local/sbin/nhttpd
+command=%%PREFIX%%/sbin/nhttpd
 
 nostromo_enable=${nostromo_enable:-"NO"}
-nostromo_flags=${nostromo_flags:-"-c /usr/local/nostromo/conf/nhttpd.conf"}
+nostromo_flags=${nostromo_flags:-"-c %%PREFIX%%/nostromo/conf/nhttpd.conf"}
 
 load_rc_config $name
 run_rc_command "$1"

Modified: head/www/nostromo/files/patch-src-libmy-Makefile
==============================================================================
--- head/www/nostromo/files/patch-src-libmy-Makefile	Wed Apr 13 16:26:59 2016	(r413216)
+++ head/www/nostromo/files/patch-src-libmy-Makefile	Wed Apr 13 16:42:11 2016	(r413217)
@@ -4,10 +4,9 @@
  SRCS= strcutl.c strcutw.c strcuts.c strcuti.c strcutf.c flog.c flogd.c fparse.c strlower.c strb64d.c
  
  CFLAGS+= -Wall -Werror -Wstrict-prototypes
--NOMAN= 1
+ MAN=
 -NOPIC= 1
 -NOPROFILE= 1
-+NO_MAN= 1
 +NO_PIC= 1
 +NO_PROFILE= 1
  

Modified: head/www/nostromo/files/patch-src-nhttpd-Makefile
==============================================================================
--- head/www/nostromo/files/patch-src-nhttpd-Makefile	Wed Apr 13 16:26:59 2016	(r413216)
+++ head/www/nostromo/files/patch-src-nhttpd-Makefile	Wed Apr 13 16:42:11 2016	(r413217)
@@ -1,7 +1,6 @@
---- src/nhttpd/Makefile.orig	2011-03-20 22:39:18.000000000 +0100
-+++ src/nhttpd/Makefile	2011-03-20 22:39:54.000000000 +0100
-@@ -10,18 +10,21 @@
- 
+--- src/nhttpd/Makefile	2016-04-12 15:02:06.000000000 -0400
++++ src/nhttpd/Makefile	2016-04-13 12:29:49.861046000 -0400
+@@ -13,8 +13,15 @@
  BINOWN=	root
  BINMOD=	0555
 -BINDIR=	/usr/local/sbin
@@ -9,17 +8,12 @@
  
  OS!= uname -s
  
- LDADD+= -lssl -lcrypto
++.if defined(OPENSSLLIB) && "${OPENSSLLIB}" != "/usr/lib"
++LDADD+=	-L${OPENSSLIB}
++.endif
++.if defined(OPENSSLINC) && "${OPENSSLINC}" != "/usr/include"
++CFLAGS+=-I${OPENSSLINC}
++.endif
 +
+ LDADD+= -lssl -lcrypto
  .if ${OS} == "FreeBSD"
- LDADD+= -lcrypt
- MANBUILDCAT= yes
- .endif
-+
- .if ${OS} == "NetBSD"
- LDADD+= -lcrypt
- .endif
-+
- .if ${OS} == "Darwin"
- MAN8= nhttpd.8
- .endif

Modified: head/www/nostromo/files/patch-src-tools-Makefile
==============================================================================
--- head/www/nostromo/files/patch-src-tools-Makefile	Wed Apr 13 16:26:59 2016	(r413216)
+++ head/www/nostromo/files/patch-src-tools-Makefile	Wed Apr 13 16:42:11 2016	(r413217)
@@ -1,23 +1,9 @@
---- src/tools/Makefile.orig	2011-03-20 11:22:18.000000000 +0100
-+++ src/tools/Makefile	2011-03-20 11:26:24.000000000 +0100
-@@ -5,17 +5,18 @@
- 
- PIPE= -pipe
- 
--NOMAN= 1
-+NO_MAN= 1
- 
+--- src/tools/Makefile	2016-04-12 15:02:58.000000000 -0400
++++ src/tools/Makefile	2016-04-13 12:33:40.546452000 -0400
+@@ -12,5 +12,5 @@
  BINOWN=	root
  BINMOD=	0555
 -BINDIR=	/usr/local/sbin
 +BINDIR=	${PREFIX}/sbin
  
  OS!= uname -s
- 
- .if ${OS} == "FreeBSD"
- LDADD+=	-lcrypt
- .endif
-+
- .if ${OS} == "NetBSD"
- LDADD+=	-lcrypt
- .endif