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

Update to 6.0 and add myself as MAINTAINER

Browse Source 
OK landry@, ajacoutot@
This commit is contained in:
dcoppa 2010-04-13 16:28:44 +00:00
parent 69865536e2
commit c77042cf07
15 changed files with 356 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
x11/fbpanel/Makefile
View File

@ -1,13 +1,14 @@
# $OpenBSD: Makefile,v 1.6 2009/08/11 08:42:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.7 2010/04/13 16:28:44 dcoppa Exp $
SHARED_ONLY= Yes
COMMENT= lightweight NETWM compliant desktop panel
DISTNAME= fbpanel-4.12
PKGNAME= ${DISTNAME}p2
DISTNAME= fbpanel-6.0
CATEGORIES= x11
EXTRACT_SUFX= .tgz
EXTRACT_SUFX= .tbz2
MAINTAINER= David Coppa <dcoppa@openbsd.org>
HOMEPAGE= http://fbpanel.sourceforge.net/
@ -24,18 +25,36 @@ MODULES= devel/gettext
USE_GMAKE= Yes
NO_REGRESS= Yes
MAKE_FLAGS= CHATTY=1 CPPFLAGS="${CFLAGS}"
FAKE_FLAGS= PREFIX=${DESTDIR}${PREFIX}
CONFIGURE_STYLE=simple
CONFIGURE_STYLE=simple dest old
CONFIGURE_ARGS= --cpu=off --prefix=${TRUEPREFIX}
BUILD_DEPENDS= ::shells/bash
LIB_DEPENDS= gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2
RUN_DEPENDS= ::shells/bash
LIB_DEPENDS= gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000,gdk_pixbuf_xlib-2.0.>=1000::x11/gtk+2
WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \
gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pixman-1 png pthread-stubs xcb xcb-render \
xcb-render-util z
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xmu Xrandr Xrender atk-1.0 c cairo expat
WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pixman-1 png pthread z pthread-stubs xcb
DATADIR = ${PREFIX}/share/fbpanel
EXECDIR = ${PREFIX}/libexec/fbpanel
EXAMPLEDIR = ${PREFIX}/share/examples/fbpanel
pre-configure:
${SUBST_CMD} ${WRKSRC}/configure ${WRKSRC}/exec/make_profile.in \
${WRKSRC}/scripts/rfs-pkg-config
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/panel/fbpanel ${PREFIX}/bin/
${INSTALL_DATA_DIR} ${PREFIX}/lib/fbpanel
${INSTALL_DATA_DIR} ${DATADIR}/images
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
${INSTALL_DATA_DIR} ${EXECDIR}
${INSTALL_DATA} ${WRKSRC}/data/images/*.{png,xpm} ${DATADIR}/images/
${INSTALL_SCRIPT} ${WRKSRC}/exec/{make_profile,xlogout} ${EXECDIR}/
${INSTALL_PROGRAM} ${WRKSRC}/plugins/*/*.so ${PREFIX}/lib/fbpanel/
${INSTALL_DATA} ${WRKSRC}/data/config/default ${EXAMPLEDIR}/
.include <bsd.port.mk>

10
x11/fbpanel/distinfo
View File

@ -1,5 +1,5 @@
MD5 (fbpanel-4.12.tgz) = ElKOeyk2o1SIQP4BrK859Q==
RMD160 (fbpanel-4.12.tgz) = T8B6L0QpFP5dK/Bpes8cqWywm7M=
SHA1 (fbpanel-4.12.tgz) = fM0PZ3zHS7j5uIywKVfgQ1NxvQU=
SHA256 (fbpanel-4.12.tgz) = n2ZXd99QI+PTwzWYoPXYHQt5MUt1oSjBbAcSbvD8YH8=
SIZE (fbpanel-4.12.tgz) = 179131
MD5 (fbpanel-6.0.tbz2) = tYQAyu56gwFG7FpPkVA1Iw==
RMD160 (fbpanel-6.0.tbz2) = Qyj2ufxlY56tp/YtJ6w7VgJYXYY=
SHA1 (fbpanel-6.0.tbz2) = SS1bgXsdM6NzWRuoSAe+ldOPZjU=
SHA256 (fbpanel-6.0.tbz2) = rvDYU3N+P45WnWizIZzpfmpbsvuG2zy1YE9AO617IS8=
SIZE (fbpanel-6.0.tbz2) = 105702

