Update to xfce4-clipman 1.1.3, add a patch to make it look for exo-1

instead of exo-0.3, fix LIB_DEPENDS.
This commit is contained in:
landry 2011-01-18 21:02:04 +00:00
parent 35a7b1a8d0
commit 17f62f5ba7
4 changed files with 76 additions and 11 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.27 2010/11/22 08:37:06 espie Exp $
# $OpenBSD: Makefile,v 1.28 2011/01/18 21:02:04 landry Exp $
COMMENT= Xfce4 clipboard history panel plugin
XFCE_VERSION= 1.1.0
XFCE_VERSION= 1.1.3
XFCE_PLUGIN= clipman
REVISION= 2
# GPLv2
PERMIT_DISTFILES_CDROM= Yes
@ -16,6 +15,8 @@ MODULES= x11/xfce4
DESKTOP_FILES= Yes
LIB_DEPENDS+= x11/xfce4/xfconf \
x11/xfce4/libxfcegui4 \
devel/libglade2 \
devel/libunique
FAKE_FLAGS = autostartdir=${PREFIX}/share/examples/xfce4-clipman \
@ -23,13 +24,13 @@ FAKE_FLAGS = autostartdir=${PREFIX}/share/examples/xfce4-clipman \
WANTLIB = ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \
dbus-glib-1 exo-0.3 expat fontconfig freetype gdk-x11-2.0 \
dbus-glib-1 exo-1 expat fontconfig freetype gdk-x11-2.0 \
gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pcre pixman-1 png pthread startup-notification-1 \
xfce4util xfcegui4 xml2 z pthread-stubs xcb execinfo \
xcb-atom xcb-aux xcb-event xfconf-0 unique-1.0 \
gthread-2.0 xcb-render xcb-render-util
gthread-2.0 xcb-render GL Xxf86vm drm xcb-shm
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (xfce4/xfce4-clipman-plugin-1.1.0.tar.bz2) = vwOAeOw1ZsBtLvQAqRdW0Q==
RMD160 (xfce4/xfce4-clipman-plugin-1.1.0.tar.bz2) = iI2mPLXs3iGRRvm7air9cpkY+Nc=
SHA1 (xfce4/xfce4-clipman-plugin-1.1.0.tar.bz2) = 3FmY8cemf3IXA6MJ5FowTIGvYCw=
SHA256 (xfce4/xfce4-clipman-plugin-1.1.0.tar.bz2) = QHFqOBZn4f1WMOpPM0QIQmh7C+5iz/gj8YLgeX3P4JY=
SIZE (xfce4/xfce4-clipman-plugin-1.1.0.tar.bz2) = 798246
MD5 (xfce4/xfce4-clipman-plugin-1.1.3.tar.bz2) = K6cMa9cQ4qGMulrdZtKX3A==
RMD160 (xfce4/xfce4-clipman-plugin-1.1.3.tar.bz2) = XnE0tTuU2s5LqmJ2F3GCMRjQW5k=
SHA1 (xfce4/xfce4-clipman-plugin-1.1.3.tar.bz2) = Jh+C3MgxPO+eelJJTlh0HCsq2mQ=
SHA256 (xfce4/xfce4-clipman-plugin-1.1.3.tar.bz2) = SjBrultouIyT82rVqhzEcv2yEVFE9gAGcUaFPP35wIw=
SIZE (xfce4/xfce4-clipman-plugin-1.1.3.tar.bz2) = 801564

View File

@ -0,0 +1,63 @@
$OpenBSD: patch-configure,v 1.1 2011/01/18 21:02:04 landry Exp $
--- configure.orig Sat Jan 15 21:09:59 2011
+++ configure Sat Jan 15 21:10:26 2011
@@ -12435,22 +12435,22 @@ $as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; }
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-0.3 >= 0.3.0" >&5
-$as_echo_n "checking for exo-0.3 >= 0.3.0... " >&6; }
- if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then
- EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-1 >= 0.3.0" >&5
+$as_echo_n "checking for exo-1 >= 0.3.0... " >&6; }
+ if $PKG_CONFIG "--atleast-version=0.3.0" "exo-1" >/dev/null 2>&1; then
+ EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_VERSION" >&5
$as_echo "$EXO_VERSION" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking EXO_CFLAGS" >&5
$as_echo_n "checking EXO_CFLAGS... " >&6; }
- EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
+ EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_CFLAGS" >&5
$as_echo "$EXO_CFLAGS" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking EXO_LIBS" >&5
$as_echo_n "checking EXO_LIBS... " >&6; }
- EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
+ EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_LIBS" >&5
$as_echo "$EXO_LIBS" >&6; }
@@ -12462,15 +12462,15 @@ $as_echo "$EXO_LIBS" >&6; }
- elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then
- xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"`
+ elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
+ xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5
$as_echo "found, but $xdt_cv_version" >&6; }
- echo "*** The required package exo-0.3 was found on your system,"
+ echo "*** The required package exo-1 was found on your system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust"
+ echo "*** Please upgrade exo-1 to atleast version 0.3.0, or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
echo "*** the new version of the package in a nonstandard prefix so"
echo "*** pkg-config is able to find it."
@@ -12481,8 +12481,8 @@ $as_echo "found, but $xdt_cv_version" >&6; }
$as_echo "not found" >&6; }
- echo "*** The required package exo-0.3 was not found on your system."
- echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust"
+ echo "*** The required package exo-1 was not found on your system."
+ echo "*** Please install exo-1 (atleast version 0.3.0) or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you"
echo "*** installed the package in a nonstandard prefix so that"
echo "*** pkg-config is able to find it."

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2009/12/21 16:07:44 landry Exp $
@comment $OpenBSD: PLIST,v 1.10 2011/01/18 21:02:04 landry Exp $
@bin bin/xfce4-clipman
@bin bin/xfce4-clipman-settings
@bin bin/xfce4-popup-clipman
@ -62,6 +62,7 @@ share/locale/pl/LC_MESSAGES/xfce4-clipman-plugin.mo
share/locale/pt/LC_MESSAGES/xfce4-clipman-plugin.mo
share/locale/pt_BR/LC_MESSAGES/xfce4-clipman-plugin.mo
share/locale/ru/LC_MESSAGES/xfce4-clipman-plugin.mo
share/locale/sk/LC_MESSAGES/xfce4-clipman-plugin.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/xfce4-clipman-plugin.mo