Page MenuHomeFreeBSD
Files F142184765

D13227.diff
No OneTemporary
Actions

D13227.diff
View Options

Index: head/www/Makefile
===================================================================
--- head/www/Makefile
+++ head/www/Makefile
@@ -1868,6 +1868,7 @@
SUBDIR += py-tvdb_api
SUBDIR += py-txrequests
SUBDIR += py-uliweb
+ SUBDIR += py-unit
SUBDIR += py-urlgrabber
SUBDIR += py-urlobject
SUBDIR += py-user_agent
@@ -2391,6 +2392,11 @@
SUBDIR += ufdbguard
SUBDIR += uglifyjs
SUBDIR += unit
+ SUBDIR += unit-go
+ SUBDIR += unit-php56
+ SUBDIR += unit-php70
+ SUBDIR += unit-php71
+ SUBDIR += unit-php72
SUBDIR += usermanager
SUBDIR += uwsgi
SUBDIR += uwsgitop
Index: head/www/py-unit/Makefile
===================================================================
--- head/www/py-unit/Makefile
+++ head/www/py-unit/Makefile
@@ -0,0 +1,26 @@
+# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
+# $FreeBSD$
+
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+COMMENT= Python module for NGINX Unit
+
+USES= python gettext-runtime
+USE_PYTHON= flavors
+
+PLIST_FILES= libexec/unit/modules/python${PYTHON_SUFFIX}.unit.so
+
+USE_RC_SUBR?= # reset to empty
+
+MASTERDIR= ${.CURDIR}/../unit
+
+post-configure:
+ cd ${CONFIGURE_WRKSRC} && \
+ ./configure python --module=python${PYTHON_SUFFIX} \
+ --config=${PYTHON_CMD}-config
+do-install:
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
+ ${INSTALL_LIB} ${WRKSRC}/build/python${PYTHON_SUFFIX}.unit.so \
+ ${STAGEDIR}${PREFIX}/libexec/unit/modules/
+
+.include "${MASTERDIR}/Makefile"
Index: head/www/unit-go/Makefile
===================================================================
--- head/www/unit-go/Makefile
+++ head/www/unit-go/Makefile
@@ -0,0 +1,33 @@
+# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
+# $FreeBSD$
+
+PKGNAMESUFFIX= -go
+
+COMMENT= Go module for NGINX Unit
+
+USES= go
+
+PLIST_FILES= # reset to empty
+PLIST_DIRS= # reset to empty
+PLIST= ${.CURDIR}/pkg-plist
+
+USE_RC_SUBR?= # reset to empty
+
+MASTERDIR= ${.CURDIR}/../unit
+
+CGO_CFLAGS+= -I${WRKSRC}/src -I${WRKSRC}/build
+
+post-extract:
+ ${MKDIR} ${GO_WRKSRC:H}
+ ${LN} -sf ${WRKSRC}/src/go/unit ${GO_WRKSRC}
+
+post-configure:
+ cd ${WRKSRC} && env ${GO_ENV} ./configure go
+
+pre-build:
+ cd ${WRKSRC} && make go
+
+post-install:
+ @true # override master's
+
+.include "${MASTERDIR}/Makefile"
Index: head/www/unit-go/pkg-plist
===================================================================
--- head/www/unit-go/pkg-plist
+++ head/www/unit-go/pkg-plist
@@ -0,0 +1,21 @@
+%%GO_LIBDIR%%/unit.a
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/cbytes-1.6.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/cbytes-1.7.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_array.c
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_array.h
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_lib.c
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_lib.h
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_log.h
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_mutex.h
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_port_memory.c
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_port_memory.h
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_port.c
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_port.h
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_process.c
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_process.h
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_run_ctx.c
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/nxt_go_run_ctx.h
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/port.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/request.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/response.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/unit.go
Index: head/www/unit-php56/Makefile
===================================================================
--- head/www/unit-php56/Makefile
+++ head/www/unit-php56/Makefile
@@ -0,0 +1,24 @@
+# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
+# $FreeBSD$
+
+PKGNAMESUFFIX= -php${PHP_VER}
+
+COMMENT= PHP module for NGINX Unit
+
+PLIST_FILES= libexec/unit/modules/php${PHP_VER}.unit.so
+
+USES= php:build,embed
+
+MASTERDIR= ${.CURDIR}/../unit
+
+post-configure:
+ cd ${CONFIGURE_WRKSRC} && \
+ ./configure php --lib-path=${LOCALBASE}/lib \
+ --module=php${PHP_VER}
+
+do-install:
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
+ ${INSTALL_LIB} ${WRKSRC}/build/php${PHP_VER}.unit.so \
+ ${STAGEDIR}${PREFIX}/libexec/unit/modules/
+
+.include "${MASTERDIR}/Makefile"
Index: head/www/unit-php70/Makefile
===================================================================
--- head/www/unit-php70/Makefile
+++ head/www/unit-php70/Makefile
@@ -0,0 +1,8 @@
+# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
+# $FreeBSD$
+
+PHP_VER= 70
+
+MASTERDIR= ${.CURDIR}/../unit-php56
+
+.include "${MASTERDIR}/Makefile"
Index: head/www/unit-php71/Makefile
===================================================================
--- head/www/unit-php71/Makefile
+++ head/www/unit-php71/Makefile
@@ -0,0 +1,8 @@
+# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
+# $FreeBSD$
+
+PHP_VER= 71
+
+MASTERDIR= ${.CURDIR}/../unit-php56
+
+.include "${MASTERDIR}/Makefile"
Index: head/www/unit-php72/Makefile
===================================================================
--- head/www/unit-php72/Makefile
+++ head/www/unit-php72/Makefile
@@ -0,0 +1,8 @@
+# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
+# $FreeBSD$
+
+PHP_VER= 72
+
+MASTERDIR= ${.CURDIR}/../unit-php56
+
+.include "${MASTERDIR}/Makefile"
Index: head/www/unit/Makefile
===================================================================
--- head/www/unit/Makefile
+++ head/www/unit/Makefile
@@ -5,10 +5,10 @@
PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= http://unit.nginx.org/download/
+MASTER_SITES= https://unit.nginx.org/download/
MAINTAINER= osa@FreeBSD.org
-COMMENT= Dynamic web application server
+COMMENT?= Dynamic web application server
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -18,28 +18,15 @@
CPE_VENDOR= nginx
CPE_PRODUCT= unit
-NO_OPTIONS_SORT= yes
-OPTIONS_DEFINE= \
+OPTIONS_DEFINE?= \
DEBUG \
IPV6 \
- UNIXSOCK \
- PHP \
- PYTHON27 \
- PYTHON34 \
- PYTHON35 \
- PYTHON36
+ UNIXSOCK
+OPTIONS_DEFAULT?=IPV6 UNIXSOCK
-OPTIONS_DEFAULT?=IPV6 PYTHON27
-
DEBUG_DESC= Enable debug logging
IPV6_DESC= Enable IPv6
UNIXSOCK_DESC= Enable unix sockets
-GO_DESC= Enable Go module
-PHP_DESC= Enable PHP module
-PYTHON27_DESC= Enable Python 2.7 module
-PYTHON34_DESC= Enable Python 3.4 module
-PYTHON35_DESC= Enable Python 3.5 module
-PYTHON36_DESC= Enable Python 3.6 module
.include <bsd.port.options.mk>
@@ -52,18 +39,19 @@
UNIT_PIDFILE?= ${UNIT_RUNDIR}/${PORTNAME}.pid
UNIT_SOCK?= ${UNIT_RUNDIR}/control.unit.sock
-PLIST_FILES+= etc/rc.d/unitd \
- sbin/unitd
-
-CONFIGURE_ARGS+=--bindir=${PREFIX}/bin \
- --sbindir=${PREFIX}/sbin \
- --modules=${PREFIX}/libexec/${PORTNAME} \
+CONFIGURE_ARGS= --prefix=${PREFIX} \
+ --modules=libexec/unit/modules \
+ --state=libexec/unit \
--log=${UNIT_LOGFILE} \
--pid=${UNIT_PIDFILE} \
--ld-opt="-L${LOCALBASE}/lib"
-USE_RC_SUBR= unitd
-SUB_LIST+= UNIT_PIDFILE=${UNIT_PIDFILE} \
+PLIST_FILES?= sbin/unitd
+PLIST_DIRS?= libexec/unit/modules \
+ libexec/unit
+
+USE_RC_SUBR?= unitd
+SUB_LIST= UNIT_PIDFILE=${UNIT_PIDFILE} \
UNIT_SOCK=${UNIT_SOCK} \
PREFIX=${PREFIX}
@@ -81,82 +69,9 @@
CONFIGURE_ARGS+=--control=unix:${UNIT_SOCK}
.endif
-.if ${PORT_OPTIONS:MGO}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/go:lang/go
-RUN_DEPENDS+= ${LOCALBASE}/bin/go:lang/go
-PLIST_FILES+= go/src/unit/cbytes-1.6.go \
- go/src/unit/cbytes-1.7.go \
- go/src/unit/nxt_go_array.c \
- go/src/unit/nxt_go_array.h \
- go/src/unit/nxt_go_lib.c \
- go/src/unit/nxt_go_lib.h \
- go/src/unit/nxt_go_log.h \
- go/src/unit/nxt_go_mutex.h \
- go/src/unit/nxt_go_port.c \
- go/src/unit/nxt_go_port.h \
- go/src/unit/nxt_go_port_memory.c \
- go/src/unit/nxt_go_port_memory.h \
- go/src/unit/nxt_go_process.c \
- go/src/unit/nxt_go_process.h \
- go/src/unit/nxt_go_run_ctx.c \
- go/src/unit/nxt_go_run_ctx.h \
- go/src/unit/port.go \
- go/src/unit/request.go \
- go/src/unit/response.go \
- go/src/unit/unit.go \
- go/pkg/freebsd_amd64/unit.a
-.endif
-
-.if ${PORT_OPTIONS:MPHP}
-USES+= php:embed
-PLIST_FILES+= libexec/unit/php.unit.so
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON27}
-USES+= python:2.7
-PLIST_FILES+= libexec/unit/python2.7.unit.so
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON34}
-USES+= python:3.4
-PLIST_FILES+= libexec/unit/python3.4.unit.so
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON35}
-USES+= python:3.5
-PLIST_FILES+= libexec/unit/python3.5.unit.so
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON36}
-USES+= python:3.6
-PLIST_FILES+= libexec/unit/python3.6.unit.so
-.endif
-
-post-configure:
-.if ${PORT_OPTIONS:MGO}
- @cd ${WRKSRC} && ./configure go --go=${LOCALBASE}/bin/go --go-path=${LOCALBASE}/go
-.endif
-.if ${PORT_OPTIONS:MPHP}
- @cd ${WRKSRC} && ./configure php --config=${LOCALBASE}/bin/php-config \
- --lib-path="${LOCALBASE}/lib"
-.endif
-.if ${PORT_OPTIONS:MPYTHON27}
- @cd ${WRKSRC} && ./configure python --config=${LOCALBASE}/bin/python2.7-config
-.endif
-.if ${PORT_OPTIONS:MPYTHON34}
- @cd ${WRKSRC} && ./configure python --config=${LOCALBASE}/bin/python3.4-config
-.endif
-.if ${PORT_OPTIONS:MPYTHON35}
- @cd ${WRKSRC} && ./configure python --config=${LOCALBASE}/bin/python3.5-config
-.endif
-.if ${PORT_OPTIONS:MPYTHON36}
- @cd ${WRKSRC} && ./configure python --config=${LOCALBASE}/bin/python3.6-config
-.endif
-
+.if !target(post-install)
post-install:
- ${MKDIR} ${STAGEDIR}${UNIT_LOGDIR}
- ${MKDIR} ${STAGEDIR}${UNIT_RUNDIR}
- ${ECHO_CMD} @dir ${UNIT_LOGDIR} >> ${TMPPLIST}
- ${ECHO_CMD} @dir ${UNIT_RUNDIR} >> ${TMPPLIST}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules
+.endif
.include <bsd.port.mk>
Index: head/www/unit/pkg-descr
===================================================================
--- head/www/unit/pkg-descr
+++ head/www/unit/pkg-descr
@@ -3,4 +3,4 @@
configured via API. The design of the server allows reconfiguration of
specific application parameters as needed by the engineering or operations.
-WWW: http://unit.nginx.org/
+WWW: https://unit.nginx.org

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 17, 11:10 PM (2 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27700688
Default Alt Text
D13227.diff (9 KB)

Event Timeline