pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
unit*: Point to wip
Module Name: pkgsrc-wip
Committed By: Greg Troxel <gdt%lexort.com@localhost>
Pushed By: gdt
Date: Wed Dec 16 15:16:19 2020 -0500
Changeset: b987fa84b1e96fde3414ea2c118d7dd570e32e8a
Modified Files:
libunit/Makefile
unit-perl/Makefile
unit-php/Makefile
unit-python/Makefile
unit-ruby/Makefile
unit/Makefile
unit/Makefile.common
unit/common.mk
unit/ext.mk
Log Message:
unit*: Point to wip
Refer to other packages in wip, where they are, rather than the
lcoations they will eventually be in.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b987fa84b1e96fde3414ea2c118d7dd570e32e8a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
libunit/Makefile | 4 ++--
unit-perl/Makefile | 4 ++--
unit-php/Makefile | 4 ++--
unit-python/Makefile | 4 ++--
unit-ruby/Makefile | 4 ++--
unit/Makefile | 4 ++--
unit/Makefile.common | 14 +++++++-------
unit/common.mk | 2 +-
unit/ext.mk | 18 +++++++++---------
9 files changed, 29 insertions(+), 29 deletions(-)
diffs:
diff --git a/libunit/Makefile b/libunit/Makefile
index 3b849c087f..e13275d12c 100644
--- a/libunit/Makefile
+++ b/libunit/Makefile
@@ -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"
diff --git a/unit-perl/Makefile b/unit-perl/Makefile
index 6d28da1262..be4bb5f823 100644
--- a/unit-perl/Makefile
+++ b/unit-perl/Makefile
@@ -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"
diff --git a/unit-php/Makefile b/unit-php/Makefile
index cecdca9bcd..5cbff5e2cc 100644
--- a/unit-php/Makefile
+++ b/unit-php/Makefile
@@ -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"
diff --git a/unit-python/Makefile b/unit-python/Makefile
index ba3a02dd4f..718eda2a86 100644
--- a/unit-python/Makefile
+++ b/unit-python/Makefile
@@ -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"
diff --git a/unit-ruby/Makefile b/unit-ruby/Makefile
index 4043bc3bb4..598d633877 100644
--- a/unit-ruby/Makefile
+++ b/unit-ruby/Makefile
@@ -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"
diff --git a/unit/Makefile b/unit/Makefile
index 2220f8b5e0..0a111b8d27 100644
--- a/unit/Makefile
+++ b/unit/Makefile
@@ -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@localhost
RCD_SCRIPTS= unit
-.include "../../www/unit/Makefile.common"
+.include "../../wip/unit/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/unit/Makefile.common b/unit/Makefile.common
index 4b5fca6805..460d171257 100644
--- a/unit/Makefile.common
+++ b/unit/Makefile.common
@@ -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}
diff --git a/unit/common.mk b/unit/common.mk
index 6ac77b3ead..1a85188d0b 100644
--- a/unit/common.mk
+++ b/unit/common.mk
@@ -7,4 +7,4 @@ DISTNAME?= unit-${UNIT_VERSION}
.endif
-.include "../../www/unit/version.mk"
+.include "../../wip/unit/version.mk"
diff --git a/unit/ext.mk b/unit/ext.mk
index 94cdbab637..eb44a9f77a 100644
--- a/unit/ext.mk
+++ b/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"
Home |
Main Index |
Thread Index |
Old Index