cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- set SHARED_ONLY=Yes

Browse Source 
- use FAKE_FLAGS to remove two patches
- tweak a patch
This commit is contained in:
jasper 2009-10-15 15:52:37 +00:00
parent 9f2a062bdc
commit 469f4a106f
6 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/gnome/controlcenter2/Makefile
View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.71 2009/10/13 19:09:05 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.72 2009/10/15 15:52:37 jasper Exp $
SHARED_ONLY= Yes
COMMENT= GNOME control center
GNOME_PROJECT= gnome-control-center
GNOME_VERSION= 2.28.0
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += gnome-window-settings 3.0 # .1.0
@ -62,7 +65,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
XCURSOR_ICONDIR=${LOCALBASE}/lib/X11/icons
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/controlcenter2
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/controlcenter2 \
pkgconfigdir=${PREFIX}/lib/pkgconfig/
pre-configure:
${SUBST_CMD} ${WRKSRC}/capplets/common/gnome-theme-info.c

12
x11/gnome/controlcenter2/patches/patch-capplets_default-applications_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-capplets_default-applications_Makefile_in,v 1.2 2009/10/13 19:09:05 ajacoutot Exp $
--- capplets/default-applications/Makefile.in.orig Mon Sep 21 13:06:38 2009
+++ capplets/default-applications/Makefile.in Tue Oct 13 19:26:00 2009
@@ -337,7 +337,7 @@ dist_ui_DATA = gnome-default-applications-properties.u
desktopdir = $(datadir)/applications
Desktop_in_files = default-applications.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-pkgconfigdir = $(datadir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnome-default-applications.pc
autostartdir = $(sysconfdir)/xdg/autostart
autostart_in_files = gnome-at-session.desktop.in

12
x11/gnome/controlcenter2/patches/patch-capplets_keybindings_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-capplets_keybindings_Makefile_in,v 1.3 2009/10/13 19:09:05 ajacoutot Exp $
--- capplets/keybindings/Makefile.in.orig Mon Sep 21 13:06:38 2009
+++ capplets/keybindings/Makefile.in Tue Oct 13 19:26:00 2009
@@ -326,7 +326,7 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop
xmldir = $(pkgdatadir)/keybindings
xml_in_files = 00-multimedia-key.xml.in 01-desktop-key.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
-pkgconfigdir = $(datadir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnome-keybindings.pc
INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \

11
x11/gnome/controlcenter2/patches/patch-libslab-directory-tile_c
View File

@ -1,12 +1,15 @@
$OpenBSD: patch-libslab-directory-tile_c,v 1.4 2009/10/13 19:09:05 ajacoutot Exp $
$OpenBSD: patch-libslab-directory-tile_c,v 1.5 2009/10/15 15:52:37 jasper Exp $
--- libslab/directory-tile.c.orig Mon Aug 24 13:13:11 2009
+++ libslab/directory-tile.c Tue Oct 13 19:26:01 2009
@@ -624,7 +624,7 @@ static void
+++ libslab/directory-tile.c Thu Oct 15 17:35:30 2009
@@ -624,7 +624,11 @@ static void
disown_spawned_child (gpointer user_data)
{
setsid ();
- setpgrp ();
+#if defined(__OpenBSD__)
+ setpgrp (0,0);
+#else
setpgrp ();
+#endif
}
static void

2
x11/gnome/controlcenter2/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2008/11/21 17:02:50 jasper Exp $
@lib lib/libgnome-window-settings.so.${LIBgnome-window-settings_VERSION}

9
x11/gnome/controlcenter2/pkg/PLIST
View File

@ -1,8 +1,7 @@
@comment $OpenBSD: PLIST,v 1.32 2009/10/13 19:09:05 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.33 2009/10/15 15:52:37 jasper Exp $
@conflict control-center-1*
@conflict control-center2-*
@pkgpath x11/gnome/controlcenter2
%%SHARED%%
@bin bin/gnome-about-me
@bin bin/gnome-appearance-properties
bin/gnome-at-mobility
@ -24,6 +23,7 @@ include/gnome-window-settings-2.0/gnome-window-manager.h
include/gnome-window-settings-2.0/gnome-wm-manager.h
lib/libgnome-window-settings.a
lib/libgnome-window-settings.la
@lib lib/libgnome-window-settings.so.${LIBgnome-window-settings_VERSION}
lib/pkgconfig/gnome-default-applications.pc
lib/pkgconfig/gnome-keybindings.pc
lib/pkgconfig/gnome-window-settings-2.0.pc
@ -45,7 +45,6 @@ share/applications/keybinding.desktop
share/applications/keyboard.desktop
@comment share/applications/mimeinfo.cache
share/applications/window-properties.desktop
share/desktop-directories/
share/desktop-directories/gnomecc.directory
share/examples/controlcenter2/
share/examples/controlcenter2/xdg/
@ -188,8 +187,6 @@ share/icons/hicolor/24x24/apps/gnome-settings-default-applications.png
share/icons/hicolor/32x32/apps/gnome-display-properties.png
share/icons/hicolor/32x32/apps/gnome-network-properties.png
share/icons/hicolor/32x32/apps/gnome-settings-default-applications.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/gnome-network-properties.png
share/icons/hicolor/48x48/apps/gnome-settings-default-applications.png
share/icons/hicolor/48x48/apps/typing-monitor.png
@ -211,8 +208,6 @@ share/locale/br/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/crh/
share/locale/crh/LC_MESSAGES/
share/locale/crh/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-control-center-2.0.mo