aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-10-12 08:12:17 +0800
committermarcus <marcus@FreeBSD.org>2004-10-12 08:12:17 +0800
commit82a5ee7ccc5ab024e8723f86706a2806900a37d3 (patch)
tree3a7527e63f304a6cf7b54ae1f519e104a1014a11 /x11
parentb520682c655d1bc8a996b7758c0c91c1f69a8bbf (diff)
downloadfreebsd-ports-gnome-82a5ee7ccc5ab024e8723f86706a2806900a37d3.tar.gz
freebsd-ports-gnome-82a5ee7ccc5ab024e8723f86706a2806900a37d3.tar.zst
freebsd-ports-gnome-82a5ee7ccc5ab024e8723f86706a2806900a37d3.zip
Update to 1.04, and use the new libtool scheme.
Diffstat (limited to 'x11')
-rw-r--r--x11/libxklavier/Makefile5
-rw-r--r--x11/libxklavier/distinfo4
-rw-r--r--x11/libxklavier/files/patch-configure10
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_config_xkb.c13
4 files changed, 4 insertions, 28 deletions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index ef7c913e7046..3f0fa3d20022 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libxklavier
-PORTVERSION= 1.03
-PORTREVISION= 1
+PORTVERSION= 1.04
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +19,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gnomehack libxml2
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
CONFIGURE_ARGS= --disable-doxygen
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index ef3f0ec19e71..12b8565f2e87 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,2 +1,2 @@
-MD5 (libxklavier-1.03.tar.gz) = 266af32cb4ec1707f6cb8f3a568f62cf
-SIZE (libxklavier-1.03.tar.gz) = 415013
+MD5 (libxklavier-1.04.tar.gz) = 322078ad3681465f69a65c0758c74460
+SIZE (libxklavier-1.04.tar.gz) = 422337
diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure
deleted file mode 100644
index dc7e76b74ed3..000000000000
--- a/x11/libxklavier/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_xkb.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_xkb.c
deleted file mode 100644
index 38bc84c5f59e..000000000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_config_xkb.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libxklavier/xklavier_config_xkb.c.orig Tue Jun 29 02:00:04 2004
-+++ libxklavier/xklavier_config_xkb.c Tue Jun 29 02:00:16 2004
-@@ -173,9 +173,9 @@
-
- if ( supportState == UNCHECKED )
- {
-+ XkbRF_RulesPtr rulesPtr = _XklLoadRulesSet();
- XklDebug( 100, "!!! Checking multiple layouts support\n" );
- supportState = NON_SUPPORTED;
-- XkbRF_RulesPtr rulesPtr = _XklLoadRulesSet();
- if ( rulesPtr )
- {
- XkbRF_VarDefsRec varDefs;