www/unit: update infrastructure.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: www/unit: update infrastructure.
From: Sergey A. Osokin <osa%FreeBSD.org@localhost>
Date: Mon, 16 Nov 2020 20:25:30 +0000
Module Name:	pkgsrc-wip
Committed By:	Sergey A. Osokin <osa%FreeBSD.org@localhost>
Pushed By:	osa
Date:		Mon Nov 16 15:25:30 2020 -0500
Changeset:	08d695f1cd548482761a1c1bafe754b8066e1d35

Modified Files:
	unit-php/Makefile
	unit/Makefile
	unit/distinfo
	unit/ext.mk
Added Files:
	unit/common.mk
	unit/patches/patch-auto-modules-php
	unit/unitversion.mk
Removed Files:
	unit-php/PLIST
	unit-php/distinfo
	unit-php/patches/patch-auto-modules-php

Log Message:
www/unit: update infrastructure.

Move NGINX Unit's php module patches to the main port.
Use distfinfo from mail port as well.

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

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

diffstat:
 unit-php/Makefile                       |  8 ++++----
 unit-php/PLIST                          |  2 --
 unit-php/distinfo                       |  7 -------
 unit-php/patches/patch-auto-modules-php | 11 -----------
 unit/Makefile                           |  4 +++-
 unit/common.mk                          | 10 ++++++++++
 unit/distinfo                           |  1 +
 unit/ext.mk                             | 24 +++++++++++++++++-------
 unit/patches/patch-auto-modules-php     | 11 +++++++++++
 unit/unitversion.mk                     | 18 ++++++++++++++++++
 10 files changed, 64 insertions(+), 32 deletions(-)

diffs:
diff --git a/unit-php/Makefile b/unit-php/Makefile
index 1967f421f1..cdc0ce012d 100644
--- a/unit-php/Makefile
+++ b/unit-php/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
 
-PKGNAME=	unit-php${PHP_VERSION:R:S|.||g}-1.20.0
-DISTNAME=	unit-1.20.0
+PKGNAME=	unit-${LANG}${PHP_VERSION:R:S|.||g}-${UNIT_VERSION}
 COMMENT=	PHP module for NGINX Unit
 
-MODNAME=	php${PHP_VERSION}
+LANG=		php
+MODNAME=	${LANG}${PHP_VERSION}
 
 MAINTAINER=	osa%FreeBSD.org@localhost
 
@@ -20,7 +20,7 @@ USE_LANGUAGES+=	c
 
 post-configure:
 	cd ${WRKSRC} && \
-	./configure php --lib-path=${PREFIX}/lib \
+	./configure ${LANG} --lib-path=${PREFIX}/lib \
 		--module=${MODNAME}
 
 .include "${PHPPKGSRCDIR}/buildlink3.mk"
diff --git a/unit-php/PLIST b/unit-php/PLIST
deleted file mode 100644
index 8fc7a323d9..0000000000
--- a/unit-php/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD$
-libexec/unit/modules/${MODNAME}.unit.${SHLIB_SUFFIX}
diff --git a/unit-php/distinfo b/unit-php/distinfo
deleted file mode 100644
index 2819071556..0000000000
--- a/unit-php/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-SHA1 (unit-1.20.0.tar.gz) = f4a2d2a6b622742acd138a66008407b5f674b08f
-RMD160 (unit-1.20.0.tar.gz) = 8964e056dbe19e659b157a89d1cf39f213ffd952
-SHA512 (unit-1.20.0.tar.gz) = dd68103795acbdcd87a951c92c72f3cb74b5e622eca4e687194508b55a592ac4312de3a8ff7ddb9a5df9750363b24dca9e1b48c7ef42c78aca3a18aca6a51f42
-Size (unit-1.20.0.tar.gz) = 787607 bytes
-SHA1 (patch-auto-modules-php) = 4386e6adaf806d83af88de8da9ad0a9a83eeac8f
diff --git a/unit-php/patches/patch-auto-modules-php b/unit-php/patches/patch-auto-modules-php
deleted file mode 100644
index 902832760d..0000000000
--- a/unit-php/patches/patch-auto-modules-php
+++ /dev/null
@@ -1,11 +0,0 @@
---- auto/modules/php.orig	2020-10-09 11:15:55.011861773 -0400
-+++ auto/modules/php	2020-10-09 11:16:18.986144628 -0400
-@@ -112,7 +112,7 @@
-             # "php-config --ldflags" does not contain path to libphp, but
-             # contains usually path to libraries required by extensions.
-             NXT_PHP_LDFLAGS="-L${NXT_PHP_LIB_PATH} \
--                             -Wl,-rpath ${NXT_PHP_LIB_PATH}"
-+                             -Wl,-rpath,${NXT_PHP_LIB_PATH}"
-         fi
-     fi
- 
diff --git a/unit/Makefile b/unit/Makefile
index d192c14dc2..ac9011a4b7 100644
--- a/unit/Makefile
+++ b/unit/Makefile
@@ -1,6 +1,8 @@
 # $NetBSD$
 
-DISTNAME=	unit-1.20.0
+.include "../../www/unit/unitversion.mk"
+
+DISTNAME=	unit-${UNIT_VERSION}
 
 MAINTAINER=	osa%FreeBSD.org@localhost
 
