pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

unit: decouple devkit and add devel/libunit.



Module Name:	pkgsrc-wip
Committed By:	Sergey A. Osokin <osa%FreeBSD.org@localhost>
Pushed By:	osa
Date:		Sat Nov 21 13:58:07 2020 -0500
Changeset:	24268b622eece2044e3637b99d7a8a8e4b627d12

Modified Files:
	unit/Makefile.common
	unit/PLIST
	unit/options.mk
Added Files:
	libunit/DESCR
	libunit/Makefile
	libunit/PLIST
	libunit/distinfo

Log Message:
unit: decouple devkit and add devel/libunit.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=24268b622eece2044e3637b99d7a8a8e4b627d12

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libunit/DESCR        |  2 ++
 libunit/Makefile     | 24 ++++++++++++++++++++++++
 libunit/PLIST        | 12 ++++++++++++
 libunit/distinfo     |  6 ++++++
 unit/Makefile.common |  1 +
 unit/PLIST           | 10 ----------
 unit/options.mk      |  8 +-------
 7 files changed, 46 insertions(+), 17 deletions(-)

diffs:
diff --git a/libunit/DESCR b/libunit/DESCR
new file mode 100644
index 0000000000..90ff5515f9
--- /dev/null
+++ b/libunit/DESCR
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000000..3b849c087f
--- /dev/null
+++ b/libunit/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD$
+
+PKGNAME=	libunit-${UNIT_VERSION}
+DISTNAME=	unit-${UNIT_VERSION}
+COMMENT=	Development kit for dynamic web application server
+
+MAINTAINER=	osa%FreeBSD.org@localhost
+
+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 "../../www/unit/version.mk"
+.include "../../www/unit/Makefile.common"
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/libunit/PLIST b/libunit/PLIST
new file mode 100644
index 0000000000..ecc1c56b6b
--- /dev/null
+++ b/libunit/PLIST
@@ -0,0 +1,12 @@
+@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/libunit/distinfo b/libunit/distinfo
new file mode 100644
index 0000000000..cc8fdd28d4
--- /dev/null
+++ b/libunit/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+SHA1 (unit-1.21.0.tar.gz) = 19278761d3104ff8509422f55207b1daa45a4d14
+RMD160 (unit-1.21.0.tar.gz) = 91c24ed9e8eac402a170c8b02b5633cd892fb017
+SHA512 (unit-1.21.0.tar.gz) = 12e9e8b221ffe8014931fe46c7faa9398de6ad08bbc07e5f8e50f086e4a22419960522d33bece493e17ae544b499acb4ba29cb6cb731c0bb7fbdc6cdc44bf210
+Size (unit-1.21.0.tar.gz) = 802826 bytes
diff --git a/unit/Makefile.common b/unit/Makefile.common
index 1bf1ef7cf2..4b5fca6805 100644
--- a/unit/Makefile.common
+++ b/unit/Makefile.common
@@ -1,5 +1,6 @@
 # $NetBSD$
 #
+# used by devel/libunit/Makefile
 # used by www/unit/Makefile
 # used by www/unit-perl/Makefile
 # used by www/unit-php/Makefile
diff --git a/unit/PLIST b/unit/PLIST
index 80dfcef2ce..36767d47cf 100644
--- a/unit/PLIST
+++ b/unit/PLIST
@@ -1,12 +1,2 @@
 @comment $NetBSD$
-${PLIST.devkit}include/nxt_unit.h
-${PLIST.devkit}include/nxt_unit_field.h
-${PLIST.devkit}include/nxt_unit_request.h
-${PLIST.devkit}include/nxt_unit_response.h
-${PLIST.devkit}include/nxt_unit_sptr.h
-${PLIST.devkit}include/nxt_unit_typedefs.h
-${PLIST.devkit}include/nxt_unit_websocket.h
-${PLIST.devkit}include/nxt_version.h
-${PLIST.devkit}include/nxt_websocket_header.h
-${PLIST.devkit}lib/libunit.a
 sbin/unitd
diff --git a/unit/options.mk b/unit/options.mk
index dfb9d49011..449f23d235 100644
--- a/unit/options.mk
+++ b/unit/options.mk
@@ -1,21 +1,15 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.unit
-PKG_SUPPORTED_OPTIONS=	debug devkit inet6 pcre2 ssl
+PKG_SUPPORTED_OPTIONS=	debug inet6 pcre2 ssl
 PKG_SUGGESTED_OPTIONS=	inet6 pcre2 ssl
 
-PLIST_VARS+=		devkit
-
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--debug
 .endif
 
-.if !empty(PKG_OPTIONS:Mdevkit)
-PLIST.devkit=		yes
-.endif
-
 .if empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--no-ipv6
 .endif


Home | Main Index | Thread Index | Old Index