svn commit: r415008 - in head/www/mini_httpd: . files
Mikhail Teterin
mi at FreeBSD.org
Wed May 11 15:12:07 UTC 2016
Author: mi
Date: Wed May 11 15:12:05 2016
New Revision: 415008
URL: https://svnweb.freebsd.org/changeset/ports/415008
Log:
Upgrade from 1.23 to 1.24.
Notified by: portscout
While at it:
* Simplify handling of CFLAGS and LDFLAGS.
* Respect CC-setting.
* Fix the non-standard PREFIX handling. Fix the WITH_DEBUG
case by removing the unconditional stripping.
Modified:
head/www/mini_httpd/Makefile
head/www/mini_httpd/distinfo
head/www/mini_httpd/files/patch-Makefile
Modified: head/www/mini_httpd/Makefile
==============================================================================
--- head/www/mini_httpd/Makefile Wed May 11 15:07:26 2016 (r415007)
+++ head/www/mini_httpd/Makefile Wed May 11 15:12:05 2016 (r415008)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mini_httpd
-PORTVERSION= 1.23
+PORTVERSION= 1.24
CATEGORIES= www ipv6
MASTER_SITES= http://www.acme.com/software/mini_httpd/
@@ -13,15 +13,11 @@ LICENSE= BSD2CLAUSE
USES= cpe
CPE_VENDOR= acme
-MAKE_ARGS= SSL_TREE="${OPENSSLBASE}"
USE_OPENSSL= yes
post-patch:
@${REINPLACE_CMD} -e 's/htpasswd/${PORTNAME}-htpasswd/g' ${WRKSRC}/htpasswd.1
@${REINPLACE_CMD} -e 's/\(htpasswd(1)\)/${PORTNAME}-\1/g' ${WRKSRC}/${PORTNAME}.8
- @${REINPLACE_CMD} \
- -e '/^CFLAGS =/s|=|= ${CFLAGS}|' \
- -e '/^LDFLAGS =/s|=|= ${LDFLAGS}|' ${WRKSRC}/Makefile
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
Modified: head/www/mini_httpd/distinfo
==============================================================================
--- head/www/mini_httpd/distinfo Wed May 11 15:07:26 2016 (r415007)
+++ head/www/mini_httpd/distinfo Wed May 11 15:12:05 2016 (r415008)
@@ -1,2 +1,2 @@
-SHA256 (mini_httpd-1.23.tar.gz) = bcc8c88392a4baeba5fa3ca8b924e9558c3dcb3018989b228d4f621acc8fffca
-SIZE (mini_httpd-1.23.tar.gz) = 43322
+SHA256 (mini_httpd-1.24.tar.gz) = ba3846368f1c42b10931b5c25199b011d243dbf8025e51e3e2c2919952f6c359
+SIZE (mini_httpd-1.24.tar.gz) = 43192
Modified: head/www/mini_httpd/files/patch-Makefile
==============================================================================
--- head/www/mini_httpd/files/patch-Makefile Wed May 11 15:07:26 2016 (r415007)
+++ head/www/mini_httpd/files/patch-Makefile Wed May 11 15:12:05 2016 (r415008)
@@ -1,6 +1,6 @@
--- Makefile.orig 2014-10-19 06:33:43 UTC
+++ Makefile
-@@ -15,17 +15,17 @@ CRYPT_LIB = -lcrypt
+@@ -15,17 +15,21 @@ CRYPT_LIB = -lcrypt
# tree with your OpenSSL installation - depending on how you installed it,
# it may be in /usr/local instead of /usr/local/ssl.
#SSL_TREE = /usr/local/ssl
@@ -8,18 +8,25 @@
-#SSL_INC = -I$(SSL_TREE)/include
-#SSL_LIBS = -L$(SSL_TREE)/lib -lssl -lcrypto
+SSL_DEFS = -DUSE_SSL
-+SSL_INC = -I$(SSL_TREE)/include
-+SSL_LIBS = -L$(SSL_TREE)/lib -lssl -lcrypto
++.if "$(OPENSSLINC)" != "/usr/include"
++SSL_INC = -I$(OPENSSLINC)
++.endif
++.if "$(OPENSSLLIB)" != "/usr/lib"
++SSL_LIBS = -L$(OPENSSLLIB)
++.endif
++SSL_LIBS+= -lssl -lcrypto
- BINDIR = /usr/local/sbin
- MANDIR = /usr/local/man
- CC = cc
+-BINDIR = /usr/local/sbin
++BINDIR = ${PREFIX}/sbin
+-MANDIR = /usr/local/man
++MANDIR = ${MANPREFIX}/man
+-CC = cc
++CC ?= cc
CDEFS = $(SSL_DEFS) $(SSL_INC)
-CFLAGS = -O $(CDEFS) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long
-LDFLAGS = -s
-+CFLAGS = -O2 -pipe -fstack-protector -fno-strict-aliasing $(CDEFS) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long
-+LDFLAGS = -Wl,-rpath,/usr/local/lib -fstack-protector -s
++CFLAGS += $(CDEFS) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long
LDLIBS = $(CRYPT_LIB) $(SSL_LIBS) $(SYSV_LIBS)
all: mini_httpd htpasswd
More information about the svn-ports-all
mailing list