Date: Thu, 28 Jul 2005 23:17:19 +0200 (CEST) From: Tobias Roth <ports@fsck.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/84253: [maintainer-update] x11/fbpanel 4.1 -> 4.3 Message-ID: <200507282117.j6SLHIsk003061@secure.socket.ch> Resent-Message-ID: <200507282120.j6SLKG36073116@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84253
>Category: ports
>Synopsis: [maintainer-update] x11/fbpanel 4.1 -> 4.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 28 21:20:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Tobias Roth
>Release: FreeBSD 6.0-BETA1 i386
>Organization:
>Environment:
System: FreeBSD localhost 6.0-BETA1 FreeBSD 6.0-BETA1 #2: Wed Jul 27 16:46:55 CEST 2005 roth@localhost:/usr/obj/usr/src/sys/FOOBAR i386
>Description:
This updates x11/fbpanel from 4.1 to 4.3
Files added: files/patch-man::Makefile
Files removed: files/patch-Makefile files/patch-plugins-deskno.c
>How-To-Repeat:
>Fix:
diff -ruN fbpanel.orig/Makefile fbpanel/Makefile
--- fbpanel.orig/Makefile Thu Jul 28 22:16:58 2005
+++ fbpanel/Makefile Thu Jul 28 22:18:49 2005
@@ -6,8 +6,7 @@
#
PORTNAME= fbpanel
-PORTVERSION= 4.1
-PORTREVISION= 1
+PORTVERSION= 4.3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff -ruN fbpanel.orig/distinfo fbpanel/distinfo
--- fbpanel.orig/distinfo Thu Jul 28 22:16:58 2005
+++ fbpanel/distinfo Thu Jul 28 22:19:00 2005
@@ -1,2 +1,2 @@
-MD5 (fbpanel-4.1.tgz) = 70c1b3f9682a0cce0d6b5477b2bc83e4
-SIZE (fbpanel-4.1.tgz) = 96191
+MD5 (fbpanel-4.3.tgz) = 2d2f3713cf3c17b71997064f39d4c888
+SIZE (fbpanel-4.3.tgz) = 95702
diff -ruN fbpanel.orig/files/patch-Makefile fbpanel/files/patch-Makefile
--- fbpanel.orig/files/patch-Makefile Thu Jul 28 22:16:58 2005
+++ fbpanel/files/patch-Makefile Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
---- man/Makefile.orig Sat Jun 26 12:37:59 2004
-+++ man/Makefile Sat Jun 26 12:38:14 2004
-@@ -20,8 +20,8 @@
-
-
- install: all
-- install -d $(PREFIX)/share/man/man1
-- install -m 644 $(TARGET) $(PREFIX)/share/man/man1
-+ install -d $(PREFIX)/man/man1
-+ install -m 644 $(TARGET) $(PREFIX)/man/man1
-
- uninstall:
- rm -f $(PREFIX)/share/man/man1/$(TARGET)
diff -ruN fbpanel.orig/files/patch-Makefile.common fbpanel/files/patch-Makefile.common
--- fbpanel.orig/files/patch-Makefile.common Thu Jul 28 22:16:58 2005
+++ fbpanel/files/patch-Makefile.common Thu Jul 28 22:36:37 2005
@@ -1,17 +1,18 @@
---- Makefile.common.orig Sat Nov 6 07:36:35 2004
-+++ Makefile.common Sat Dec 18 17:35:28 2004
-@@ -15,12 +15,9 @@
- endif
- endif
+--- Makefile.common.orig Thu Jul 28 22:35:08 2005
++++ Makefile.common Thu Jul 28 22:36:06 2005
+@@ -83,13 +83,11 @@
+ # compile flags
--CC = gcc
-+CC ?= gcc
- LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib -lXmu
--INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
--INCS := $(INCS2:-I%=-isystem%)
--# first = may be overwriten by command line or env. variable
--CFLAGS = -O2
+ RM = rm -f
+-CC = gcc
++CC ?= gcc
+ AR = ar
+ LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib -lXmu
+-INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
+-INCS := $(INCS2:-I%=-isystem %)
+INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
- # this one always applays
- CFLAGS += -Wall
- ifneq (,$(DEVEL))
+
+-CFLAGS = -O2
+ ifeq (1,$(DEVEL))
+ override CFLAGS += -g
+ endif
diff -ruN fbpanel.orig/files/patch-man::Makefile fbpanel/files/patch-man::Makefile
--- fbpanel.orig/files/patch-man::Makefile Thu Jan 1 01:00:00 1970
+++ fbpanel/files/patch-man::Makefile Thu Jul 28 22:51:01 2005
@@ -0,0 +1,13 @@
+--- man/Makefile.orig Thu Jul 28 22:49:54 2005
++++ man/Makefile Thu Jul 28 22:50:15 2005
+@@ -17,8 +17,8 @@
+
+
+ install: all
+- install -d $(PREFIX)/share/man/man1
+- install -m 644 $(TARGET) $(PREFIX)/share/man/man1
++ install -d $(PREFIX)/man/man1
++ install -m 644 $(TARGET) $(PREFIX)/man/man1
+
+ uninstall:
+ $(RM) $(PREFIX)/share/man/man1/$(TARGET)
diff -ruN fbpanel.orig/files/patch-plugins-deskno.c fbpanel/files/patch-plugins-deskno.c
--- fbpanel.orig/files/patch-plugins-deskno.c Thu Jul 28 22:16:58 2005
+++ fbpanel/files/patch-plugins-deskno.c Thu Jan 1 01:00:00 1970
@@ -1,14 +0,0 @@
---- plugins/deskno.c~ Sat Dec 18 17:37:12 2004
-+++ plugins/deskno.c Sat Dec 18 17:37:30 2004
-@@ -25,10 +25,10 @@
- static void
- clicked( GtkWidget *widget, gpointer data)
- {
-- ENTER;
- int desknum = get_net_current_desktop();
- int desks = get_net_number_of_desktops();
- int newdesk;
-+ ENTER;
- if(desknum == (desks - 1))
- newdesk = 0;
- else
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507282117.j6SLHIsk003061>