diff options
author | marcus <marcus@FreeBSD.org> | 2003-06-03 06:03:02 +0800 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2003-06-03 06:03:02 +0800 |
commit | b13bc299744ab57ad3737b4628b30d2791156113 (patch) | |
tree | fe29ad4c7b3ee6713b1bd5dcca68255316583ed2 /x11/libxklavier | |
parent | 4ba46639841e3ad6b510f7fedb6ab2d50cd45eab (diff) | |
download | freebsd-ports-gnome-b13bc299744ab57ad3737b4628b30d2791156113.tar.gz freebsd-ports-gnome-b13bc299744ab57ad3737b4628b30d2791156113.tar.zst freebsd-ports-gnome-b13bc299744ab57ad3737b4628b30d2791156113.zip |
* Update to 0.71
* Sign over maintainership to gnome@
Approved by: sobomax
Diffstat (limited to 'x11/libxklavier')
-rw-r--r-- | x11/libxklavier/Makefile | 15 | ||||
-rw-r--r-- | x11/libxklavier/distinfo | 2 | ||||
-rw-r--r-- | x11/libxklavier/files/patch-configure | 27 | ||||
-rw-r--r-- | x11/libxklavier/files/patch-doc::html::Makefile.in | 14 | ||||
-rw-r--r-- | x11/libxklavier/files/patch-libxlavier_xklavier_config.c | 37 | ||||
-rw-r--r-- | x11/libxklavier/pkg-descr | 4 | ||||
-rw-r--r-- | x11/libxklavier/pkg-plist | 37 |
7 files changed, 53 insertions, 83 deletions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 0f910637057e..b32901b7f737 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -6,23 +6,22 @@ # PORTNAME= libxklavier -PORTVERSION= 0.2 +PORTVERSION= 0.71 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gswitchit -MAINTAINER= sobomax@FreeBSD.org +MAINTAINER= gnome@FreeBSD.org COMMENT= An utility library to make XKB stuff easier -LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 - USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes +USE_GNOME= gnometarget gnomehack libxml2 INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --with-xkb-base=${X11BASE}/lib/X11/xkb -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_ARGS= --disable-doxygen +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" .include <bsd.port.mk> diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo index 7ccbd4ff5ea2..b64ec8420cbf 100644 --- a/x11/libxklavier/distinfo +++ b/x11/libxklavier/distinfo @@ -1 +1 @@ -MD5 (libxklavier-0.2.tar.gz) = fb1167a02fd7a2eb4722e288a45d4e7e +MD5 (libxklavier-0.71.tar.gz) = 3196990a82160b8ac5f991a1309511fd diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure index fcfdb1a574e8..dc7e76b74ed3 100644 --- a/x11/libxklavier/files/patch-configure +++ b/x11/libxklavier/files/patch-configure @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- configure.orig Wed May 29 22:09:41 2002 -+++ configure Fri May 31 13:28:42 2002 -@@ -5464,6 +5464,7 @@ +--- configure.orig Fri Nov 1 06:34:11 2002 ++++ configure Sat Nov 9 02:15:02 2002 +@@ -7964,6 +7964,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -11,21 +8,3 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -5577,7 +5578,7 @@ - - #include <stdlib.h> - #include <stdio.h> --#include <xmlversion.h> -+#include <libxml/xmlversion.h> - - int - main() -@@ -5688,7 +5689,7 @@ - #line 5689 "configure" - #include "confdefs.h" - --#include <xmlversion.h> -+#include <libxml/xmlversion.h> - #include <stdio.h> - - int main() { diff --git a/x11/libxklavier/files/patch-doc::html::Makefile.in b/x11/libxklavier/files/patch-doc::html::Makefile.in deleted file mode 100644 index 8f4b19e8b373..000000000000 --- a/x11/libxklavier/files/patch-doc::html::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- doc/html/Makefile.in 2002/05/31 10:38:48 1.1 -+++ doc/html/Makefile.in 2002/05/31 10:39:18 -@@ -122,7 +122,7 @@ - - EXTRA_DIST = $(EXTRA_WEB_FILES) $(HTML_FILES) - --docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html -+docdir = $(datadir)/doc/$(PACKAGE)/html - - doc_DATA = $(EXTRA_DIST) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/x11/libxklavier/files/patch-libxlavier_xklavier_config.c b/x11/libxklavier/files/patch-libxlavier_xklavier_config.c new file mode 100644 index 000000000000..61a7f2f85379 --- /dev/null +++ b/x11/libxklavier/files/patch-libxlavier_xklavier_config.c @@ -0,0 +1,37 @@ +--- libxklavier/xklavier_config.c.orig Thu May 15 00:43:07 2003 ++++ libxklavier/xklavier_config.c Thu May 15 00:45:12 2003 +@@ -42,6 +42,18 @@ + static XkbComponentNamesRec componentNames; + static char *locale; + ++static char * ++xxx_strndup(const char *str, int len) { ++ char *ret; ++ ++ if ((str == NULL || len < 0)) return(NULL); ++ ret = (char *)malloc(len + 1); ++ if (ret == NULL) return(NULL); ++ memcpy(ret, str, len); ++ ret[len] = '\0'; ++ return(ret); ++} ++ + static Bool _XklConfigInitialized( ) + { + return theRegistry.xpathContext != NULL; +@@ -306,13 +318,13 @@ + while( ( npc = strchr( pc, ',' ) ) != NULL ) + { + int len = npc - pc; +- *ppc = ( char * ) strndup( pc, len ); ++ *ppc = ( char * ) xxx_strndup( pc, len ); + ppc++; + pc = npc + 1; + } + + len = npc - pc; +- *ppc = ( char * ) strndup( pc, len ); ++ *ppc = ( char * ) xxx_strndup( pc, len ); + } + } + diff --git a/x11/libxklavier/pkg-descr b/x11/libxklavier/pkg-descr index bc575f79a437..89144da3c35c 100644 --- a/x11/libxklavier/pkg-descr +++ b/x11/libxklavier/pkg-descr @@ -1 +1,3 @@ -libxklavier - utility library to make XKB stuff easier. +Libxklavier is an utility to make XKB stuff easier. + +WWW: http://gswitchit.sourceforge.net/ diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist index 340cdc18a4b6..9874376ee9e4 100644 --- a/x11/libxklavier/pkg-plist +++ b/x11/libxklavier/pkg-plist @@ -2,39 +2,6 @@ include/libxklavier/xklavier.h include/libxklavier/xklavier_config.h lib/libxklavier.a lib/libxklavier.so -lib/libxklavier.so.0 -share/doc/libxklavier/html/annotated.html -share/doc/libxklavier/html/doxygen.css -share/doc/libxklavier/html/doxygen.gif -share/doc/libxklavier/html/files.html -share/doc/libxklavier/html/functions.html -share/doc/libxklavier/html/globals.html -share/doc/libxklavier/html/group__Lookup.html -share/doc/libxklavier/html/group__activation.html -share/doc/libxklavier/html/group__callbacks.html -share/doc/libxklavier/html/group__currents.html -share/doc/libxklavier/html/group__debug.html -share/doc/libxklavier/html/group__debugerr.html -share/doc/libxklavier/html/group__enum.html -share/doc/libxklavier/html/group__initterm.html -share/doc/libxklavier/html/group__lookup.html -share/doc/libxklavier/html/group__settings.html -share/doc/libxklavier/html/group__wininfo.html -share/doc/libxklavier/html/group__winstate.html -share/doc/libxklavier/html/group__xkbevents.html -share/doc/libxklavier/html/group__xkbgroup.html -share/doc/libxklavier/html/group__xkbinfo.html -share/doc/libxklavier/html/index.html -share/doc/libxklavier/html/modules.html -share/doc/libxklavier/html/structXklState-members.html -share/doc/libxklavier/html/structXklState.html -share/doc/libxklavier/html/struct__XklConfigItem-members.html -share/doc/libxklavier/html/struct__XklConfigItem.html -share/doc/libxklavier/html/xklavier_8h-source.html -share/doc/libxklavier/html/xklavier_8h.html -share/doc/libxklavier/html/xklavier__config_8h-source.html -share/doc/libxklavier/html/xklavier__config_8h.html -share/doc/libxklavier/html/xklavier__private_8h-source.html -@dirrm share/doc/libxklavier/html -@dirrm share/doc/libxklavier +lib/libxklavier.so.5 +libdata/pkgconfig/libxklavier.pc @dirrm include/libxklavier |