Date: Mon, 20 Aug 2001 18:16:02 +0900 From: "Akinori MUSHA" <knu@iDaemons.org> To: ports@FreeBSD.org, portmgr@FreeBSD.org, stable@FreeBSD.org Subject: RELENG_3 actually supports the "package origin" but there's no support Message-ID: <8666bj5bxp.wl@archon.local.idaemons.org>
next in thread | raw e-mail | index | archive | help
I've found that the package origin support was merged into RELENG_3 but OSVERSION and bsd.port.mk have not reflected it. pkg_create: http://www.FreeBSD.org/cgi/cvsweb.cgi/src/usr.sbin/pkg_install/create/main.c?rev=1.18.2.3&content-type=text/x-cvsweb-markup OSVERSION: http://www.FreeBSD.org/cgi/cvsweb.cgi/src/sys/sys/param.h?rev=1.38.2.14&content-type=text/x-cvsweb-markup Attached is a patch to bump OSVERSION (-> 350002) and tweak bsd.port.mk accordingly, which allows 3-STABLE users to use pkgdepfix and portupgrade to upgrade their packages. Unless we do this the MFC is merely useless... Could I commit this? By the way, in the meantime 3-STABLE users can have the following lines in their `/usr/Makefile.inc' as a workaround: .if defined(CATEGORIES) .for _CATEGORY in ${CATEGORIES} PKGCATEGORY?= ${_CATEGORY} .endfor _PORTDIRNAME!= ${BASENAME} ${.CURDIR} PORTDIRNAME?= ${_PORTDIRNAME} PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME} .endif P.S. Having your own /usr/Makefile.inc ($PORTSDIR/../Makefile.inc) is a handy and canonical way to make your local changes against bsd.port.mk. :) (Note, however, that the file is not for ports/ but src/ too) -- / /__ __ Akinori.org / MUSHA.org / ) ) ) ) / FreeBSD.org / Ruby-lang.org Akinori MUSHA aka / (_ / ( (__( @ iDaemons.org / and.or.jp "Freeze this moment a little bit longer, make each impression a little bit stronger.. Experience slips away -- Time stand still" Index: src/sys/sys/param.h =================================================================== RCS file: /home/ncvs/src/sys/sys/param.h,v retrieving revision 1.38.2.14 diff -u -r1.38.2.14 param.h --- src/sys/sys/param.h 12 Jul 2000 20:37:04 -0000 1.38.2.14 +++ src/sys/sys/param.h 20 Aug 2001 08:39:42 -0000 @@ -46,7 +46,7 @@ #define BSD4_3 1 #define BSD4_4 1 #undef __FreeBSD_version -#define __FreeBSD_version 350001 /* Master, propagated to newvers */ +#define __FreeBSD_version 350002 /* Master, propagated to newvers */ #ifndef NULL #define NULL 0 Index: ports/Mk/bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.376 diff -u -r1.376 bsd.port.mk --- ports/Mk/bsd.port.mk 3 Aug 2001 11:35:35 -0000 1.376 +++ ports/Mk/bsd.port.mk 20 Aug 2001 08:38:05 -0000 @@ -1060,7 +1060,7 @@ TMPPLIST?= ${WRKDIR}/.PLIST.mktmp -.if ${OSVERSION} >= 400000 +.if ${OSVERSION} >= 350002 .for _CATEGORY in ${CATEGORIES} PKGCATEGORY?= ${_CATEGORY} .endfor To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8666bj5bxp.wl>