Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Jun 2009 13:03:07 +0400 (MSD)
From:      Boris Samorodov <bsam@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/135203: [patch] graphics/linux-sdl_image: fix packaging with NOPORTDOCS=yes
Message-ID:  <200906030903.n53937ak015659@bb.ipt.ru>
Resent-Message-ID: <200906030910.n539A1Lq018152@freefall.freebsd.org>

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

>Number:         135203
>Category:       ports
>Synopsis:       [patch] graphics/linux-sdl_image: fix packaging with NOPORTDOCS=yes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 03 09:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Boris Samorodov
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
InPharmTech, Co.
>Environment:
System: FreeBSD bb.ipt.ru 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Tue Jun 2 13:20:15 MSD 2009 root@bb.ipt.ru:/usr/obj/usr/src/sys/BB i386

>Description:
	As reported by QAT this port don't do the right thing when building
	with NOPORTDOCS=yes, etc.:
	http://qat.tecnik93.com/logs/7-STABLE-FPT-NPD/linux-sdl_image-1.2.5_2.log
>How-To-Repeat:
>Fix:
	. fix build with NOPORTDOCS=yes and friends;
	. as a side effect remove a six lines pkg-plist;
	. bump PORTREVISION.
	Reported by:	QAT

--- linux-sdl_image.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/linux-sdl_image/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile	2 Jun 2009 21:15:36 -0000	1.13
+++ Makefile	3 Jun 2009 08:56:19 -0000
@@ -8,10 +8,10 @@
 
 PORTNAME=	sdl_image
 PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics linux
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
-DISTNAME=	SDL_image-${PORTVERSION}-1
+DISTNAME=	${LINUX_NAME}-${PORTVERSION}-1
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A simple library to load images as SDL interfaces (linux version)
@@ -25,5 +25,10 @@
 DIST_SUBDIR=	rpm
 PLIST_SUB+=	SDLIMVER=${PORTVERSION}
 MD5_FILE=	${PKGDIR}/distinfo
+LINUX_NAME=	SDL_image
+
+PLIST_FILES=	usr/lib/libSDL_image-1.2.so.0 usr/lib/libSDL_image-1.2.so.0.1.4
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
+PORTDOCS=	CHANGES COPYING README
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist	3 Aug 2006 23:24:08 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-%%PORTDOCS%%usr/share/doc/SDL_image-%%SDLIMVER%%/CHANGES
-%%PORTDOCS%%usr/share/doc/SDL_image-%%SDLIMVER%%/COPYING
-%%PORTDOCS%%usr/share/doc/SDL_image-%%SDLIMVER%%/README
-usr/lib/libSDL_image-1.2.so.0
-usr/lib/libSDL_image-1.2.so.0.1.4
-@dirrm usr/share/doc/SDL_image-%%SDLIMVER%%
--- linux-sdl_image.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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