aboutsummaryrefslogtreecommitdiffstats
path: root/x11/libxkbfile
diff options
context:
space:
mode:
authorFlorent Thoumie <flz@FreeBSD.org>2007-05-20 04:36:56 +0800
committerFlorent Thoumie <flz@FreeBSD.org>2007-05-20 04:36:56 +0800
commitd4f0d0048a8755106a4b0445221a19761e746984 (patch)
treec87184c5bfeaf942c827c5f706186ce9786a2588 /x11/libxkbfile
parente82affd309fc2d8e5ea19b2e003f1296920bd825 (diff)
downloadfreebsd-ports-gnome-d4f0d0048a8755106a4b0445221a19761e746984.tar.gz
freebsd-ports-gnome-d4f0d0048a8755106a4b0445221a19761e746984.tar.zst
freebsd-ports-gnome-d4f0d0048a8755106a4b0445221a19761e746984.zip
- Welcome X.org 7.2 \o/.
- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}. - Bump PORTREVISION for ports intalling files in ${X11BASE}.
Diffstat (limited to 'x11/libxkbfile')
-rw-r--r--x11/libxkbfile/Makefile25
-rw-r--r--x11/libxkbfile/distinfo6
-rw-r--r--x11/libxkbfile/files/patch-Imakefile34
-rw-r--r--x11/libxkbfile/pkg-plist3
4 files changed, 9 insertions, 59 deletions
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index d21706f88e06..edee2b77ac5e 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -6,32 +6,13 @@
#
PORTNAME= libxkbfile
-PORTVERSION= 1.0
+PORTVERSION= 1.0.4
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/X11R6.7.0/src/ \
- ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= X11R6.7/tars
-DISTNAME= X11R6.7.0-src1
MAINTAINER= x11@FreeBSD.org
COMMENT= XKB file library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
-
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_IMAKE= yes
-USE_X_PREFIX= no
-PREFIX?= ${X11BASE}
-DIST_SUBDIR= xorg
-INSTALLS_SHLIB= yes
-WRKSRC= ${WRKDIR}/xc/lib/xkbfile
-EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/lib/xkbfile
-
-post-patch:
- ${LN} -s ${WRKSRC}/exports/include/X11 ${WRKSRC}/
+XORG_CAT= lib
+USE_XORG= x11 kbproto:both
.include <bsd.port.mk>
diff --git a/x11/libxkbfile/distinfo b/x11/libxkbfile/distinfo
index 59603c139556..a1594e5cb3b1 100644
--- a/x11/libxkbfile/distinfo
+++ b/x11/libxkbfile/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SHA256 (xorg/X11R6.7.0-src1.tar.gz) = e2872ae9c773e76139cfe7c97bdfd1963e41bf3b307230fca711c9f005a90dbb
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 12b4ceb5d42b520228b5fb40a96ae6c5
+SHA256 (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae
+SIZE (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 273537
diff --git a/x11/libxkbfile/files/patch-Imakefile b/x11/libxkbfile/files/patch-Imakefile
deleted file mode 100644
index eb8b91160e09..000000000000
--- a/x11/libxkbfile/files/patch-Imakefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- Imakefile.orig Thu Mar 4 09:47:14 2004
-+++ Imakefile Sat May 8 14:39:42 2004
-@@ -5,24 +5,19 @@
-
- XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.5 2003/10/15 21:23:38 herrb Exp $
-
--#define DoNormalLib NormalLibxkbfile
--#define DoSharedLib SharedLibxkbfile
--#define DoExtraLib SharedLibxkbfile
--#define DoDebugLib DebugLibxkbfile
--#define DoProfileLib ProfileLibxkbfile
-+#define DoNormalLib YES
-+#define DoSharedLib YES
-+#define DoExtraLib YES
-+#define DoDebugLib NO
-+#define DoProfileLib NO
- #define HasSharedData NO
- #define LibName xkbfile
- #define SoRev SOXKBFILEREV
-+SOXKBFILEREV = 1.0
- #define IncSubdir X11
- #define IncSubSubdir extensions
-
--#ifdef SharedxkbfileReqs
--REQUIREDLIBS = SharedxkbfileReqs
--#endif
--
--#if !BuildXKBfilelib
--#define LibBuild NO
--#endif
-+REQUIREDLIBS = $(LDPRELIB) $(XONLYLIB)
-
- SRCS = xkbtext.c xkbdraw.c xkbmisc.c xkbatom.c xkberrs.c \
- cout.c xkbout.c xkmout.c \
diff --git a/x11/libxkbfile/pkg-plist b/x11/libxkbfile/pkg-plist
index f7de24f1a0e3..cf9ae09cec7d 100644
--- a/x11/libxkbfile/pkg-plist
+++ b/x11/libxkbfile/pkg-plist
@@ -5,5 +5,8 @@ include/X11/extensions/XKBrules.h
include/X11/extensions/XKM.h
include/X11/extensions/XKMformat.h
lib/libxkbfile.a
+lib/libxkbfile.la
lib/libxkbfile.so
lib/libxkbfile.so.1
+libdata/pkgconfig/xkbfile.pc
+@dirrmtry include/X11/extensions