diff --git a/unit/common.mk b/unit/common.mk
new file mode 100644
index 0000000000..245ca8558f
--- /dev/null
+++ b/unit/common.mk
@@ -0,0 +1,10 @@
+# $NetBSD$
+
+.if !defined(UNITCOMMON_MK)
+UNITCOMMON_MK=	defined
+
+DISTNAME?=	unit-${UNIT_VERSION}
+
+.endif
+
+.include "../../www/unit/unitversion.mk"
diff --git a/unit/distinfo b/unit/distinfo
index 117e12e65c..2819071556 100644
--- a/unit/distinfo
+++ b/unit/distinfo
@@ -4,3 +4,4 @@ SHA1 (unit-1.20.0.tar.gz) = f4a2d2a6b622742acd138a66008407b5f674b08f
 RMD160 (unit-1.20.0.tar.gz) = 8964e056dbe19e659b157a89d1cf39f213ffd952
 SHA512 (unit-1.20.0.tar.gz) = dd68103795acbdcd87a951c92c72f3cb74b5e622eca4e687194508b55a592ac4312de3a8ff7ddb9a5df9750363b24dca9e1b48c7ef42c78aca3a18aca6a51f42
 Size (unit-1.20.0.tar.gz) = 787607 bytes
+SHA1 (patch-auto-modules-php) = 4386e6adaf806d83af88de8da9ad0a9a83eeac8f
diff --git a/unit/ext.mk b/unit/ext.mk
index bbd4dec7dc..ec257ce876 100644
--- a/unit/ext.mk
+++ b/unit/ext.mk
@@ -11,10 +11,18 @@
 .if !defined(UNITEXT_MK)
 UNITEXT_MK=	defined
 
-PLIST_SUBST+=	MODNAME=${MODNAME}
-PLIST_SUBST+=	PKGMODNAME=${PKGMODNAME}
+.include "../../www/unit/unitversion.mk"
+
+DISTINFO_FILE=	${.CURDIR}/../../www/unit/distinfo
+PATCHDIR=	${.CURDIR}/../../www/unit/patches
+
+PKGMODNAME?=	${MODNAME}.unit
+
+PLIST_SUBST+=	PKGMODNAME=${MODNAME}.unit
 PLIST_SUBST+=	SHLIB_SUFFIX=${SHLIB_SUFFIX}
-PLIST_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+PLIST_SUBST+=	UNIT_EXTENSION_DIR=${UNIT_EXTENSION_DIR}
+
+PLIST_SRC+=	${.CURDIR}/../../www/unit/PLIST.module
 
 .if ${OBJECT_FMT} == "SOM"
 SHLIB_SUFFIX=		sl
@@ -30,8 +38,10 @@ do-module-build:
 do-install: do-module-install
 
 do-module-install:
-	${MKDIR} ${DESTDIR}${PREFIX}/libexec/unit/modules/
-	${INSTALL_LIB} ${WRKSRC}/build/${MODNAME}.unit.${SHLIB_SUFFIX} \
-		${DESTDIR}${PREFIX}/libexec/unit/modules/
+	${MKDIR} ${DESTDIR}${PREFIX}/${UNIT_EXTENSION_DIR}
+	${INSTALL_LIB} ${WRKSRC}/build/${PKGMODNAME}.${SHLIB_SUFFIX} \
+		${DESTDIR}${PREFIX}/${UNIT_EXTENSION_DIR}
+
+.endif  # UNITEXT_MK
 
-.endif  # PHPEXT_MK
+.include "${.CURDIR}/../../www/unit/common.mk"
diff --git a/unit/patches/patch-auto-modules-php b/unit/patches/patch-auto-modules-php
new file mode 100644
index 0000000000..902832760d
--- /dev/null
+++ b/unit/patches/patch-auto-modules-php
@@ -0,0 +1,11 @@
+--- auto/modules/php.orig	2020-10-09 11:15:55.011861773 -0400
++++ auto/modules/php	2020-10-09 11:16:18.986144628 -0400
+@@ -112,7 +112,7 @@
+             # "php-config --ldflags" does not contain path to libphp, but
+             # contains usually path to libraries required by extensions.
+             NXT_PHP_LDFLAGS="-L${NXT_PHP_LIB_PATH} \
+-                             -Wl,-rpath ${NXT_PHP_LIB_PATH}"
++                             -Wl,-rpath,${NXT_PHP_LIB_PATH}"
+         fi
+     fi
+ 
diff --git a/unit/unitversion.mk b/unit/unitversion.mk
new file mode 100644
index 0000000000..34fae3846d
--- /dev/null
+++ b/unit/unitversion.mk
@@ -0,0 +1,18 @@
+# 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.20.0
+
+# Define NGINX Unit's modules directory
+UNIT_EXTENSION_DIR=	libexec/unit/modules
+
+.endif	# UNITVERSION_MK
Prev by Date: opendoas: Fix packaging on Linux.
Next by Date: Add www/unit-perl - NGINX Unit's Perl module.
Previous by Thread: opendoas: Fix packaging on Linux.
Next by Thread: Add www/unit-perl - NGINX Unit's Perl module.
Indexes:
Home | Main Index | Thread Index | Old Index