Date: Sun, 13 Oct 2013 22:33:48 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330262 - in head/ports-mgmt: pkg pkg-devel pkg-devel/files pkg/files Message-ID: <201310132233.r9DMXmo3052478@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sun Oct 13 22:33:48 2013 New Revision: 330262 URL: http://svnweb.freebsd.org/changeset/ports/330262 Log: - Force pkg to not use base libbsdyml, which was available in head|stable/10 for some months. libbsdyml is being removed for 10-R. The bundled libyaml will be used instead. Discussed with: bapt With hat: portmgr Added: head/ports-mgmt/pkg-devel/files/patch-external__Makefile (contents, props changed) head/ports-mgmt/pkg-devel/files/patch-libpkg__Makefile (contents, props changed) head/ports-mgmt/pkg-devel/files/patch-pkg-static__Makefile (contents, props changed) head/ports-mgmt/pkg/files/patch-external__Makefile (contents, props changed) head/ports-mgmt/pkg/files/patch-libpkg__Makefile (contents, props changed) head/ports-mgmt/pkg/files/patch-pkg-static__Makefile (contents, props changed) Modified: head/ports-mgmt/pkg-devel/Makefile head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Sun Oct 13 22:18:04 2013 (r330261) +++ head/ports-mgmt/pkg-devel/Makefile Sun Oct 13 22:33:48 2013 (r330262) @@ -2,7 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.1.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Added: head/ports-mgmt/pkg-devel/files/patch-external__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg-devel/files/patch-external__Makefile Sun Oct 13 22:33:48 2013 (r330262) @@ -0,0 +1,11 @@ +--- ./external/Makefile.orig 2013-07-06 05:48:19.000000000 -0500 ++++ ./external/Makefile 2013-10-12 07:25:25.353758158 -0500 +@@ -1,8 +1,6 @@ + SUBDIR= sqlite + +-.if !exists(/usr/include/bsdyml.h) + SUBDIR+= libyaml +-.endif + + .if defined(WITH_BUNDLED_LIBELF) + SUBDIR+= libelf Added: head/ports-mgmt/pkg-devel/files/patch-libpkg__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg-devel/files/patch-libpkg__Makefile Sun Oct 13 22:33:48 2013 (r330262) @@ -0,0 +1,15 @@ +--- ./libpkg/Makefile.orig 2013-07-06 05:48:19.000000000 -0500 ++++ ./libpkg/Makefile 2013-10-12 07:25:25.353758158 -0500 +@@ -82,12 +82,8 @@ + -I${.CURDIR}/../external/sqlite \ + -I${.CURDIR}/../external/uthash + +-.if !exists(/usr/include/bsdyml.h) + CFLAGS+= -DBUNDLED_YAML -I ${.CURDIR}/../external/libyaml/include + LDADD+= -L${.OBJDIR}/../external/libyaml -lyaml +-.else +-LDADD+= -lbsdyml +-.endif + + .if defined(WITH_BUNDLED_LIBELF) + CFLAGS+= -I${.CURDIR}/../external/libelf \ Added: head/ports-mgmt/pkg-devel/files/patch-pkg-static__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg-devel/files/patch-pkg-static__Makefile Sun Oct 13 22:33:48 2013 (r330262) @@ -0,0 +1,15 @@ +--- ./pkg-static/Makefile.orig 2013-07-06 05:48:19.000000000 -0500 ++++ ./pkg-static/Makefile 2013-10-12 07:25:25.352756808 -0500 +@@ -6,12 +6,8 @@ + NOMAN= yes + LDADD_STATIC= -L${.OBJDIR}/../external/sqlite + +-.if !exists(/usr/include/bsdyml.h) + LDADD_STATIC+= -L${.OBJDIR}/../external/libyaml \ + -lyaml +-.else +-LDADD_STATIC+= -lbsdyml +-.endif + + .if defined(WITH_BUNDLED_LIBELF) + LDADD_STATIC+= -L${.OBJDIR}/../external/libelf Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Sun Oct 13 22:18:04 2013 (r330261) +++ head/ports-mgmt/pkg/Makefile Sun Oct 13 22:33:48 2013 (r330262) @@ -2,7 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.1.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Added: head/ports-mgmt/pkg/files/patch-external__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/patch-external__Makefile Sun Oct 13 22:33:48 2013 (r330262) @@ -0,0 +1,11 @@ +--- ./external/Makefile.orig 2013-07-06 05:48:19.000000000 -0500 ++++ ./external/Makefile 2013-10-12 07:25:25.353758158 -0500 +@@ -1,8 +1,6 @@ + SUBDIR= sqlite + +-.if !exists(/usr/include/bsdyml.h) + SUBDIR+= libyaml +-.endif + + .if defined(WITH_BUNDLED_LIBELF) + SUBDIR+= libelf Added: head/ports-mgmt/pkg/files/patch-libpkg__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/patch-libpkg__Makefile Sun Oct 13 22:33:48 2013 (r330262) @@ -0,0 +1,15 @@ +--- ./libpkg/Makefile.orig 2013-07-06 05:48:19.000000000 -0500 ++++ ./libpkg/Makefile 2013-10-12 07:25:25.353758158 -0500 +@@ -82,12 +82,8 @@ + -I${.CURDIR}/../external/sqlite \ + -I${.CURDIR}/../external/uthash + +-.if !exists(/usr/include/bsdyml.h) + CFLAGS+= -DBUNDLED_YAML -I ${.CURDIR}/../external/libyaml/include + LDADD+= -L${.OBJDIR}/../external/libyaml -lyaml +-.else +-LDADD+= -lbsdyml +-.endif + + .if defined(WITH_BUNDLED_LIBELF) + CFLAGS+= -I${.CURDIR}/../external/libelf \ Added: head/ports-mgmt/pkg/files/patch-pkg-static__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/patch-pkg-static__Makefile Sun Oct 13 22:33:48 2013 (r330262) @@ -0,0 +1,15 @@ +--- ./pkg-static/Makefile.orig 2013-07-06 05:48:19.000000000 -0500 ++++ ./pkg-static/Makefile 2013-10-12 07:25:25.352756808 -0500 +@@ -6,12 +6,8 @@ + NOMAN= yes + LDADD_STATIC= -L${.OBJDIR}/../external/sqlite + +-.if !exists(/usr/include/bsdyml.h) + LDADD_STATIC+= -L${.OBJDIR}/../external/libyaml \ + -lyaml +-.else +-LDADD_STATIC+= -lbsdyml +-.endif + + .if defined(WITH_BUNDLED_LIBELF) + LDADD_STATIC+= -L${.OBJDIR}/../external/libelf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310132233.r9DMXmo3052478>