From owner-svn-ports-head@FreeBSD.ORG Fri Apr 26 19:48:23 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4F1991E7 for ; Fri, 26 Apr 2013 19:48:23 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from mail-la0-x231.google.com (mail-la0-x231.google.com [IPv6:2a00:1450:4010:c03::231]) by mx1.freebsd.org (Postfix) with ESMTP id CBC641B0E for ; Fri, 26 Apr 2013 19:48:22 +0000 (UTC) Received: by mail-la0-f49.google.com with SMTP id fp13so1660424lab.36 for ; Fri, 26 Apr 2013 12:48:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :x-gm-message-state; bh=FO0DrdaME3kmdVdG3jlO3WfTkIY+tA0NKVsQs9T0Jw0=; b=RSNxYRe1xmH9RasrrwPJ6mvVQTNmT4qhm9Szahz1/B/nm1TSp0ZEfb7ok1X1q6M1iG Y9mPmNZvRKzBjwUxcEWKqPeupJHepXL/onRHYzcC7HKfuLdFZYerKjydygwqQmqxoHYy ppJXJ2UVE5fvodjNlQKaaEyDnxJG5w8LTQ7Kuo9QGTMMfbk6A9J7fgkSRRJTARTummzQ NBLYobSSOZbhSxT2ktmvb+6pUP0A8mTlV6jC6bfFU21RWqQDSket34znI2L2B+6J0I++ ugQC0obg5hzI23PfVACVUwwRT0IxkiAiYAb2m+TPk+XidAKG0VRziW+IFpSbm9p0pcqd j8bA== X-Received: by 10.112.73.103 with SMTP id k7mr22604284lbv.40.1367005701700; Fri, 26 Apr 2013 12:48:21 -0700 (PDT) MIME-Version: 1.0 Sender: sunpoet@sunpoet.net Received: by 10.112.129.194 with HTTP; Fri, 26 Apr 2013 12:48:01 -0700 (PDT) In-Reply-To: <201304222213.r3MMDFec026886@svn.freebsd.org> References: <201304222213.r3MMDFec026886@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sat, 27 Apr 2013 03:48:01 +0800 X-Google-Sender-Auth: naOYdq2g-KqA7ZwcjDpmaLSx-10 Message-ID: Subject: Re: svn commit: r316281 - head/Mk To: Baptiste Daroussin X-Gm-Message-State: ALoCoQn3Y1PZYagax2MEwcT91QeO+s0Rl0sGIAtyqmE1SKh+LaviMP9aCLcWobfP/IFctv8Jiq6s Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Apr 2013 19:48:23 -0000 On Tue, Apr 23, 2013 at 6:13 AM, Baptiste Daroussin wrote: > Author: bapt > Date: Mon Apr 22 22:13:14 2013 > New Revision: 316281 > URL: http://svnweb.freebsd.org/changeset/ports/316281 > > Log: > Remove old links while creating the new packages > Force creation of the symlink for pkgng to avoid failure if the link > already exists > > Submitted by: ohauer@ > > Modified: > head/Mk/bsd.pkgng.mk > > Modified: head/Mk/bsd.pkgng.mk > > ============================================================================== > --- head/Mk/bsd.pkgng.mk Mon Apr 22 22:06:34 2013 (r316280) > +++ head/Mk/bsd.pkgng.mk Mon Apr 22 22:13:14 2013 (r316281) > @@ -258,6 +258,9 @@ do-package: ${TMPPLIST} > fi; \ > fi; \ > fi; > + @for cat in ${CATEGORIES}; do \ > + ${RM} -fv > ${PACKAGES}/$$cat/${PKGNAMEPREFIX}${PORTNAME}*${PKG_SUFX} ; \ > + done > Please revert/modify this change! It has 2 problems. First, it would remove other *correct* links. % cd /usr/ports/x11/xorg % make package ... ===> Checking if x11/xorg already installed ===> Registering installation for xorg-7.5.2 Installing xorg-7.5.2... done ===> Building package for xorg-7.5.2 /usr/ports/packages/x11/xorg-7.5.2.txz /usr/ports/packages/x11/xorg-cf-files-1.0.4.txz /usr/ports/packages/x11/xorg-libraries-7.5.1.txz /usr/ports/packages/x11/xorg-macros-1.16.1.txz Creating package for xorg-7.5.2 Second, it's very strange to show some filenames/links without any user-friendly messages. Users may not know that they are outdated links removed by bsd.pkgng.mk. e.g. while updating mail/postfix from 2.9.5 to 2.10, I got: ===> Building package for postfix-2.10.0,1 /usr/ports/packages/mail/postfix-2.9.5,1.txz /usr/ports/packages/ipv6/postfix-2.9.5,1.txz Creating package for postfix-2.10.0,1 @if ${PKG_CREATE} -o ${PKGREPOSITORY} ${PKGNAME}; then \ > if [ "${PKGORIGIN}" = "ports-mgmt/pkg" ]; then \ > if [ ! -d ${PKGLATESTREPOSITORY} ]; then \ > @@ -266,7 +269,7 @@ do-package: ${TMPPLIST} > exit 1; \ > fi; \ > fi ; \ > - ${LN} -s > ../${PKGREPOSITORYSUBDIR}/${PKGNAME}${PKG_SUFX} ${PKGLATESTFILE} ; \ > + ${LN} -sf > ../${PKGREPOSITORYSUBDIR}/${PKGNAME}${PKG_SUFX} ${PKGLATESTFILE} ; \ > fi; \ > else \ > cd ${.CURDIR} && eval ${MAKE} delete-package; \ > -- Sunpoet Po-Chuan Hsieh 4096R/CC57E36B 8AD8 68F2 7D2B 0A10 7E9B 8CC0 DC44 247E CC57 E36B http://people.FreeBSD.org/~sunpoet/pgpkeys.txt