[Midnightbsd-cvs] mports: x11/libxklavier: update to 3.5

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri May 30 22:27:14 EDT 2008


Log Message:
-----------
update to 3.5

Modified Files:
--------------
    mports/x11/libxklavier:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)

Removed Files:
-------------
    mports/x11/libxklavier/files:
        patch-configure

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11/libxklavier/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/libxklavier/pkg-plist -L x11/libxklavier/pkg-plist -u -r1.1 -r1.2
--- x11/libxklavier/pkg-plist
+++ x11/libxklavier/pkg-plist
@@ -1,13 +1,13 @@
-include/libxklavier/xklavier.h
 include/libxklavier/xkl_config_item.h
 include/libxklavier/xkl_config_rec.h
 include/libxklavier/xkl_config_registry.h
 include/libxklavier/xkl_engine.h
 include/libxklavier/xkl_engine_marshal.h
+include/libxklavier/xklavier.h
 lib/libxklavier.a
 lib/libxklavier.la
 lib/libxklavier.so
-lib/libxklavier.so.11
+lib/libxklavier.so.12
 libdata/pkgconfig/libxklavier.pc
 %%DOCSDIR%%/ch01.html
 %%DOCSDIR%%/ch02.html
@@ -25,7 +25,5 @@
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-%%DATADIR%%/xfree86.xml
- at dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 @dirrm include/libxklavier
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/libxklavier/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/libxklavier/Makefile -L x11/libxklavier/Makefile -u -r1.1 -r1.2
--- x11/libxklavier/Makefile
+++ x11/libxklavier/Makefile
@@ -8,34 +8,39 @@
 #
 
 PORTNAME=	libxklavier
-PORTVERSION=	3.2
-PORTREVISION=	2
+PORTVERSION=	3.5
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	gswitchit
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	An utility library to make XKB stuff easier
+LICENSE=	lgpl
 
 RUN_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
 
-USE_XLIB=	yes
+USE_XORG=	x11 xkbfile
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gnomehack libxml2 glib20
 USE_LDCONFIG=	yes
-USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--disable-doxygen \
-		--with-xkb-base=${X11BASE}/share/X11/xkb \
-		--with-xkb-bin-base=${X11BASE}/bin \
-		--with-xmodmap-base=${LOCALBASE}/share/gnome/xmodmap \
+		--with-xkb-base=${LOCALBASE}/share/X11/xkb \
+		--with-xkb-bin-base=${LOCALBASE}/bin \
+		--with-xmodmap-base=${LOCALBASE}/share/xmodmap \
 		--disable-gtk-doc \
 		--with-html-dir=${GNOME_HTML_DIR}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|== "yes|= "yes|g' \
+		${WRKSRC}/configure
+
+
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11/libxklavier/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/libxklavier/distinfo -L x11/libxklavier/distinfo -u -r1.1 -r1.2
--- x11/libxklavier/distinfo
+++ x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxklavier-3.2.tar.gz) = 8f89a65b2d0aa8f8f5979c7d9de3d051
-SHA256 (libxklavier-3.2.tar.gz) = a82f36b5a7a766e66b46866b81c9a20a23c9de33cc0ee6e2480b560d1e50d942
-SIZE (libxklavier-3.2.tar.gz) = 466656
+MD5 (libxklavier-3.5.tar.gz) = d0625fdd7e22dbe382af40872fbbe77b
+SHA256 (libxklavier-3.5.tar.gz) = adac155e4d6be6b5bf6283eb265048e20c37c1caa49f39845532914151172706
+SIZE (libxklavier-3.5.tar.gz) = 448663
--- x11/libxklavier/files/patch-configure
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.orig	Sat Nov  4 15:13:39 2006
-+++ configure	Sat Nov  4 15:14:10 2006
-@@ -23045,9 +23045,9 @@ fi
- 
- { echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5
- echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6; }
--if test \( "$enable_xkb_support" == "yes" -a \
--          "$libxkbfile_present" == "yes" \) -o \
--        "$enable_xmodmap_support" == "yes" ; then
-+if test \( "$enable_xkb_support" = "yes" -a \
-+          "$libxkbfile_present" = "yes" \) -o \
-+        "$enable_xmodmap_support" = "yes" ; then
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
-@@ -24885,8 +24885,8 @@ fi
- 
- echo '**********************************************************'
- echo '  Libxklavier is configured with the following backends:'
--if test "$enable_xkb_support" == "yes" ; then
--  if test "$libxkbfile_present" == "yes" ; then
-+if test "$enable_xkb_support" = "yes" ; then
-+  if test "$libxkbfile_present" = "yes" ; then
-     echo "    XKB, libxkbfile is present"
-     echo "         default ruleset: $xkb_default_ruleset"
-     echo "         base: $xkb_base"
-@@ -24894,7 +24894,7 @@ if test "$enable_xkb_support" == "yes" ;
-     echo "    XKB, libxkbfile is NOT present"
-   fi
- fi
--if test "$enable_xmodmap_support" == "yes" ; then
-+if test "$enable_xmodmap_support" = "yes" ; then
-   echo "    xmodmap, default ruleset: $xmodmap_default_ruleset"
-   echo "             base: $xmodmap_base"
- fi


More information about the Midnightbsd-cvs mailing list