summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-01-23 12:35:54 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-01-23 12:35:54 +0800
commit193f4bb0b2c2413c0fd244e7ec73a0fe8bec515e (patch)
treecb3ebd9b950f35ef4fc168e536d83d1cb87784f6
parent1bea958b520c565e12eda1c4b70510552be5a855 (diff)
downloadmarcuscom-ports-193f4bb0b2c2413c0fd244e7ec73a0fe8bec515e.tar
marcuscom-ports-193f4bb0b2c2413c0fd244e7ec73a0fe8bec515e.tar.gz
marcuscom-ports-193f4bb0b2c2413c0fd244e7ec73a0fe8bec515e.tar.bz2
marcuscom-ports-193f4bb0b2c2413c0fd244e7ec73a0fe8bec515e.tar.lz
marcuscom-ports-193f4bb0b2c2413c0fd244e7ec73a0fe8bec515e.tar.xz
marcuscom-ports-193f4bb0b2c2413c0fd244e7ec73a0fe8bec515e.tar.zst
marcuscom-ports-193f4bb0b2c2413c0fd244e7ec73a0fe8bec515e.zip
Update to 2.5.3.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1706 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/gnome-panel/Makefile11
-rw-r--r--x11/gnome-panel/distinfo2
-rw-r--r--x11/gnome-panel/files/patch-applets_clock_clock.c14
-rw-r--r--x11/gnome-panel/files/patch-configure10
-rw-r--r--x11/gnome-panel/pkg-plist3
-rw-r--r--x11/gnomepanel/Makefile11
-rw-r--r--x11/gnomepanel/distinfo2
-rw-r--r--x11/gnomepanel/files/patch-applets_clock_clock.c14
-rw-r--r--x11/gnomepanel/files/patch-configure10
-rw-r--r--x11/gnomepanel/pkg-plist3
10 files changed, 48 insertions, 32 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index d7543a922..0f0cd0882 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomepanel
-PORTVERSION= 2.5.2
+PORTVERSION= 2.5.3.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-panel/2.5
@@ -22,6 +22,7 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \
libwnck
+WANT_GNOME= yes
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
USE_LIBTOOL= yes
@@ -32,9 +33,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
MAN1= gnome-panel.1 gnome-panel-preferences.1
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mevolutiondataserver}!=""
+USE_GNOME+= evolutiondataserver
+.endif
+
post-patch:
.for po in da.po it.po zh_TW.po
@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
.endfor
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index c9cb06aa1..548f38b70 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.5.2.tar.bz2) = 0459e76ce9bd31f29e6bff1134710f4e
+MD5 (gnome2/gnome-panel-2.5.3.1.tar.bz2) = 92fed7683f424772e904d70a70e0a979
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c
index 7738df6bb..ccf5378b1 100644
--- a/x11/gnome-panel/files/patch-applets_clock_clock.c
+++ b/x11/gnome-panel/files/patch-applets_clock_clock.c
@@ -1,6 +1,6 @@
---- applets/clock/clock.c.orig Thu Dec 4 17:57:00 2003
-+++ applets/clock/clock.c Wed Dec 10 23:23:38 2003
-@@ -37,7 +37,9 @@
+--- applets/clock/clock.c.orig Tue Jan 13 11:55:58 2004
++++ applets/clock/clock.c Wed Jan 14 15:43:39 2004
+@@ -47,7 +47,9 @@
#include <dirent.h>
#include <string.h>
#include <time.h>
@@ -10,15 +10,15 @@
#include <panel-applet.h>
#include <panel-applet-gconf.h>
-@@ -1117,7 +1119,11 @@
+@@ -539,7 +541,11 @@
{
- const char *am;
+ const char *am;
+#ifdef HAVE_LANGINFO_H
- am = nl_langinfo (AM_STR);
+ am = nl_langinfo (AM_STR);
+#else
+ am = "AM";
+#endif
- return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
+ return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
}
diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure
index cdd3bc3ec..732f3a860 100644
--- a/x11/gnome-panel/files/patch-configure
+++ b/x11/gnome-panel/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig Mon Jan 6 01:04:20 2003
-+++ configure Mon Jan 6 13:12:56 2003
-@@ -4254,7 +4254,7 @@
+--- configure.orig Wed Jan 14 15:54:42 2004
++++ configure Wed Jan 14 15:55:13 2004
+@@ -5536,7 +5536,7 @@
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-- inttypes.h stdint.h unistd.h
-+ inttypes.h stdint.h unistd.h langinfo.h
+- inttypes.h stdint.h unistd.h
++ inttypes.h stdint.h unistd.h langinfo.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index a0c9a6bb6..d5ea8f394 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -66,7 +66,6 @@ etc/gconf/schemas/workspace-switcher.schemas
include/panel-2.0/GNOME_Panel.h
include/panel-2.0/panel-applet-gconf.h
include/panel-2.0/panel-applet.h
-lib/libclock-applet-2.so
lib/libpanel-applet-2.a
lib/libpanel-applet-2.so
lib/libpanel-applet-2.so.0
@@ -76,6 +75,7 @@ libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
libdata/bonobo/servers/GNOME_Panel.server
libdata/bonobo/servers/GNOME_Wncklet_Factory.server
libdata/pkgconfig/libpanelapplet-2.0.pc
+libexec/clock-applet
libexec/fish-applet-2
libexec/notification-area-applet
libexec/wnck-applet
@@ -395,6 +395,7 @@ share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index d7543a922..0f0cd0882 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomepanel
-PORTVERSION= 2.5.2
+PORTVERSION= 2.5.3.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-panel/2.5
@@ -22,6 +22,7 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \
libwnck
+WANT_GNOME= yes
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
USE_LIBTOOL= yes
@@ -32,9 +33,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
MAN1= gnome-panel.1 gnome-panel-preferences.1
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mevolutiondataserver}!=""
+USE_GNOME+= evolutiondataserver
+.endif
+
post-patch:
.for po in da.po it.po zh_TW.po
@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
.endfor
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index c9cb06aa1..548f38b70 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.5.2.tar.bz2) = 0459e76ce9bd31f29e6bff1134710f4e
+MD5 (gnome2/gnome-panel-2.5.3.1.tar.bz2) = 92fed7683f424772e904d70a70e0a979
diff --git a/x11/gnomepanel/files/patch-applets_clock_clock.c b/x11/gnomepanel/files/patch-applets_clock_clock.c
index 7738df6bb..ccf5378b1 100644
--- a/x11/gnomepanel/files/patch-applets_clock_clock.c
+++ b/x11/gnomepanel/files/patch-applets_clock_clock.c
@@ -1,6 +1,6 @@
---- applets/clock/clock.c.orig Thu Dec 4 17:57:00 2003
-+++ applets/clock/clock.c Wed Dec 10 23:23:38 2003
-@@ -37,7 +37,9 @@
+--- applets/clock/clock.c.orig Tue Jan 13 11:55:58 2004
++++ applets/clock/clock.c Wed Jan 14 15:43:39 2004
+@@ -47,7 +47,9 @@
#include <dirent.h>
#include <string.h>
#include <time.h>
@@ -10,15 +10,15 @@
#include <panel-applet.h>
#include <panel-applet-gconf.h>
-@@ -1117,7 +1119,11 @@
+@@ -539,7 +541,11 @@
{
- const char *am;
+ const char *am;
+#ifdef HAVE_LANGINFO_H
- am = nl_langinfo (AM_STR);
+ am = nl_langinfo (AM_STR);
+#else
+ am = "AM";
+#endif
- return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
+ return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
}
diff --git a/x11/gnomepanel/files/patch-configure b/x11/gnomepanel/files/patch-configure
index cdd3bc3ec..732f3a860 100644
--- a/x11/gnomepanel/files/patch-configure
+++ b/x11/gnomepanel/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig Mon Jan 6 01:04:20 2003
-+++ configure Mon Jan 6 13:12:56 2003
-@@ -4254,7 +4254,7 @@
+--- configure.orig Wed Jan 14 15:54:42 2004
++++ configure Wed Jan 14 15:55:13 2004
+@@ -5536,7 +5536,7 @@
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-- inttypes.h stdint.h unistd.h
-+ inttypes.h stdint.h unistd.h langinfo.h
+- inttypes.h stdint.h unistd.h
++ inttypes.h stdint.h unistd.h langinfo.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index a0c9a6bb6..d5ea8f394 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -66,7 +66,6 @@ etc/gconf/schemas/workspace-switcher.schemas
include/panel-2.0/GNOME_Panel.h
include/panel-2.0/panel-applet-gconf.h
include/panel-2.0/panel-applet.h
-lib/libclock-applet-2.so
lib/libpanel-applet-2.a
lib/libpanel-applet-2.so
lib/libpanel-applet-2.so.0
@@ -76,6 +75,7 @@ libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
libdata/bonobo/servers/GNOME_Panel.server
libdata/bonobo/servers/GNOME_Wncklet_Factory.server
libdata/pkgconfig/libpanelapplet-2.0.pc
+libexec/clock-applet
libexec/fish-applet-2
libexec/notification-area-applet
libexec/wnck-applet
@@ -395,6 +395,7 @@ share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo