Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 May 2013 05:20:42 +0000
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        Greg Lehey <grog@FreeBSD.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r318137 - head/graphics/enblend
Message-ID:  <20130514052042.GA35624@FreeBSD.org>
In-Reply-To: <201305140111.r4E1Bu1F078073@svn.freebsd.org>
References:  <201305140111.r4E1Bu1F078073@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--4Ckj6UjgE2iN1+kY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Tue, May 14, 2013 at 01:11:56AM +0000, Greg Lehey wrote:
> New Revision: 318137
> URL: http://svnweb.freebsd.org/changeset/ports/318137
> 
> Log:
>   Ensure clean removal.
>   
> @@ -44,9 +44,9 @@ LDFLAGS+=	-L${LOCALBASE}/lib
>  
>  MAN1=		enblend.1 enfuse.1
>  PLIST_FILES=	bin/enblend bin/enfuse
> +PLIST_DIRS+=	%%DOCSDIR%%
>  
>  post-install:
> -		${MKDIR} ${DOCSDIR}
>  		${INSTALL_DATA} ${WRKSRC}/doc/*.info ${PREFIX}/${INFO_PATH}
>  
>  .include <bsd.port.mk>

I do not understand how can this "ensure clean removal".  It seems that the
port does not install any docs, so why did you add PLIST_DIRS?  Just to make
sure, this is what my tinderbox yields:

    ====================<phase 7: make package>====================
    ===>  Building package for enblend-4.1.1
    Deleting enblend-4.1.1
    pkg_delete: file '/usr/local/share/doc/enblend' doesn't exist
    pkg_delete: unable to completely remove directory
    '/usr/local/share/doc/enblend'
    pkg_delete: couldn't entirely delete package (perhaps the packing list
    is incorrectly specified?)

Consider the attached patch.  I've also fixed other Makefile deficiencies
for you (not all of them though).

./danfe

--4Ckj6UjgE2iN1+kY
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="enblend.diff"

Index: Makefile
===================================================================
--- Makefile	(revision 318137)
+++ Makefile	(working copy)
@@ -4,13 +4,11 @@
 PORTNAME=	enblend
 PORTVERSION=	4.1.1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-# Care: the directory is the minor release number
-MASTER_SITE_SUBDIR=	enblend/enblend-enfuse/enblend-enfuse-4.1
+MASTER_SITES=	SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION:R}
 DISTNAME=	enblend-enfuse-${PORTVERSION}
 
 MAINTAINER=	grog@FreeBSD.org
-COMMENT=	A tool for image blending with multiresolution splines
+COMMENT=	Tool for image blending with multiresolution splines
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo \
 		OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR
@@ -23,7 +21,6 @@
 		gsl:${PORTSDIR}/math/gsl
 RUN_DEPENDS=	OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR
 
-INFO=		enfuse enblend
 MAKE_JOBS_SAFE= yes
 USE_AUTOTOOLS=	automake:env autoconf:env
 USE_GMAKE=	yes
@@ -42,11 +39,11 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+INFO=		enfuse enblend
 MAN1=		enblend.1 enfuse.1
 PLIST_FILES=	bin/enblend bin/enfuse
-PLIST_DIRS+=	%%DOCSDIR%%
 
 post-install:
-		${INSTALL_DATA} ${WRKSRC}/doc/*.info ${PREFIX}/${INFO_PATH}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.info ${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.mk>

--4Ckj6UjgE2iN1+kY--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130514052042.GA35624>