pkgsrc-WIP-changes archive

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

www/unit-php: remove needless logic (it's been moved to the main port), update the package list.



Module Name:	pkgsrc-wip
Committed By:	Sergey A. Osokin <osa%FreeBSD.org@localhost>
Pushed By:	osa
Date:		Sun Nov 15 22:14:05 2020 -0500
Changeset:	954d3f71350d4d6da149d20f1c414ec7803c246e

Modified Files:
	unit-php/Makefile
	unit-php/PLIST

Log Message:
www/unit-php: remove needless logic (it's been moved to
the main port), update the package list.

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

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

diffstat:
 unit-php/Makefile | 16 +++-------------
 unit-php/PLIST    |  2 +-
 2 files changed, 4 insertions(+), 14 deletions(-)

diffs:
diff --git a/unit-php/Makefile b/unit-php/Makefile
index f722777a2f..1967f421f1 100644
--- a/unit-php/Makefile
+++ b/unit-php/Makefile
@@ -4,7 +4,7 @@ PKGNAME=	unit-php${PHP_VERSION:R:S|.||g}-1.20.0
 DISTNAME=	unit-1.20.0
 COMMENT=	PHP module for NGINX Unit
 
-UNIT_MODNAME=	php${PHP_VERSION}
+MODNAME=	php${PHP_VERSION}
 
 MAINTAINER=	osa%FreeBSD.org@localhost
 
@@ -12,8 +12,6 @@ PHP_VERSIONS_ACCEPTED?=	56 72 73 74
 
 USE_LANGUAGES+=	c
 
-PLIST_SUBST+=	UNIT_MODNAME=${UNIT_MODNAME}
-
 .include "../../lang/php/phpversion.mk"
 
 #.if empty(PKG_BUILD_OPTIONS.${PHP_PKG_PREFIX}:Mphp-embed)
@@ -23,16 +21,8 @@ PLIST_SUBST+=	UNIT_MODNAME=${UNIT_MODNAME}
 post-configure:
 	cd ${WRKSRC} && \
 	./configure php --lib-path=${PREFIX}/lib \
-		--module=${UNIT_MODNAME}
-
-do-build:
-	cd ${WRKSRC} && ${MAKE} ${UNIT_MODNAME}
-
-do-install:
-	${MKDIR} ${DESTDIR}${PREFIX}/libexec/unit/modules/
-	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
-		${DESTDIR}${PREFIX}/libexec/unit/modules/
+		--module=${MODNAME}
 
 .include "${PHPPKGSRCDIR}/buildlink3.mk"
-#.include "../../lang/php/ext.mk"
+.include "../../www/unit/ext.mk"
 .include "../../www/unit/Makefile.common"
diff --git a/unit-php/PLIST b/unit-php/PLIST
index ad09103f78..8fc7a323d9 100644
--- a/unit-php/PLIST
+++ b/unit-php/PLIST
@@ -1,2 +1,2 @@
 @comment $NetBSD$
-libexec/unit/modules/${UNIT_MODNAME}.unit.so
+libexec/unit/modules/${MODNAME}.unit.${SHLIB_SUFFIX}


Home | Main Index | Thread Index | Old Index