Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Jul 2011 16:38:57 +0800 (CST)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        x11@FreeBSD.org
Subject:   [PATCH] x11/xkeyboard-config: fix PLIST, make portlint happier
Message-ID:  <20110722083857.8633A55C5@sunpoet.net>

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

>Submitter-Id:	current-users
>Originator:	Sunpoet Po-Chuan Hsieh
>Organization:	The FreeBSD Project
>Confidential:	no 
>Synopsis:	[PATCH] x11/xkeyboard-config: fix PLIST, make portlint happier
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 8.2-STABLE amd64
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Jul  9 23:23:51 CST
>Description:
- Fix PLIST: share/X11 is also used by other ports
- Make portlint happier
- Bump PORTREVISION for PLIST change

Port maintainer (x11@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- xkeyboard-config-1.8_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/xkeyboard-config/Makefile,v
retrieving revision 1.18
diff -u -u -r1.18 Makefile
--- Makefile	31 May 2010 02:01:42 -0000	1.18
+++ Makefile	22 Jul 2011 08:39:03 -0000
@@ -7,10 +7,9 @@
 
 PORTNAME=	xkeyboard-config
 PORTVERSION=	1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xlibs.freedesktop.org/xkbdesc/
-DISTNAME=	xkeyboard-config-${PORTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
@@ -23,9 +22,9 @@
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
-			--with-xkb-rules-symlink=xorg
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		--with-xkb-rules-symlink=xorg
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls --with-included-gettext
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11/xkeyboard-config/pkg-plist,v
retrieving revision 1.12
diff -u -u -r1.12 pkg-plist
--- pkg-plist	1 May 2010 11:40:24 -0000	1.12
+++ pkg-plist	22 Jul 2011 08:39:03 -0000
@@ -379,5 +379,5 @@
 @dirrm share/X11/xkb/geometry
 @dirrm share/X11/xkb/compat
 @dirrm share/X11/xkb
-@dirrm share/X11
+@dirrmtry share/X11
 @dirrmtry var/lib/xkb
--- xkeyboard-config-1.8_2.patch ends here ---




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