tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

X11_TYPE=native on Ubuntu 8.04



I found that the following changes seem to be needed for pango,
Xft2, gst-plugins0.10-good, bug-buddy, and x11-links to work on
Ubuntu 8.04, and probably other newer Linux systems.  I'm no
expert on these packages, so I'm unsure of the correctness of
my changes.

The gst-plugins0.10-good and bug-buddy changes look like
no-brainers: adding PLIST entries for files not installed on
NetBSD.  But, maybe not?

All the other changes, I'm less sure about.  I made each one in
reaction to a missing pkg-config file during build, e.g. xcb and
pthread-stubs.

Index: devel/pango/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pango/Makefile,v
retrieving revision 1.116
diff -a -u -r1.116 Makefile
--- devel/pango/Makefile        19 Aug 2008 18:10:22 -0000      1.116
+++ devel/pango/Makefile        4 Sep 2008 23:21:29 -0000
@@ -52,4 +52,6 @@
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: fonts/Xft2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/Xft2/Makefile,v
retrieving revision 1.50
diff -a -u -r1.50 Makefile
--- fonts/Xft2/Makefile 3 Jan 2007 22:13:50 -0000       1.50
+++ fonts/Xft2/Makefile 4 Sep 2008 23:21:29 -0000
@@ -29,5 +29,6 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
@comment $NetBSD$
lib/gstreamer-0.10/libgstvideo4linux2.la
lib/gstreamer-0.10/libgstximagesrc.la
Index: net/bug-buddy/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/bug-buddy/Makefile,v
retrieving revision 1.61
diff -a -u -r1.61 Makefile
--- net/bug-buddy/Makefile      12 Jun 2008 02:14:38 -0000      1.61
+++ net/bug-buddy/Makefile      4 Sep 2008 23:21:48 -0000
@@ -28,6 +28,12 @@
 BUILDLINK_API_DEPENDS.gtk2+=           gtk2+>=2.9.0
 BUILDLINK_API_DEPENDS.libsoup-devel+=  libsoup-devel>=2.2.96
 
+PLIST_SRC=             PLIST
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:MLinux-*86)
+PLIST_SRC+=            PLIST.google-breakpad
+.endif
+
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@comment $NetBSD$
bin/minidump_dump
bin/minidump_stackwalk
lib/bug-buddy/libbreakpad.la
@dirrm lib/bug-buddy
Index: pkgtools/x11-links/xorg.mk
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/xorg.mk,v
retrieving revision 1.9
diff -a -u -r1.9 xorg.mk
--- pkgtools/x11-links/xorg.mk  5 Jan 2008 16:08:52 -0000       1.9
+++ pkgtools/x11-links/xorg.mk  4 Sep 2008 23:21:55 -0000
@@ -57,3 +57,10 @@
 .    endif
 .  endif
 .endfor
+# XCB not in pkgsrc yet (?), handle specially
+IGNORE_PKG.xcb=        yes
+.    if exists(${FILESDIR}/xorg.xcb)
+FILES_LIST+=   ${FILESDIR}/xorg.xcb
+.    elif exists(${FILESDIR}/xfree.xcb)
+FILES_LIST+=   ${FILESDIR}/xfree.xcb
+.    endif
Index: pkgtools/x11-links/files/xorg.fixesproto
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/files/xorg.fixesproto,v
retrieving revision 1.1
diff -a -u -r1.1 xorg.fixesproto
--- pkgtools/x11-links/files/xorg.fixesproto    19 Apr 2006 15:56:38 -0000      
1.1
+++ pkgtools/x11-links/files/xorg.fixesproto    4 Sep 2008 23:21:55 -0000
@@ -2,3 +2,4 @@
 include/X11/extensions/xfixesproto.h
 include/X11/extensions/xfixeswire.h
 lib/pkgconfig/fixesext.pc
+lib/pkgconfig/fixesproto.pc
# $NetBSD$
include/xcb/bigreq.h
include/xcb/xc_misc.h
include/xcb/xcb.h
include/xcb/xcbext.h
include/xcb/xcbxlib.h
include/xcb/xproto.h
lib/libxcb-xlib.a
lib/libxcb-xlib.so
lib/libxcb.a
lib/libxcb.so
lib/pkgconfig/xcb-xlib.pc
lib/pkgconfig/xcb.pc
# XXX needed by xcb on linux, but maybe only linux, dunno.  Should it really
# be in pkgsrc?
share/pkgconfig/pthread-stubs.pc


Home | Main Index | Thread Index | Old Index