unit*: Point to wip
Refer to other packages in wip, where they are, rather than the lcoations they will eventually be in.
This commit is contained in:
parent
dbcb554879
commit
b987fa84b1
|
@ -18,7 +18,7 @@ do-build:
|
|||
do-install:
|
||||
${MAKE} -C ${WRKSRC} libunit-install DESTDIR=${DESTDIR}
|
||||
|
||||
.include "../../www/unit/version.mk"
|
||||
.include "../../www/unit/Makefile.common"
|
||||
.include "../../wip/unit/version.mk"
|
||||
.include "../../wip/unit/Makefile.common"
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -15,6 +15,6 @@ post-configure:
|
|||
./configure ${LANG} --module=${MODNAME}
|
||||
|
||||
.include "../../lang/perl5/buildlink3.mk"
|
||||
.include "../../www/unit/ext.mk"
|
||||
.include "../../www/unit/Makefile.common"
|
||||
.include "../../wip/unit/ext.mk"
|
||||
.include "../../wip/unit/Makefile.common"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -22,6 +22,6 @@ post-configure:
|
|||
--module=${MODNAME}
|
||||
|
||||
.include "${PHPPKGSRCDIR}/buildlink3.mk"
|
||||
.include "../../www/unit/ext.mk"
|
||||
.include "../../www/unit/Makefile.common"
|
||||
.include "../../wip/unit/ext.mk"
|
||||
.include "../../wip/unit/Makefile.common"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -14,6 +14,6 @@ post-configure:
|
|||
--config=${LANG}${PYVERSSUFFIX}-config
|
||||
|
||||
.include "../../lang/${LANG}/application.mk"
|
||||
.include "../../www/unit/ext.mk"
|
||||
.include "../../www/unit/Makefile.common"
|
||||
.include "../../wip/unit/ext.mk"
|
||||
.include "../../wip/unit/Makefile.common"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -13,6 +13,6 @@ post-configure:
|
|||
./configure ${LANG} --module=${MODNAME}
|
||||
|
||||
.include "../../lang/${LANG}/buildlink3.mk"
|
||||
.include "../../www/unit/ext.mk"
|
||||
.include "../../www/unit/Makefile.common"
|
||||
.include "../../wip/unit/ext.mk"
|
||||
.include "../../wip/unit/Makefile.common"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD$
|
||||
|
||||
.include "../../www/unit/version.mk"
|
||||
.include "../../wip/unit/version.mk"
|
||||
|
||||
DISTNAME= unit-${UNIT_VERSION}
|
||||
|
||||
|
@ -8,5 +8,5 @@ MAINTAINER= osa@FreeBSD.org
|
|||
|
||||
RCD_SCRIPTS= unit
|
||||
|
||||
.include "../../www/unit/Makefile.common"
|
||||
.include "../../wip/unit/Makefile.common"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
# $NetBSD$
|
||||
#
|
||||
# used by devel/libunit/Makefile
|
||||
# used by www/unit/Makefile
|
||||
# used by www/unit-perl/Makefile
|
||||
# used by www/unit-php/Makefile
|
||||
# used by www/unit-python/Makefile
|
||||
# used by www/unit-ruby/Makefile
|
||||
# used by wip/libunit/Makefile
|
||||
# used by wip/unit/Makefile
|
||||
# used by wip/unit-perl/Makefile
|
||||
# used by wip/unit-php/Makefile
|
||||
# used by wip/unit-python/Makefile
|
||||
# used by wip/unit-ruby/Makefile
|
||||
|
||||
# Do *not* add any version-specific data here
|
||||
|
||||
|
@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --tmp=${UNIT_TMPDIR}
|
|||
CONFIGURE_ARGS+= --user=${UNIT_USER}
|
||||
CONFIGURE_ARGS+= --group=${UNIT_GROUP}
|
||||
|
||||
.include "../../www/unit/options.mk"
|
||||
.include "../../wip/unit/options.mk"
|
||||
|
||||
INSTALLATION_DIRS+= sbin ${UNIT_EXTENSION_DIR}
|
||||
MAKE_DIRS+= ${UNIT_PIDDIR} ${UNIT_DATADIR} ${UNIT_RUNDIR}
|
||||
|
|
|
@ -7,4 +7,4 @@ DISTNAME?= unit-${UNIT_VERSION}
|
|||
|
||||
.endif
|
||||
|
||||
.include "../../www/unit/version.mk"
|
||||
.include "../../wip/unit/version.mk"
|
||||
|
|
18
unit/ext.mk
18
unit/ext.mk
|
@ -6,18 +6,18 @@
|
|||
# add dependencies, and add the appropriate --with-configure-arg, then include
|
||||
# bsd.pkg.mk.
|
||||
#
|
||||
# used by www/unit-perl/Makefile
|
||||
# used by www/unit-php/Makefile
|
||||
# used by www/unit-python/Makefile
|
||||
# used by www/unit-ruby/Makefile
|
||||
# used by wip/unit-perl/Makefile
|
||||
# used by wip/unit-php/Makefile
|
||||
# used by wip/unit-python/Makefile
|
||||
# used by wip/unit-ruby/Makefile
|
||||
|
||||
.if !defined(UNITEXT_MK)
|
||||
UNITEXT_MK= defined
|
||||
|
||||
.include "../../www/unit/version.mk"
|
||||
.include "../../wip/unit/version.mk"
|
||||
|
||||
DISTINFO_FILE= ${.CURDIR}/../../www/unit/distinfo
|
||||
PATCHDIR= ${.CURDIR}/../../www/unit/patches
|
||||
DISTINFO_FILE= ${.CURDIR}/../../wip/unit/distinfo
|
||||
PATCHDIR= ${.CURDIR}/../../wip/unit/patches
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
|
@ -31,7 +31,7 @@ PLIST_SUBST+= PKGMODNAME=${MODNAME}.unit
|
|||
PLIST_SUBST+= SHLIB_SUFFIX=${SHLIB_SUFFIX}
|
||||
PLIST_SUBST+= UNIT_EXTENSION_DIR=${UNIT_EXTENSION_DIR}
|
||||
|
||||
PLIST_SRC+= ${.CURDIR}/../../www/unit/PLIST.module
|
||||
PLIST_SRC+= ${.CURDIR}/../../wip/unit/PLIST.module
|
||||
|
||||
INSTALLATION_DIRS+= ${UNIT_EXTENSION_DIR}
|
||||
|
||||
|
@ -50,4 +50,4 @@ do-install:
|
|||
|
||||
.endif # UNITEXT_MK
|
||||
|
||||
.include "${.CURDIR}/../../www/unit/common.mk"
|
||||
.include "${.CURDIR}/../../wip/unit/common.mk"
|
||||
|
|
Loading…
Reference in New Issue