sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/unit-*: use more canonical way to configure and build

Browse source 
NGINX Unit modules ports depend on www/unit and require to run
an additional configure command for a specific version of a
programming language.  This change make those commands more
consistent with configure and make parameters for the Unit
binary and its modules.

Bump PORTREVISIONs.
This commit is contained in:
Sergey A. Osokin 2021-12-15 23:04:49 -05:00
parent 98d080909b
commit ca201c660e
5 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
www/unit-java/Makefile
View file

@ -16,6 +16,7 @@ MASTER_SITES= https://unit.nginx.org/download/:unit \
https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/${JETTY_VERSION}/:server \ https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/${JETTY_VERSION}/:server \
https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/${JETTY_VERSION}/:jutil https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/${JETTY_VERSION}/:jutil
PKGNAMESUFFIX= -${UNIT_MODNAME} PKGNAMESUFFIX= -${UNIT_MODNAME}
PORTREVISION= 1
DISTFILES= unit-${UNIT_VERSION}.tar.gz:unit \ DISTFILES= unit-${UNIT_VERSION}.tar.gz:unit \
classgraph-${CLASSGRAPH_VERSION}.jar:classgraph \ classgraph-${CLASSGRAPH_VERSION}.jar:classgraph \
ecj-${ECJ_VERSION}.jar:ecj \ ecj-${ECJ_VERSION}.jar:ecj \
@ -82,15 +83,21 @@ post-extract:
post-configure: post-configure:
cd ${CONFIGURE_WRKSRC} && \ cd ${CONFIGURE_WRKSRC} && \
${CONFIGURE_CMD} java --module=${UNIT_MODNAME} \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} java \
--module=${UNIT_MODNAME} \
--local-repo=${DISTDIR} \ --local-repo=${DISTDIR} \
--jars=${JAVAJARDIR} --jars=${JAVAJARDIR}
do-build: do-build:
cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME} cd ${CONFIGURE_WRKSRC} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
do-install: do-install:
cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}-install DESTDIR=${STAGEDIR} cd ${CONFIGURE_WRKSRC} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} \
${UNIT_MODNAME}-install DESTDIR=${STAGEDIR}
# Overwrite the target in the ${MASTERDIR}/Makefile # Overwrite the target in the ${MASTERDIR}/Makefile
post-install: post-install:

8
www/unit-perl/Makefile
View file

@ -1,6 +1,7 @@
# Created by: Sergey Osokin <osa@FreeBSD.org> # Created by: Sergey Osokin <osa@FreeBSD.org>
PKGNAMESUFFIX= -${UNIT_MODNAME} PKGNAMESUFFIX= -${UNIT_MODNAME}
PORTREVISION= 1
UNIT_MODNAME= perl${PERL_VER} UNIT_MODNAME= perl${PERL_VER}
@ -18,10 +19,13 @@ MASTERDIR= ${.CURDIR}/../unit
post-configure: post-configure:
cd ${CONFIGURE_WRKSRC} && \ cd ${CONFIGURE_WRKSRC} && \
${CONFIGURE_CMD} perl --module=${UNIT_MODNAME} ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} perl \
--module=${UNIT_MODNAME}
do-build: do-build:
cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME} cd ${CONFIGURE_WRKSRC} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
do-install: do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/

10
www/unit-php/Makefile
View file

@ -1,6 +1,7 @@
# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org> # Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
PORTREVISION= 1
UNIT_MODNAME= php${PHP_VER} UNIT_MODNAME= php${PHP_VER}
@ -18,11 +19,14 @@ MASTERDIR= ${.CURDIR}/../unit
post-configure: post-configure:
cd ${CONFIGURE_WRKSRC} && \ cd ${CONFIGURE_WRKSRC} && \
${CONFIGURE_CMD} php --lib-path=${LOCALBASE}/lib \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} php \
--module=${UNIT_MODNAME} --lib-path=${LOCALBASE}/lib \
--module=${UNIT_MODNAME}
do-build: do-build:
cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME} cd ${CONFIGURE_WRKSRC} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
do-install: do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/

10
www/unit-python/Makefile
View file

@ -1,6 +1,7 @@
# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org> # Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
PKGNAMESUFFIX= -${UNIT_MODNAME} PKGNAMESUFFIX= -${UNIT_MODNAME}
PORTREVISION= 1
UNIT_MODNAME= python${PYTHON_SUFFIX} UNIT_MODNAME= python${PYTHON_SUFFIX}
@ -19,11 +20,14 @@ MASTERDIR= ${.CURDIR}/../unit
post-configure: post-configure:
cd ${CONFIGURE_WRKSRC} && \ cd ${CONFIGURE_WRKSRC} && \
${CONFIGURE_CMD} python --module=${UNIT_MODNAME} \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} python \
--config=${PYTHON_CMD}-config --module=${UNIT_MODNAME} \
--config=${PYTHON_CMD}-config
do-build: do-build:
cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME} cd ${CONFIGURE_WRKSRC} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
do-install: do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/

8
www/unit-ruby/Makefile
View file

@ -1,6 +1,7 @@
# Created by: Sergey Osokin <osa@FreeBSD.org> # Created by: Sergey Osokin <osa@FreeBSD.org>
PKGNAMESUFFIX= -${UNIT_MODNAME} PKGNAMESUFFIX= -${UNIT_MODNAME}
PORTREVISION= 1
UNIT_MODNAME= ruby${RUBY_VER} UNIT_MODNAME= ruby${RUBY_VER}
@ -19,10 +20,13 @@ MASTERDIR= ${.CURDIR}/../unit
post-configure: post-configure:
cd ${CONFIGURE_WRKSRC} && \ cd ${CONFIGURE_WRKSRC} && \
${CONFIGURE_CMD} ruby --module=${UNIT_MODNAME} ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ruby \
--module=${UNIT_MODNAME}
do-build: do-build:
cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME} cd ${CONFIGURE_WRKSRC} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
do-install: do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/