diff --git a/Mk/defaults.mk b/Mk/defaults.mk index 0f6f3b1c3..815b7c406 100644 --- a/Mk/defaults.mk +++ b/Mk/defaults.mk @@ -26,18 +26,41 @@ LOCALBASE?= /usr/local PAGER?= less -OPENSSL?= ${LOCALBASE}/bin/openssl - -_FLAVOUR!= if [ -f ${OPENSSL} ]; then ${OPENSSL} version; fi -FLAVOUR?= ${_FLAVOUR:[1]} - PKG!= which pkg || echo true GIT!= which git || echo true -ARCH!= uname -p + +_PLUGIN_ARCH!= uname -p +PLUGIN_ARCH?= ${_PLUGIN_ARCH} + +OPENSSL?= ${LOCALBASE}/bin/openssl + +.if ! defined(PLUGIN_FLAVOUR) +.if exists(${OPENSSL}) +_PLUGIN_FLAVOUR!= ${OPENSSL} version +PLUGIN_FLAVOUR?= ${_PLUGIN_FLAVOUR:[1]} +.else +.warning "Detected 'Base' flavour is not currently supported" +PLUGIN_FLAVOUR?= Base +.endif +.endif + +PHPBIN= ${LOCALBASE}/bin/php + +.if exists(${PHPBIN}) +_PLUGIN_PHP!= ${PHPBIN} -v +PLUGIN_PHP?= ${_PLUGIN_PHP:[2]:S/./ /g:[1..2]:tW:S/ //} +.endif + +PYTHONLINK= ${LOCALBASE}/bin/python3 + +.if exists(${PYTHONLINK}) +_PLUGIN_PYTHON!=${PYTHONLINK} -V +PLUGIN_PYTHON?= ${_PLUGIN_PYTHON:[2]:S/./ /g:[1..2]:tW:S/ //} +.endif PLUGIN_ABI?= 20.1 -PLUGIN_ARCH?= ${ARCH} -PLUGIN_FLAVOUR?=${FLAVOUR} +PLUGIN_PHP?= 72 +PLUGIN_PYTHON?= 37 REPLACEMENTS= PLUGIN_ABI \ PLUGIN_ARCH \ diff --git a/Mk/plugins.mk b/Mk/plugins.mk index bb6942c55..6722b8727 100644 --- a/Mk/plugins.mk +++ b/Mk/plugins.mk @@ -27,10 +27,6 @@ all: check .include "defaults.mk" -PLUGIN_ARCH?= ${ARCH} -PLUGIN_PHP?= 72 -PLUGIN_PYTHON?= 37 - PLUGIN_DESC= pkg-descr PLUGIN_SCRIPTS= +PRE_INSTALL +POST_INSTALL \ +PRE_DEINSTALL +POST_DEINSTALL @@ -236,10 +232,10 @@ package: check @if ! ${PKG} info ${DEP} > /dev/null; then ${PKG} install -yA ${DEP}; fi .endfor @echo -n ">>> Generating metadata for ${PLUGIN_PKGNAME}-${PLUGIN_PKGVERSION}..." - @${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} metadata + @${MAKE} DESTDIR=${WRKSRC} metadata @echo " done" @echo -n ">>> Staging files for ${PLUGIN_PKGNAME}-${PLUGIN_PKGVERSION}..." - @${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} install + @${MAKE} DESTDIR=${WRKSRC} install @echo " done" @echo ">>> Packaging files for ${PLUGIN_PKGNAME}-${PLUGIN_PKGVERSION}:" @${PKG} create -v -m ${WRKSRC} -r ${WRKSRC} \