diff options
-rw-r--r-- | databases/poco-data-mysql/Makefile | 6 | ||||
-rw-r--r-- | databases/poco-data-mysql/buildlink3.mk | 6 | ||||
-rw-r--r-- | databases/poco-data-odbc/Makefile | 6 | ||||
-rw-r--r-- | databases/poco-data-odbc/buildlink3.mk | 6 | ||||
-rw-r--r-- | databases/poco-data-sqlite/Makefile | 6 | ||||
-rw-r--r-- | databases/poco-data-sqlite/buildlink3.mk | 6 | ||||
-rw-r--r-- | databases/poco-data/Makefile | 6 | ||||
-rw-r--r-- | databases/poco-data/buildlink3.mk | 6 | ||||
-rw-r--r-- | devel/poco/Makefile | 4 | ||||
-rw-r--r-- | devel/poco/Makefile.common | 16 | ||||
-rw-r--r-- | devel/poco/buildlink3.mk | 4 |
11 files changed, 36 insertions, 36 deletions
diff --git a/databases/poco-data-mysql/Makefile b/databases/poco-data-mysql/Makefile index d4efcabb75d..e2735703806 100644 --- a/databases/poco-data-mysql/Makefile +++ b/databases/poco-data-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/02/06 06:02:02 schnoebe Exp $ +# $NetBSD: Makefile,v 1.2 2011/02/06 06:08:07 schnoebe Exp $ # PKGNAME= poco-data-mysql-${POCO_VERSION} @@ -6,7 +6,7 @@ CATEGORIES= databases COMMENT= POCO C++ MySQL RDBMS Accessor libraries -.include "../../wip/poco/Makefile.common" +.include "../../devel/poco/Makefile.common" CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --omit=Data/SQLite,Data/ODBC,Zip,XML @@ -38,5 +38,5 @@ SUBST_SED.paths= -e 's,@MYSQLLIBDIR@,${BUILDLINK_DIR}/${BUILDLINK_LIBDIRS.mys SUBST_SED.paths+= -e 's,@MYSQLINCDIR@,${BUILDLINK_DIR}/${BUILDLINK_INCDIRS.mysql-client},g' .include "../../databases/mysql5-client/buildlink3.mk" -.include "../../wip/poco-data/buildlink3.mk" +.include "../../databases/poco-data/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/poco-data-mysql/buildlink3.mk b/databases/poco-data-mysql/buildlink3.mk index a3735ceb0e4..e5db378b716 100644 --- a/databases/poco-data-mysql/buildlink3.mk +++ b/databases/poco-data-mysql/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/02/06 06:02:02 schnoebe Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2011/02/06 06:08:07 schnoebe Exp $ BUILDLINK_TREE+= poco-data-mysql @@ -7,10 +7,10 @@ POCO_DATA_MYSQL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poco-data-mysql+= poco-data-mysql>=1.3.5 BUILDLINK_ABI_DEPENDS.poco-data-mysql?= poco-data-mysql>=1.3.5nb1 -BUILDLINK_PKGSRCDIR.poco-data-mysql?= ../../wip/poco-data-mysql +BUILDLINK_PKGSRCDIR.poco-data-mysql?= ../../databases/poco-data-mysql .include "../../databases/mysql5-client/buildlink3.mk" -.include "../../wip/poco-data/buildlink3.mk" +.include "../../databases/poco-data/buildlink3.mk" .endif # POCO_DATA_MYSQL_BUILDLINK3_MK BUILDLINK_TREE+= -poco-data-mysql diff --git a/databases/poco-data-odbc/Makefile b/databases/poco-data-odbc/Makefile index dc52b4fd006..253ab1a5749 100644 --- a/databases/poco-data-odbc/Makefile +++ b/databases/poco-data-odbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/02/06 06:02:52 schnoebe Exp $ +# $NetBSD: Makefile,v 1.2 2011/02/06 06:08:07 schnoebe Exp $ # PKGNAME= poco-data-odbc-${POCO_VERSION} @@ -6,7 +6,7 @@ CATEGORIES= databases COMMENT= POCO C++ ODBC RDBMS Accessor libraries -.include "../../wip/poco/Makefile.common" +.include "../../devel/poco/Makefile.common" CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --omit=Data/MySQL,Data/SQLite,Zip,XML @@ -39,5 +39,5 @@ SUBST_SED.paths+= -e 's,@ODBCINCDIR@,${BUILDLINK_DIR}/${BUILDLINK_INCDIRS.unix # should make which odbc we use an option.. but.. :D .include "../../databases/unixodbc/buildlink3.mk" -.include "../../wip/poco-data/buildlink3.mk" +.include "../../databases/poco-data/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/poco-data-odbc/buildlink3.mk b/databases/poco-data-odbc/buildlink3.mk index 38d39c6f0b9..f52a106f2a4 100644 --- a/databases/poco-data-odbc/buildlink3.mk +++ b/databases/poco-data-odbc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/02/06 06:02:52 schnoebe Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2011/02/06 06:08:07 schnoebe Exp $ BUILDLINK_TREE+= poco-data-odbc @@ -7,10 +7,10 @@ POCO_DATA_ODBC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poco-data-odbc+= poco-data-odbc>=1.3.5 BUILDLINK_ABI_DEPENDS.poco-data-odbc?= poco-data-odbc>=1.3.5nb1 -BUILDLINK_PKGSRCDIR.poco-data-odbc?= ../../wip/poco-data-odbc +BUILDLINK_PKGSRCDIR.poco-data-odbc?= ../../databases/poco-data-odbc .include "../../databases/unixodbc/buildlink3.mk" -.include "../../wip/poco-data/buildlink3.mk" +.include "../../databases/poco-data/buildlink3.mk" .endif # POCO_DATA_ODBC_BUILDLINK3_MK BUILDLINK_TREE+= -poco-data-odbc diff --git a/databases/poco-data-sqlite/Makefile b/databases/poco-data-sqlite/Makefile index d01bfa116cc..81953066eaf 100644 --- a/databases/poco-data-sqlite/Makefile +++ b/databases/poco-data-sqlite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/02/06 06:01:15 schnoebe Exp $ +# $NetBSD: Makefile,v 1.2 2011/02/06 06:08:07 schnoebe Exp $ # PKGNAME= poco-data-sqlite-${POCO_VERSION} @@ -6,7 +6,7 @@ CATEGORIES= databases COMMENT= POCO C++ SQLite RDBMS Accessor libraries -.include "../../wip/poco/Makefile.common" +.include "../../devel/poco/Makefile.common" CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --omit=Data/MySQL,Data/ODBC,Zip,XML @@ -31,5 +31,5 @@ do-install: ${PAX} -rw -v -pp include ${DESTDIR}${PREFIX} .include "../../databases/sqlite3/buildlink3.mk" -.include "../../wip/poco-data/buildlink3.mk" +.include "../../databases/poco-data/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/poco-data-sqlite/buildlink3.mk b/databases/poco-data-sqlite/buildlink3.mk index fd22fe229a8..c70032d97f8 100644 --- a/databases/poco-data-sqlite/buildlink3.mk +++ b/databases/poco-data-sqlite/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/02/06 06:01:15 schnoebe Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2011/02/06 06:08:07 schnoebe Exp $ BUILDLINK_TREE+= poco-data-sqlite @@ -7,10 +7,10 @@ POCO_DATA_SQLITE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poco-data-sqlite+= poco-data-sqlite>=1.3.5 BUILDLINK_ABI_DEPENDS.poco-data-sqlite?= poco-data-sqlite>=1.3.5nb1 -BUILDLINK_PKGSRCDIR.poco-data-sqlite?= ../../wip/poco-data-sqlite +BUILDLINK_PKGSRCDIR.poco-data-sqlite?= ../../databases/poco-data-sqlite .include "../../databases/sqlite3/buildlink3.mk" -.include "../../wip/poco-data/buildlink3.mk" +.include "../../databases/poco-data/buildlink3.mk" .endif # POCO_DATA_SQLITE_BUILDLINK3_MK BUILDLINK_TREE+= -poco-data-sqlite diff --git a/databases/poco-data/Makefile b/databases/poco-data/Makefile index a4771f8d5f1..6851e441000 100644 --- a/databases/poco-data/Makefile +++ b/databases/poco-data/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/02/06 06:00:08 schnoebe Exp $ +# $NetBSD: Makefile,v 1.2 2011/02/06 06:08:06 schnoebe Exp $ # PKGNAME= poco-data-${POCO_VERSION} @@ -6,7 +6,7 @@ CATEGORIES= databases COMMENT= POCO C++ RDBMS Master Accessor libraries -.include "../../wip/poco/Makefile.common" +.include "../../devel/poco/Makefile.common" CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --omit=Data/MySQL,Data/ODBC,Zip,XML @@ -30,5 +30,5 @@ do-install: cd ${WRKSRC}/Data && \ ${PAX} -rw -v -pp include ${DESTDIR}${PREFIX} -.include "../../wip/poco/buildlink3.mk" +.include "../../devel/poco/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/poco-data/buildlink3.mk b/databases/poco-data/buildlink3.mk index 86333f9153a..3c537f1b8b7 100644 --- a/databases/poco-data/buildlink3.mk +++ b/databases/poco-data/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/02/06 06:00:08 schnoebe Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2011/02/06 06:08:07 schnoebe Exp $ BUILDLINK_TREE+= poco-data @@ -7,9 +7,9 @@ POCO_DATA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poco-data+= poco-data>=1.3.5 BUILDLINK_ABI_DEPENDS.poco-data?= poco-data>=1.3.5nb1 -BUILDLINK_PKGSRCDIR.poco-data?= ../../wip/poco-data +BUILDLINK_PKGSRCDIR.poco-data?= ../../databases/poco-data -.include "../../wip/poco/buildlink3.mk" +.include "../../databases/poco/buildlink3.mk" .endif # POCO_DATA_BUILDLINK3_MK BUILDLINK_TREE+= -poco-data diff --git a/devel/poco/Makefile b/devel/poco/Makefile index 2bac79205f8..91131c0b275 100644 --- a/devel/poco/Makefile +++ b/devel/poco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/02/06 05:55:14 schnoebe Exp $ +# $NetBSD: Makefile,v 1.2 2011/02/06 06:08:07 schnoebe Exp $ # PKGNAME= poco-${POCO_VERSION} @@ -6,7 +6,7 @@ CATEGORIES= devel COMMENT= POCO C++ Foundation libraries -.include "../../wip/poco/Makefile.common" +.include "../../devel/poco/Makefile.common" CONFIGURE_ARGS+= --library-path=${BUILDLINK_PREFIX.expat}/lib CONFIGURE_ARGS+= --library-path=${BUILDLINK_PREFIX.pcre}/lib diff --git a/devel/poco/Makefile.common b/devel/poco/Makefile.common index 5cd4e9eb6c5..7309c86b576 100644 --- a/devel/poco/Makefile.common +++ b/devel/poco/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2011/02/06 05:55:14 schnoebe Exp $ +# $NetBSD: Makefile.common,v 1.2 2011/02/06 06:08:07 schnoebe Exp $ # -# used by wip/poco/Makefile -# used by wip/poco-data/Makefile -# used by wip/poco-data-sqlite/Makefile -# used by wip/poco-data-mysql/Makefile -# used by wip/poco-data-odbc/Makefile +# used by devel/poco/Makefile +# used by databases/poco-data/Makefile +# used by databases/poco-data-sqlite/Makefile +# used by databases/poco-data-mysql/Makefile +# used by databases/poco-data-odbc/Makefile POCO_VERSION=1.4.0 @@ -17,8 +17,8 @@ HOMEPAGE= http://www.pocoproject.org/ PKG_DESTDIR_SUPPORT= user-destdir LICENSE= boost -PATCHDIR= ${.CURDIR}/../../wip/poco/patches -DISTINFO_FILE= ${.CURDIR}/../../wip/poco/distinfo +PATCHDIR= ${.CURDIR}/../../devel/poco/patches +DISTINFO_FILE= ${.CURDIR}/../../devel/poco/distinfo HAS_CONFIGURE= yes USE_LANGUAGES= c c++ diff --git a/devel/poco/buildlink3.mk b/devel/poco/buildlink3.mk index 6410d76c6c3..ea6668e8ce3 100644 --- a/devel/poco/buildlink3.mk +++ b/devel/poco/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2011/02/06 06:08:07 schnoebe Exp $ BUILDLINK_TREE+= poco @@ -7,7 +7,7 @@ POCO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poco+= poco>=1.3.5 BUILDLINK_ABI_DEPENDS.poco?= poco>=1.3.5nb1 -BUILDLINK_PKGSRCDIR.poco?= ../../wip/poco +BUILDLINK_PKGSRCDIR.poco?= ../../devel/poco .include "../../security/openssl/buildlink3.mk" .endif # POCO_BUILDLINK3_MK |