34
x11/fbpanel/patches/patch-configure Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-configure,v 1.1 2010/04/13 16:28:44 dcoppa Exp $
fix bash and system directory paths
--- configure.orig Sun Feb 21 11:05:12 2010
+++ configure Thu Apr 8 11:10:43 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
export LANG="POSIX"
@@ -312,18 +312,18 @@ add_var host "stab: configure for arch" ""
add_var target "stab: configure for arch" ""
# N.B. order is important
-add_var prefix "install architecture-independent files" /usr
+add_var prefix "install architecture-independent files" ${TRUEPREFIX}
add_var eprefix "install architecture-dependent files" '$prefix'
add_var bindir "user executables" '$eprefix/bin'
add_var sbindir "system executables" '$eprefix/sbin'
add_var libexecdir "program executables" '$eprefix/libexec'
add_var libdir "object code libraries" '$eprefix/lib'
-add_var sysconfdir "read-only single-machine data" '$prefix/etc'
+add_var sysconfdir "read-only single-machine data" ${SYSCONFDIR}
add_var datadir "read-only architecture-independent data" '$prefix/share'
add_var includedir "C header files" '$prefix/include'
add_var mandir "man documentation" '$prefix/man'
add_var infodir "info documentation" '$prefix/info'
-add_var localstatedir "modifiable single-machine data in DIR" '$prefix/var'
+add_var localstatedir "modifiable single-machine data in DIR" '/var'
add_var topdir "project's top directory" '`pwd`'
add_var version "version" '`< version`'
add_feature debug "debug build" disabled

63
x11/fbpanel/patches/patch-data_config_default_in Normal file
View File

