pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
*unit*: remove, pkgsrc version is the same
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By: wiz
Date: Tue Nov 15 13:39:33 2022 +0100
Changeset: 998e3de8cc8dd6965b1fbb72d29d6ab887b44249
Modified Files:
Makefile
Removed Files:
libunit/DESCR
libunit/Makefile
libunit/PLIST
unit-perl/DESCR
unit-perl/Makefile
unit-php/DESCR
unit-php/Makefile
unit-python/DESCR
unit-python/Makefile
unit-ruby/DESCR
unit-ruby/Makefile
unit/DESCR
unit/Makefile
unit/Makefile.common
unit/PLIST
unit/PLIST.module
unit/common.mk
unit/distinfo
unit/ext.mk
unit/files/smf/manifest.xml
unit/files/unit.sh
unit/options.mk
unit/patches/patch-auto_events
unit/patches/patch-auto_os_conf
unit/patches/patch-src_nxt__kqueue__engine.c
unit/patches/patch-src_nxt__php__sapi.c
unit/patches/patch-src_nxt__unix.h
unit/patches/patch-src_nxt__websocket__header.h
unit/version.mk
Log Message:
*unit*: remove, pkgsrc version is the same
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=998e3de8cc8dd6965b1fbb72d29d6ab887b44249
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 6 --
libunit/DESCR | 2 -
libunit/Makefile | 27 -----
libunit/PLIST | 12 ---
unit-perl/DESCR | 1 -
unit-perl/Makefile | 21 ----
unit-php/DESCR | 1 -
unit-php/Makefile | 32 ------
unit-python/DESCR | 1 -
unit-python/Makefile | 20 ----
unit-ruby/DESCR | 1 -
unit-ruby/Makefile | 19 ----
unit/DESCR | 6 --
unit/Makefile | 14 ---
unit/Makefile.common | 63 ------------
unit/PLIST | 3 -
unit/PLIST.module | 2 -
unit/common.mk | 10 --
unit/distinfo | 11 --
unit/ext.mk | 53 ----------
unit/files/smf/manifest.xml | 31 ------
unit/files/unit.sh | 17 ----
unit/options.mk | 33 ------
unit/patches/patch-auto_events | 128 ------------------------
unit/patches/patch-auto_os_conf | 16 ---
unit/patches/patch-src_nxt__kqueue__engine.c | 21 ----
unit/patches/patch-src_nxt__php__sapi.c | 15 ---
unit/patches/patch-src_nxt__unix.h | 30 ------
unit/patches/patch-src_nxt__websocket__header.h | 14 ---
unit/version.mk | 20 ----
30 files changed, 630 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 7483dd6af9..0ec05c8906 100644
--- a/Makefile
+++ b/Makefile
@@ -2223,7 +2223,6 @@ SUBDIR+= libtxc_dxtn
SUBDIR+= libucl
SUBDIR+= libudev
SUBDIR+= libuna
-SUBDIR+= libunit
SUBDIR+= libunwind-git
SUBDIR+= libusbmuxd
SUBDIR+= libvalhalla
@@ -5865,11 +5864,6 @@ SUBDIR+= unimrcp-apr
SUBDIR+= unimrcp-aprutil
SUBDIR+= unimrcp-sofiasip
SUBDIR+= unison-snapshot
-SUBDIR+= unit
-SUBDIR+= unit-perl
-SUBDIR+= unit-php
-SUBDIR+= unit-python
-SUBDIR+= unit-ruby
SUBDIR+= universalcodegrep
SUBDIR+= unix2tcp
SUBDIR+= unmo3
diff --git a/libunit/DESCR b/libunit/DESCR
deleted file mode 100644
index 90ff5515f9..0000000000
--- a/libunit/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Development kit for NGINX Unit, a dynamic web application server, designed
-to run applications in multiple languages.
diff --git a/libunit/Makefile b/libunit/Makefile
deleted file mode 100644
index 6ec346c3dc..0000000000
--- a/libunit/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD$
-
-PKGNAME= libunit-${UNIT_VERSION}
-DISTNAME= unit-${UNIT_VERSION}
-COMMENT= Development kit for dynamic web application server
-
-MAINTAINER= osa%FreeBSD.org@localhost
-
-DISTINFO_FILE= ${.CURDIR}/../unit/distinfo
-PATCHDIR= ${.CURDIR}/../unit/patches
-
-WRKSRC= ${WRKDIR}/${DISTNAME}
-
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-CONFIGURE_ARGS+= --ld-opt="-L${PREFIX}/lib -R${PREFIX}/lib"
-CONFIGURE_ARGS+= --no-regex
-
-do-build:
- cd ${WRKSRC} && ${MAKE} build/libunit.a
-
-do-install:
- ${MAKE} -C ${WRKSRC} libunit-install DESTDIR=${DESTDIR}
-
-.include "../../wip/unit/version.mk"
-.include "../../wip/unit/Makefile.common"
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/libunit/PLIST b/libunit/PLIST
deleted file mode 100644
index ecc1c56b6b..0000000000
--- a/libunit/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD$
-include/nxt_auto_config.h
-include/nxt_unit.h
-include/nxt_unit_field.h
-include/nxt_unit_request.h
-include/nxt_unit_response.h
-include/nxt_unit_sptr.h
-include/nxt_unit_typedefs.h
-include/nxt_unit_websocket.h
-include/nxt_version.h
-include/nxt_websocket_header.h
-lib/libunit.a
diff --git a/unit-perl/DESCR b/unit-perl/DESCR
deleted file mode 100644
index 16a9ccf931..0000000000
--- a/unit-perl/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for NGINX Unit.
diff --git a/unit-perl/Makefile b/unit-perl/Makefile
deleted file mode 100644
index c54ccb40c1..0000000000
--- a/unit-perl/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD$
-
-PKGNAME= unit-${LANG}-${UNIT_VERSION}
-COMMENT= Perl module for NGINX Unit
-
-LANG= perl
-MODNAME= ${LANG}
-
-MAINTAINER= osa%FreeBSD.org@localhost
-
-USE_TOOLS+= perl
-
-post-configure:
- ${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \
- ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ${CONFIGURE_SCRIPT} \
- ${LANG} --module=${MODNAME}
-
-.include "../../lang/perl5/buildlink3.mk"
-.include "../../wip/unit/ext.mk"
-.include "../../wip/unit/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/unit-php/DESCR b/unit-php/DESCR
deleted file mode 100644
index 571bf9030d..0000000000
--- a/unit-php/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-PHP module for NGINX Unit.
diff --git a/unit-php/Makefile b/unit-php/Makefile
deleted file mode 100644
index a2d109d01f..0000000000
--- a/unit-php/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD$
-
-PKGNAME= unit-${LANG}${PHP_VERSION:R:S|.||g}-${UNIT_VERSION}
-COMMENT= PHP module for NGINX Unit
-
-LANG= php
-MODNAME= ${LANG}${PHP_VERSION}
-
-MAINTAINER= osa%FreeBSD.org@localhost
-
-PHP_VERSIONS_ACCEPTED?= 56 73 74 80
-
-.include "../../lang/php/phpversion.mk"
-
-#PHP_BUILD_OPTIONS!= ${RUN} ${PKG_INFO} -Bn php | ${GREP} PKG_OPTIONS
-#.if empty(PHP_BUILD_OPTIONS:Mphp-embed)
-#BROKEN= "Requires the php-embed option enabled in PHP."
-#.endif
-
-BROKEN= "Requires the php-embed option enabled in PHP but there is no code to check if this is so."
-
-post-configure:
- ${RUN} cd ${WRKSRC} && ${SETENV} ${_CONFIGURE_SCRIPT_ENV} \
- ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
- ${CONFIGURE_SCRIPT} ${LANG} \
- --lib-path=${PREFIX}/lib \
- --module=${MODNAME}
-
-.include "${PHPPKGSRCDIR}/buildlink3.mk"
-.include "../../wip/unit/ext.mk"
-.include "../../wip/unit/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/unit-python/DESCR b/unit-python/DESCR
deleted file mode 100644
index 1b2be0038a..0000000000
--- a/unit-python/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Python module for NGINX Unit.
diff --git a/unit-python/Makefile b/unit-python/Makefile
deleted file mode 100644
index d1f5de6cac..0000000000
--- a/unit-python/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD$
-
-PKGNAME= unit-${LANG}${PYVERSSUFFIX}-${UNIT_VERSION}
-COMMENT= Python module for NGINX Unit
-
-LANG= python
-MODNAME= ${LANG}
-
-MAINTAINER= osa%FreeBSD.org@localhost
-
-post-configure:
- ${RUN} cd ${WRKSRC} && ${SETENV} ${_CONFIGURE_SCRIPT_ENV} \
- ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ${CONFIGURE_SCRIPT} \
- ${LANG} --module=${MODNAME} \
- --config=${LANG}${PYVERSSUFFIX}-config
-
-.include "../../lang/${LANG}/application.mk"
-.include "../../wip/unit/ext.mk"
-.include "../../wip/unit/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/unit-ruby/DESCR b/unit-ruby/DESCR
deleted file mode 100644
index f96736e078..0000000000
--- a/unit-ruby/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Ruby module for NGINX Unit.
diff --git a/unit-ruby/Makefile b/unit-ruby/Makefile
deleted file mode 100644
index 2b208cfc3e..0000000000
--- a/unit-ruby/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD$
-
-PKGNAME= unit-${LANG}${RUBY_VER}-${UNIT_VERSION}
-COMMENT= Ruby module for NGINX Unit
-
-LANG= ruby
-MODNAME= ${LANG}
-
-MAINTAINER= osa%FreeBSD.org@localhost
-
-post-configure:
- ${RUN} cd ${WRKSRC} && ${SETENV} ${_CONFIGURE_SCRIPT_ENV} \
- ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
- ${CONFIGURE_SCRIPT} ${LANG} --module=${MODNAME}
-
-.include "../../lang/${LANG}/buildlink3.mk"
-.include "../../wip/unit/ext.mk"
-.include "../../wip/unit/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/unit/DESCR b/unit/DESCR
deleted file mode 100644
index 3599145d9a..0000000000
--- a/unit/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-NGINX Unit is a lightweight dynamic open-source server for diverse
-web applications.
-
-Built from scratch, Unit can run web apps in different language
-versions; fully configurable in runtime with zero interruption, it
-enables on-the-fly granular management for engineering and operations.
diff --git a/unit/Makefile b/unit/Makefile
deleted file mode 100644
index 34eafcf651..0000000000
--- a/unit/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD$
-
-.include "../../wip/unit/version.mk"
-
-DISTNAME= unit-${UNIT_VERSION}
-
-COMMENT= Dynamic web application server
-
-MAINTAINER= osa%FreeBSD.org@localhost
-
-RCD_SCRIPTS= unit
-
-.include "../../wip/unit/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/unit/Makefile.common b/unit/Makefile.common
deleted file mode 100644
index 86649a670b..0000000000
--- a/unit/Makefile.common
+++ /dev/null
@@ -1,63 +0,0 @@
-# $NetBSD$
-#
-# used by wip/libunit/Makefile
-# used by wip/unit/Makefile
-# used by wip/unit-perl/Makefile
-# used by wip/unit-php/Makefile
-# used by wip/unit-python/Makefile
-# used by wip/unit-ruby/Makefile
-
-# Do *not* add any version-specific data here
-
-CATEGORIES= www
-MASTER_SITES= https://unit.nginx.org/download/
-
-HOMEPAGE= https://unit.nginx.org/
-LICENSE= apache-2.0
-
-.include "../../mk/bsd.prefs.mk"
-
-UNIT_USER?= unit
-UNIT_GROUP?= unit
-UNIT_DATADIR?= ${VARBASE}/db/unit
-UNIT_LOGDIR?= ${VARBASE}/log/unit
-UNIT_RUNDIR?= ${VARBASE}/run/unit
-UNIT_PIDDIR?= ${VARBASE}/run
-UNIT_TMPDIR?= ${VARBASE}/tmp
-
-BUILD_DEFS+= UNIT_DATADIR UNIT_LOGDIR UNIT_PIDDIR VARBASE
-
-PKG_USERS_VARS+= UNIT_USER
-PKG_GROUPS_VARS+= UNIT_GROUP
-PKG_GROUPS= ${UNIT_GROUP}
-PKG_USERS= ${UNIT_USER}:${UNIT_GROUP}
-
-PKG_GECOS.${UNIT_USER}= NGINX Unit server user
-PKG_HOME.${UNIT_USER}= ${UNIT_DATADIR}
-PKG_SHELL.${UNIT_USER}= ${NOLOGIN}
-
-USE_PKGLOCALEDIR= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ENV+= PATH=${PATH}
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-CONFIGURE_ARGS+= --ld-opt="-L${PREFIX}/lib -R${PREFIX}/lib"
-CONFIGURE_ARGS+= --log=${UNIT_LOGDIR}/unit.log
-CONFIGURE_ARGS+= --modules=${UNIT_EXTENSION_DIR}
-CONFIGURE_ARGS+= --pid=${UNIT_PIDDIR}/unit.pid
-CONFIGURE_ARGS+= --state=${UNIT_DATADIR}
-CONFIGURE_ARGS+= --control=unix:${UNIT_RUNDIR}/control.unit.sock
-CONFIGURE_ARGS+= --tmp=${UNIT_TMPDIR}
-CONFIGURE_ARGS+= --user=${UNIT_USER}
-CONFIGURE_ARGS+= --group=${UNIT_GROUP}
-CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
-
-CHECK_WRKREF_SKIP= libexec/unit/modules/ruby.unit.so
-
-.include "../../wip/unit/options.mk"
-
-INSTALLATION_DIRS+= sbin ${UNIT_EXTENSION_DIR}
-MAKE_DIRS+= ${UNIT_PIDDIR} ${UNIT_DATADIR} ${UNIT_RUNDIR}
-OWN_DIRS= ${UNIT_LOGDIR} ${UNIT_RUNDIR}
-OWN_DIRS_PERMS+= ${UNIT_DATADIR} ${UNIT_USER} ${UNIT_GROUP} 0700
-
-USE_LANGUAGES= c
diff --git a/unit/PLIST b/unit/PLIST
deleted file mode 100644
index 1df68f1ae8..0000000000
--- a/unit/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD$
-man/man8/unitd.8
-sbin/unitd
diff --git a/unit/PLIST.module b/unit/PLIST.module
deleted file mode 100644
index 4e1cd6eb47..0000000000
--- a/unit/PLIST.module
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD$
-${UNIT_EXTENSION_DIR}/${PKGMODNAME}.${SHLIB_SUFFIX}
diff --git a/unit/common.mk b/unit/common.mk
deleted file mode 100644
index 1a85188d0b..0000000000
--- a/unit/common.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD$
-
-.if !defined(UNITCOMMON_MK)
-UNITCOMMON_MK= defined
-
-DISTNAME?= unit-${UNIT_VERSION}
-
-.endif
-
-.include "../../wip/unit/version.mk"
diff --git a/unit/distinfo b/unit/distinfo
deleted file mode 100644
index cbdfc55a1c..0000000000
--- a/unit/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
-BLAKE2s (unit-1.26.1.tar.gz) = 0f04392b663019aadd40213b0cc6342e9077c3324f9348e9f59a909db31a1d3c
-SHA512 (unit-1.26.1.tar.gz) = 1caadb35cb208067a5d437e1f649c9f9a833a39c4344b2c3a5ae94d9fcd811913e2f23114cf8d7886030306e036da18c55f09044b8a575c1616568321b8d84ec
-Size (unit-1.26.1.tar.gz) = 865811 bytes
-SHA1 (patch-auto_events) = 0347dfefbedaacd206c8c2bfd8ea38b18995dd9f
-SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55
-SHA1 (patch-src_nxt__kqueue__engine.c) = c341425f4b21d4cff6e003958f88a04b53dc4ee1
-SHA1 (patch-src_nxt__php__sapi.c) = 2d5e557ff2066bec78f5bfbca6a64688f60da01b
-SHA1 (patch-src_nxt__unix.h) = c0db5bc4d9c45a3ead48627567284d8b3041b0a0
-SHA1 (patch-src_nxt__websocket__header.h) = 1b50405b187cc8a662372a1c20ab7737278135ae
diff --git a/unit/ext.mk b/unit/ext.mk
deleted file mode 100644
index eb44a9f77a..0000000000
--- a/unit/ext.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD$
-#
-# NGINX Unit extension package framework, for bundled extensions.
-#
-# Just include this file, define MODNAME, define PKGREVISION if necessary,
-# add dependencies, and add the appropriate --with-configure-arg, then include
-# bsd.pkg.mk.
-#
-# used by wip/unit-perl/Makefile
-# used by wip/unit-php/Makefile
-# used by wip/unit-python/Makefile
-# used by wip/unit-ruby/Makefile
-
-.if !defined(UNITEXT_MK)
-UNITEXT_MK= defined
-
-.include "../../wip/unit/version.mk"
-
-DISTINFO_FILE= ${.CURDIR}/../../wip/unit/distinfo
-PATCHDIR= ${.CURDIR}/../../wip/unit/patches
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !defined(MODNAME)
-PKG_FAIL_REASON+= "MODNAME should be defined"
-.endif
-
-PKGMODNAME?= ${MODNAME}.unit
-
-PLIST_SUBST+= PKGMODNAME=${MODNAME}.unit
-PLIST_SUBST+= SHLIB_SUFFIX=${SHLIB_SUFFIX}
-PLIST_SUBST+= UNIT_EXTENSION_DIR=${UNIT_EXTENSION_DIR}
-
-PLIST_SRC+= ${.CURDIR}/../../wip/unit/PLIST.module
-
-INSTALLATION_DIRS+= ${UNIT_EXTENSION_DIR}
-
-.if ${OBJECT_FMT} == "SOM"
-SHLIB_SUFFIX= sl
-.else
-SHLIB_SUFFIX= so
-.endif
-
-do-build:
- cd ${WRKSRC} && ${MAKE} ${MODNAME}
-
-do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/${PKGMODNAME}.${SHLIB_SUFFIX} \
- ${DESTDIR}${PREFIX}/${UNIT_EXTENSION_DIR}
-
-.endif # UNITEXT_MK
-
-.include "${.CURDIR}/../../wip/unit/common.mk"
diff --git a/unit/files/smf/manifest.xml b/unit/files/smf/manifest.xml
deleted file mode 100644
index 86b2c741e3..0000000000
--- a/unit/files/smf/manifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="export">
- <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
- <create_default_instance enabled="false" />
- <single_instance />
- <dependency name='network' grouping='require_all' restart_on='error' type='service'>
- <service_fmri value='svc:/milestone/network:default' />
- </dependency>
- <dependency name='filesystem-local' grouping='require_all' restart_on='none' type='service'>
- <service_fmri value='svc:/system/filesystem/local:default' />
- </dependency>
- <method_context>
- <method_environment>
- <envvar name="LD_PRELOAD_32" value="/usr/lib/extendedFILE.so.1" />
- </method_environment>
- </method_context>
- <exec_method type="method" name="start" exec="@PREFIX@/sbin/unitd" timeout_seconds="60" />
- <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
- <exec_method type="method" name="refresh" exec=":kill -HUP" timeout_seconds="60" />
- <property_group name="startd" type="framework">
- <propval name="duration" type="astring" value="contract" />
- <propval name="ignore_error" type="astring" value="core,signal" />
- </property_group>
- <template>
- <common_name>
- <loctext xml:lang="C">NGINX Unit HTTP daemon</loctext>
- </common_name>
- </template>
- </service>
-</service_bundle>
diff --git a/unit/files/unit.sh b/unit/files/unit.sh
deleted file mode 100644
index 6b01dde320..0000000000
--- a/unit/files/unit.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD$
-#
-# PROVIDE: unit
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="unit"
-rcvar=${name}
-command="@PREFIX@/sbin/${name}d"
-pidfile="@VARBASE@/run/${name}.pid"
-start_precmd="ulimit -n 2048"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/unit/options.mk b/unit/options.mk
deleted file mode 100644
index 63ab2b9e4d..0000000000
--- a/unit/options.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD$
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.unit
-PKG_SUPPORTED_OPTIONS= debug inet6 pcre pcre2 ssl
-PKG_SUGGESTED_OPTIONS= inet6 pcre2 ssl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+= --debug
-.endif
-
-.if empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --no-ipv6
-.endif
-
-.if empty(PKG_OPTIONS:Mpcre) && empty(PKG_OPTIONS:Mpcre2)
-CONFIGURE_ARGS+= --no-regex
-.endif
-
-.if !empty(PKG_OPTIONS:Mpcre)
-CONFIGURE_ARGS+= --no-pcre2
-.include "../../devel/pcre/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mpcre2)
-.include "../../devel/pcre2/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-.include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+= --openssl
-.endif
diff --git a/unit/patches/patch-auto_events b/unit/patches/patch-auto_events
deleted file mode 100644
index 2595a4c477..0000000000
--- a/unit/patches/patch-auto_events
+++ /dev/null
@@ -1,128 +0,0 @@
-$NetBSD$
-
-Prefer eventports on SunOS
-
---- auto/events.orig 2021-02-04 15:22:33.000000000 +0000
-+++ auto/events
-@@ -5,69 +5,70 @@
-
- # Linux epoll.
-
--nxt_feature="Linux epoll"
--nxt_feature_name=NXT_HAVE_EPOLL
--nxt_feature_run=
--nxt_feature_incs=
--nxt_feature_libs=
--nxt_feature_test="#include <sys/epoll.h>
-- #include <unistd.h>
--
-- int main() {
-- int n;
--
-- n = epoll_create(1);
-- close(n);
-- return 0;
-- }"
--. auto/feature
--
--if [ $nxt_found = yes ]; then
-- NXT_HAVE_EPOLL=YES
--
-- nxt_feature="Linux signalfd()"
-- nxt_feature_name=NXT_HAVE_SIGNALFD
-+# Do not use epoll on SunOS/illumos/Smartos
-+# as eventports are preferred there.
-+NXT_HAVE_EPOLL=NO
-+if [ $NXT_SYSTEM != "SunOS" ]; then
-+ nxt_feature="Linux epoll"
-+ nxt_feature_name=NXT_HAVE_EPOLL
- nxt_feature_run=
- nxt_feature_incs=
- nxt_feature_libs=
-- nxt_feature_test="#include <signal.h>
-- #include <sys/signalfd.h>
-+ nxt_feature_test="#include <sys/epoll.h>
- #include <unistd.h>
--
-- int main() {
-- int n;
-- sigset_t mask;
--
-- sigemptyset(&mask);
-- n = signalfd(-1, &mask, 0);
-- close(n);
-- return 0;
-- }"
-- . auto/feature
--
--
-- nxt_feature="Linux eventfd()"
-- nxt_feature_name=NXT_HAVE_EVENTFD
-- nxt_feature_run=
-- nxt_feature_incs=
-- nxt_feature_libs=
-- nxt_feature_test="#include <sys/eventfd.h>
-- #include <unistd.h>
--
-+
- int main() {
- int n;
--
-- n = eventfd(0, 0);
-+
-+ n = epoll_create(1);
- close(n);
- return 0;
- }"
- . auto/feature
--
--else
-- NXT_HAVE_EPOLL=NO
-+
-+ if [ $nxt_found = yes ]; then
-+ NXT_HAVE_EPOLL=YES
-+
-+ nxt_feature="Linux signalfd()"
-+ nxt_feature_name=NXT_HAVE_SIGNALFD
-+ nxt_feature_run=
-+ nxt_feature_incs=
-+ nxt_feature_libs=
-+ nxt_feature_test="#include <signal.h>
-+ #include <sys/signalfd.h>
-+ #include <unistd.h>
-+
-+ int main() {
-+ int n;
-+ sigset_t mask;
-+
-+ sigemptyset(&mask);
-+ n = signalfd(-1, &mask, 0);
-+ close(n);
-+ return 0;
-+ }"
-+ . auto/feature
-+
-+
-+ nxt_feature="Linux eventfd()"
-+ nxt_feature_name=NXT_HAVE_EVENTFD
-+ nxt_feature_run=
-+ nxt_feature_incs=
-+ nxt_feature_libs=
-+ nxt_feature_test="#include <sys/eventfd.h>
-+ #include <unistd.h>
-+
-+ int main() {
-+ int n;
-+
-+ n = eventfd(0, 0);
-+ close(n);
-+ return 0;
-+ }"
-+ . auto/feature
-+ fi
- fi
-
--
- # FreeBSD, MacOSX, NetBSD, OpenBSD kqueue.
-
- nxt_feature="kqueue"
diff --git a/unit/patches/patch-auto_os_conf b/unit/patches/patch-auto_os_conf
deleted file mode 100644
index af0e124127..0000000000
--- a/unit/patches/patch-auto_os_conf
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Move _XOPEN_SOURCE to CFLAGS
-
---- auto/os/conf.orig 2020-11-19 18:12:30.000000000 +0000
-+++ auto/os/conf
-@@ -98,6 +98,9 @@ case "$NXT_SYSTEM" in
- NXT_LIBM="-lm"
- NXT_LIBS="-lsocket $NXT_LIBSENDFILE"
- NXT_LIBS="$NXT_LIBS $NXT_LIBRT $NXT_LIBDL $NXT_PTHREAD"
-+
-+ NXT_CFLAGS="$NXT_CFLAGS -D_XOPEN_SOURCE"
-+ NXT_CFLAGS="$NXT_CFLAGS -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__"
- ;;
-
- Darwin)
diff --git a/unit/patches/patch-src_nxt__kqueue__engine.c b/unit/patches/patch-src_nxt__kqueue__engine.c
deleted file mode 100644
index b88528474f..0000000000
--- a/unit/patches/patch-src_nxt__kqueue__engine.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-Use correct types on NetBSD-CURRENT.
-
-This patch is going to be reviewed by the vendor.
-
---- src/nxt_kqueue_engine.c.orig 2021-02-04 15:22:33.000000000 +0000
-+++ src/nxt_kqueue_engine.c
-@@ -39,8 +39,10 @@
- #endif
-
-
--#if (NXT_NETBSD)
--/* NetBSD defines the kevent.udata field as intptr_t. */
-+#if (NXT_NETBSD) && (defined(__NetBSD__) && __NetBSD_Version__ < 999001500)
-+/* NetBSD up to 9.99.15 defines the kevent.udata field as intptr_t.
-+ * NetBSD 9.99.16 onwards defines the kevent.udata field as void*
-+ */
-
- #define nxt_kevent_set_udata(udata) (intptr_t) (udata)
- #define nxt_kevent_get_udata(udata) (void *) (udata)
diff --git a/unit/patches/patch-src_nxt__php__sapi.c b/unit/patches/patch-src_nxt__php__sapi.c
deleted file mode 100644
index 38e8379769..0000000000
--- a/unit/patches/patch-src_nxt__php__sapi.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Use correct type.
-
---- src/nxt_php_sapi.c.orig 2021-02-04 15:22:33.000000000 +0000
-+++ src/nxt_php_sapi.c
-@@ -1191,7 +1191,7 @@ nxt_php_send_headers(sapi_headers_struct
- }
-
- value = colon + 1;
-- while(isspace(*value)) {
-+ while(isspace((unsigned char)(*value))) {
- value++;
- }
-
diff --git a/unit/patches/patch-src_nxt__unix.h b/unit/patches/patch-src_nxt__unix.h
deleted file mode 100644
index 3542331be0..0000000000
--- a/unit/patches/patch-src_nxt__unix.h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-Move _XOPEN_SOURCE to CFLAGS
-
---- src/nxt_unix.h.orig 2020-11-19 18:12:30.000000000 +0000
-+++ src/nxt_unix.h
-@@ -71,23 +71,6 @@
- #define _POSIX_PTHREAD_SEMANTICS /* 2 arguments in sigwait(). */
- #endif
-
--/*
-- * Solaris provides two sockets API:
-- *
-- * 1) 4.3BSD sockets (int instead of socklen_t in accept(), etc.;
-- * struct msghdr.msg_accrights) in libsocket;
-- * 2) X/Open sockets (socklen_t, struct msghdr.msg_control) with __xnet_
-- * function name prefix in libxnet and libsocket.
-- */
--
--/* Enable X/Open sockets API. */
--#define _XOPEN_SOURCE
--#define _XOPEN_SOURCE_EXTENDED 1
--/* Enable Solaris extensions disabled by _XOPEN_SOURCE. */
--#ifndef __EXTENSIONS__
--#define __EXTENSIONS__
--#endif
--
- #endif /* NXT_SOLARIS */
-
-
diff --git a/unit/patches/patch-src_nxt__websocket__header.h b/unit/patches/patch-src_nxt__websocket__header.h
deleted file mode 100644
index 03386575a1..0000000000
--- a/unit/patches/patch-src_nxt__websocket__header.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Include endian.h for endianness test to work.
-
---- src/nxt_websocket_header.h.orig 2020-10-08 16:04:40.000000000 +0000
-+++ src/nxt_websocket_header.h
-@@ -6,6 +6,7 @@
- #ifndef _NXT_WEBSOCKET_HEADER_H_INCLUDED_
- #define _NXT_WEBSOCKET_HEADER_H_INCLUDED_
-
-+#include <endian.h>
- #include <netinet/in.h>
-
-
diff --git a/unit/version.mk b/unit/version.mk
deleted file mode 100644
index fc02449699..0000000000
--- a/unit/version.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD$
-#
-# UNIT_EXTENSION_DIR
-# Relative path to ${PREFIX} for NGINX Unit's modules.
-#
-# Example: libexec/unit/modules
-#
-# Keywords: unit
-#
-
-.if !defined(UNITVERSION_MK)
-UNITVERSION_MK= defined
-
-# Define NGINX Unit's version.
-UNIT_VERSION= 1.26.1
-
-# Define NGINX Unit's modules directory
-UNIT_EXTENSION_DIR= libexec/unit/modules
-
-.endif # UNITVERSION_MK
Home |
Main Index |
Thread Index |
Old Index