@ -0,0 +1,63 @@
$OpenBSD: patch-data_config_default_in,v 1.1 2010/04/13 16:28:44 dcoppa Exp $
remove linux-only plugins from default config file
use xlock (it's in base) instead of slock
--- data/config/default.in.orig Mon Mar 22 08:57:30 2010
+++ data/config/default.in Thu Apr 8 11:41:05 2010
@@ -157,7 +157,7 @@ Plugin {
item {
name = Lock Display
icon = gnome-lockscreen
- action = slock
+ action = xlock
}
separator {
}
@@ -271,46 +271,6 @@ Plugin {
size = 10
}
}
-
-Plugin {
- type = mem
- expand = false
- padding = 2
- config {
- ShowSwap = false
- }
-}
-
-Plugin {
- type = cpu
- config {
- Color = green
- }
-}
-
-Plugin {
- type = net
- expand = false
- padding = 0
- config {
- #interface = ppp0
- interface = eth0
- # set connection limits to make traffic graph more accurate
- TxLimit = 20
- RxLimit = 190
- TxColor = violet
- RxColor = blue
- }
-}
-
-
-Plugin {
- type = space
- config {
- size = 10
- }
-}
-
Plugin {
type = tray

47
x11/fbpanel/patches/patch-exec_make_profile_in Normal file
View File

@ -0,0 +1,47 @@
$OpenBSD: patch-exec_make_profile_in,v 1.1 2010/04/13 16:28:44 dcoppa Exp $
fix bash path
fix default config file path
use some sane defaults for menu/launchbar apps: that's a best effort
task :-)
--- exec/make_profile.in.orig Wed Mar 24 10:58:10 2010
+++ exec/make_profile.in Thu Apr 8 12:03:41 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
umask 0077
# new profile directory
@@ -6,7 +6,7 @@ npdir=~/.config/fbpanel
# old profile directory
opdir=~/.fbpanel
# system profile directory
-spdir=%%datadir%%/fbpanel
+spdir=%%datadir%%/examples/fbpanel
# if profile name was not set, use 'default'
profile=${1:-default}
@@ -47,19 +47,19 @@ function take_system_profile ()
[ -r "$spdir/$1" ] || return 1
local browser terminal filer
- for browser in x-www-browser firefox opera; do
+ for browser in firefox firefox35 firefox36 midori opera; do
if which $browser 2> /dev/null > /dev/null; then
opt="$opt -e s/x-www-browser/$browser/"
break
fi
done
- for terminal in x-terminal urxvt gnome-terminal; do
+ for terminal in gnome-terminal Terminal xterm; do
if which $terminal 2> /dev/null > /dev/null; then
opt="$opt -e s/x-terminal/$terminal/"
break
fi
done
- for filer in x-file-manager thunar pcmanfm rox; do
+ for filer in emelfm2 thunar pcmanfm rox konqueror; do
if which $filer 2> /dev/null > /dev/null; then
opt="$opt -e s/x-file-manager/$filer/"
break

61
x11/fbpanel/patches/patch-exec_xlogout Normal file
View File

@ -0,0 +1,61 @@
$OpenBSD: patch-exec_xlogout,v 1.1 2010/04/13 16:28:44 dcoppa Exp $
fix xlogout script on OpenBSD
use some sane defaults for X session names: that's a best effort
task :-)
--- exec/xlogout.orig Tue Apr 13 12:58:08 2010
+++ exec/xlogout Tue Apr 13 13:00:31 2010
@@ -1,49 +1,5 @@
-#!/bin/bash
+#!/bin/sh
-# xlogout - logs user out of its X session
-# Linux specific since uses /proc
+XSESS=$(pgrep -U `id -u` -f '(Xsession|cwm|fvwm|gnome-session|startkde|xfce4-session|xinit|xinitrc|xsession)')
-# get display name without screen number
-[ -z "$DISPLAY" ] && exit 1
-DPY=${DISPLAY:1}
-DPY=${DPY/.*/}
-echo "DPY=${DPY}"
-
-# get X pid
-XPID=`< /tmp/.X${DPY}-lock`
-XPID=`echo $XPID`
-echo "XPID=$XPID"
-
-# get pid of xdm (or gdm, kdm, etc). usually it's parent of X
-XDMPID=`ps -o ppid --pid=$XPID | awk '{if (FNR != 1) print $1}'`
-echo "XDMPID=$XDMPID"
-
-# recursivly find child of xdm that was started in home dir -
-# it's user's session start up script
-function pid_scan()
-{
-
- rm -f $PF
- while [ $# != 0 ]; do
- ps --no-headers -o pid --ppid=$1 >> $PF
- shift
- done
- for pid in `< $PF`; do
- if cwd=`ls -al /proc/$pid/cwd 2>/dev/null`; then
- cwd=`sed 's/.*-> //' <<< $cwd`
- [ "$cwd" == "$HOME" ] && echo $pid && return
- fi
- done
- pids=`< $PF`
- [ -n "$pids" ] && pid_scan `< $PF`;
-}
-
-PF=/tmp/$$-pids
-SPID=`pid_scan $XDMPID`
-rm -f $PF
-
-[ -z "$SPID" ] && exit 1
-echo "Session start up script"
-ps -o uid,pid,ppid,sess,cmd --pid $SPID
-kill -SIGTERM -$SPID
-
+for pid in ${XSESS} ; do kill ${pid} ; done

21
x11/fbpanel/patches/patch-man_Makefile
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-man_Makefile,v 1.1.1.1 2007/07/19 10:24:44 ajacoutot Exp $
--- man/Makefile.orig Sat Apr 21 13:28:25 2007
+++ man/Makefile Thu Jul 19 12:13:50 2007
@@ -11,14 +11,13 @@ TARGET := fbpanel.1.gz
all: $(TARGET)
$(TARGET): $(SRC)
- @$(call summary,TEXT,$@)
- $(Q)sed 's/PREFIX/$(BPREFIX)/g' < $(SRC) | gzip - > $@
+ $(Q)perl -pi -e 's/PREFIX/$(BPREFIX)/g' $(SRC)
install: all
- install -d $(PREFIX)/share/man/man1
- install -m 644 $(TARGET) $(PREFIX)/share/man/man1
+ install -d $(PREFIX)/man/man1
+ install -m 644 $(SRC) $(PREFIX)/man/man1
uninstall:
$(RM) $(PREFIX)/share/man/man1/$(TARGET)

15
x11/fbpanel/patches/patch-panel_misc_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-panel_misc_c,v 1.1 2010/04/13 16:28:44 dcoppa Exp $
use g_snprintf instead of g_sprintf
--- panel/misc.c.orig Tue Apr 6 16:23:27 2010
+++ panel/misc.c Tue Apr 6 16:23:47 2010
@@ -678,7 +678,7 @@ gchar *
gdk_color_to_RRGGBB(GdkColor *color)
{
static gchar str[10]; // #RRGGBB + \0
- g_sprintf(str, "#%02x%02x%02x",
+ g_snprintf(str, sizeof(str), "#%02x%02x%02x",
color->red >> 8, color->green >> 8, color->blue >> 8);
return str;
}

14
x11/fbpanel/patches/patch-plugins_Makefile_in Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-plugins_Makefile_in,v 1.1 2010/04/13 16:28:44 dcoppa Exp $
remove linux-only plugins
--- plugins/Makefile.in.orig Tue Apr 6 13:34:55 2010
+++ plugins/Makefile.in Tue Apr 6 13:35:13 2010
@@ -1,6 +1,6 @@
include %%topdir%%/config.mk
-SUBDIRS = taskbar launchbar space menu pager mem chart cpu net
+SUBDIRS = taskbar launchbar space menu pager
SUBDIRS += systray dclock wincmd icons separator image
SUBDIRS += deskno tclock genmon deskno2

15
x11/fbpanel/patches/patch-plugins_deskno_deskno_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-plugins_deskno_deskno_c,v 1.1 2010/04/13 16:28:44 dcoppa Exp $
use snprintf instead of sprintf
--- plugins/deskno/deskno.c.orig Tue Apr 6 16:19:02 2010
+++ plugins/deskno/deskno.c Tue Apr 6 16:19:55 2010
@@ -57,7 +57,7 @@ name_update(GtkWidget *widget, deskno_priv *dc)
ENTER;
dc->deskno = get_net_current_desktop();
- sprintf(buffer, "<b>%d</b>", dc->deskno + 1);
+ snprintf(buffer, sizeof(buffer), "<b>%d</b>", dc->deskno + 1);
gtk_label_set_markup(GTK_LABEL(dc->namew), buffer);
RET(TRUE);
}

14
x11/fbpanel/patches/patch-plugins_menu_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-plugins_menu_c,v 1.1 2009/05/30 21:34:16 landry Exp $
--- plugins/menu.c.orig Mon Jul 30 17:38:54 2007
+++ plugins/menu.c Sat May 30 15:21:02 2009
@@ -92,8 +92,8 @@ _menu_shell_insert_sorted(GtkMenuShell *menu_shell, Gt
items = gtk_container_get_children(GTK_CONTAINER(menu_shell));
for(i=0; items; items=items->next, i++) {
cmpname = (gchar *)g_object_get_data(G_OBJECT(items->data), "item-name");
- if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0)
- break;
+ if(cmpname && g_ascii_strcasecmp(name, cmpname) == 0)
+ return -1;
}
gtk_menu_shell_insert(menu_shell, mi, i);
return i;

26
x11/fbpanel/patches/patch-scripts_endianess_sh Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-scripts_endianess_sh,v 1.1 2010/04/13 16:28:44 dcoppa Exp $
fix endianess detection on OpenBSD
--- scripts/endianess.sh.orig Tue Apr 6 13:19:08 2010
+++ scripts/endianess.sh Tue Apr 6 13:20:08 2010
@@ -1,16 +1,13 @@
-#!/bin/bash
+#!/bin/sh
# When cross compiling, you may put cross compiler directory
# in PATH before native gcc (aka spoofing), or you may set CC
# to exact name of cross compiler:
# CC=/opt/ppc_gcc/bin/gcc endianess
-# x86 and friends are considerd LITTLE endian, all others are BIG
-a=`${CC:-gcc} -v 2>&1 | grep Target`
-[ $? -ne 0 ] && exit 1
-#echo $a
+a=`sysctl -n hw.byteorder`
-if [ "${a/86/}" != "$a" ]; then
+if [ "${a}" == "1234" ]; then
echo LITTLE
else
echo BIG

12
x11/fbpanel/patches/patch-scripts_rfs-pkg-config Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-scripts_rfs-pkg-config,v 1.1 2010/04/13 16:28:44 dcoppa Exp $
fix bash path
--- scripts/rfs-pkg-config.orig Thu Apr 8 11:12:19 2010
+++ scripts/rfs-pkg-config Thu Apr 8 11:12:34 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
# Tt runs pkg-config in a way that everything is searched under RFS
# but reported including full path. Suitable for cross-compiling

5
x11/fbpanel/pkg/MESSAGE Normal file
View File

@ -0,0 +1,5 @@
If fbpanel icons are missing, install a freedesktop.org compliant
icon-theme (like gnome-icon-theme or tango-icon-theme) and set it
as default through a ~/.gtkrc-2.0 file containing :
gtk-icon-theme-name = "<theme name>"

66
x11/fbpanel/pkg/PLIST
View File

@ -1,44 +1,30 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/19 10:24:44 ajacoutot Exp $
bin/fbpanel
@man man/man1/fbpanel.1
@comment $OpenBSD: PLIST,v 1.2 2010/04/13 16:28:44 dcoppa Exp $
@bin bin/fbpanel
lib/fbpanel/
lib/fbpanel/dclock.so
lib/fbpanel/deskno.so
lib/fbpanel/deskno2.so
lib/fbpanel/genmon.so
lib/fbpanel/icons.so
lib/fbpanel/image.so
lib/fbpanel/launchbar.so
lib/fbpanel/menu.so
lib/fbpanel/pager.so
lib/fbpanel/separator.so
lib/fbpanel/space.so
lib/fbpanel/taskbar.so
lib/fbpanel/tclock.so
lib/fbpanel/tray.so
lib/fbpanel/wincmd.so
libexec/fbpanel/
libexec/fbpanel/make_profile
libexec/fbpanel/xlogout
share/examples/fbpanel/
share/examples/fbpanel/default
share/fbpanel/
share/fbpanel/default
share/fbpanel/images/
share/fbpanel/images/bottom-left.xpm
share/fbpanel/images/bottom-right.xpm
share/fbpanel/images/dclock_glyphs.png
share/fbpanel/images/default.xpm
share/fbpanel/images/gnome-applications.png
share/fbpanel/images/gnome-devel.svg
share/fbpanel/images/gnome-emacs.svg
share/fbpanel/images/gnome-fs-desktop.svg
share/fbpanel/images/gnome-fs-home.svg
share/fbpanel/images/gnome-globe.svg
share/fbpanel/images/gnome-graphics.png
share/fbpanel/images/gnome-joystick.svg
share/fbpanel/images/gnome-multimedia.svg
share/fbpanel/images/gnome-settings.svg
share/fbpanel/images/gnome-system.png
share/fbpanel/images/gnome-util.svg
share/fbpanel/images/gnome_terminal.svg
share/fbpanel/images/mozilla-firefox.svg
share/fbpanel/images/star.png
share/fbpanel/images/top-left.xpm
share/fbpanel/images/top-right.xpm
share/fbpanel/pager
share/fbpanel/plugins/
share/fbpanel/plugins/dclock.so
share/fbpanel/plugins/deskno.so
share/fbpanel/plugins/deskno2.so
share/fbpanel/plugins/icons.so
share/fbpanel/plugins/image.so
share/fbpanel/plugins/launchbar.so
share/fbpanel/plugins/menu.so
share/fbpanel/plugins/pager.so
share/fbpanel/plugins/separator.so
share/fbpanel/plugins/space.so
share/fbpanel/plugins/taskbar.so
share/fbpanel/plugins/tclock.so
share/fbpanel/plugins/test.so
share/fbpanel/plugins/tray.so
share/fbpanel/plugins/wincmd.so
share/fbpanel/images/gnome-session-halt.png
share/fbpanel/images/gnome-session-reboot.png
share/fbpanel/images/logo.png