From shammer@daemon.li  Thu May  1 16:14:03 2003
Return-Path: <shammer@daemon.li>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 77DBE37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 May 2003 16:14:03 -0700 (PDT)
Received: from mail.ac-net.at (secure.ac-net.at [212.24.125.8])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E68C243FD7
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 May 2003 16:14:01 -0700 (PDT)
	(envelope-from shammer@daemon.li)
Received: from localhost (server.ac-net.at [127.0.0.1])
	by mail.ac-net.at (AC-net Mailserver v1.3a) with ESMTP id 55CB63F49
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  2 May 2003 01:13:59 +0200 (CEST)
Received: from daemon.li (dsl-153-76.utaonline.at [62.218.153.76])
	by mail.ac-net.at (AC-net Mailserver v1.3a) with SMTP id A3D433F36
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 May 2003 23:13:57 +0000 (UTC)
Received: (qmail 38000 invoked from network); 1 May 2003 23:15:03 -0000
Received: from localhost (HELO daemon.li) (127.0.0.1)
  by localhost with SMTP; 1 May 2003 23:15:03 -0000
Received: (from root@localhost)
	by daemon.li (8.12.6/8.12.7/Submit) id h41NF3Dq037998;
	Fri, 2 May 2003 01:15:03 +0200 (CEST)
	(envelope-from shammer)
Message-Id: <200305012315.h41NF3Dq037998@daemon.li>
Date: Fri, 2 May 2003 01:15:03 +0200 (CEST)
From: Josef El-Rayes <j.el-rayes@daemon.li>
Reply-To: Josef El-Rayes <j.el-rayes@daemon.li>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: x11/wmdrawer uses transparent icon now
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         51678
>Category:       ports
>Synopsis:       x11/wmdrawer uses transparent icon now
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    arved
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 01 16:20:10 PDT 2003
>Closed-Date:    Mon Jun 30 06:30:04 PDT 2003
>Last-Modified:  Mon Jun 30 06:30:04 PDT 2003
>Originator:     Josef El-Rayes
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD daemon.li 4.8-STABLE FreeBSD 4.8-STABLE #5: Fri Apr 4 16:16:24 CEST 2003 shammer@daemon.li:/usr/obj/usr/src/sys/CUSTOM i386


	
>Description:
i replaced daemon icon with a transparent version. also did some minor fixes
(replaced patch with a reinplace line i.e.)
	
>How-To-Repeat:
	
>Fix:

	

--- wmdrawer.diff begins here ---
diff -ru /usr/ports/x11/wmdrawer/Makefile wmdrawer/Makefile
--- /usr/ports/x11/wmdrawer/Makefile	Wed Apr 23 14:39:51 2003
+++ wmdrawer/Makefile	Fri May  2 01:03:27 2003
@@ -3,7 +3,7 @@
 # Date created:			Apr 6, 2003
 # Whom:				ijliao
 #
-# $FreeBSD: ports/x11/wmdrawer/Makefile,v 1.5 2003/04/23 12:39:51 arved Exp $
+# $FreeBSD: ports/x11/wmdrawer/Makefile,v 1.3 2003/04/08 15:49:56 ijliao Exp $
 #
 
 PORTNAME=	wmdrawer
@@ -14,7 +14,7 @@
 		http://www.daemon.li/downloads/:pixmap
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${EXTRACT_ONLY}:tarball \
-		daemon.xpm:pixmap
+		daemon.png:pixmap
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	j.el-rayes@daemon.li
@@ -26,19 +26,19 @@
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20 gdkpixbuf
 USE_GMAKE=	yes
-CFLAGS+=	-I${LOCALBASE}/include `gdk-pixbuf-config --cflags`
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt `gdk-pixbuf-config --libs` -lgdk_pixbuf_xlib" DOCSDIR=${DOCSDIR}
+CFLAGS+=	-O -I${LOCALBASE}/include
 
 MANCOMPRESSED=	yes
 MAN1=	wmdrawer.1x
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,/usr/X11R6,${X11BASE},g" ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s,$$[(]DESTDIR[)]/usr/local,${PREFIX},g" ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR},g" ${WRKSRC}/wmdrawerrc.example
+	@${REINPLACE_CMD} -e "s,CFLAGS =,CFLAGS +=,g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s,LDFLAGS = ,LDFLAGS += -lgnugetopt ,g" ${WRKSRC}/Makefile
 
 post-install:
 	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${DISTDIR}/daemon.xpm ${DATADIR}
+	${INSTALL_DATA} ${DISTDIR}/daemon.png ${DATADIR}
 
 .include <bsd.port.mk>
Only in /usr/ports/x11/wmdrawer/: Makefile.orig
Only in /usr/ports/x11/wmdrawer/: Makefile~
diff -ru /usr/ports/x11/wmdrawer/distinfo wmdrawer/distinfo
--- /usr/ports/x11/wmdrawer/distinfo	Sun Apr 13 14:55:42 2003
+++ wmdrawer/distinfo	Fri May  2 00:16:52 2003
@@ -1,2 +1,2 @@
 MD5 (wmdrawer-0.10.0.tar.gz) = a12a8ffc04966bf7ddaba2c5ab6a6410
-MD5 (daemon.xpm) = 73f0efeba877d8c4b4cc863f1ef87bd5
+MD5 (daemon.png) = 06f903b8a644c8c523833747948b54eb
Only in /usr/ports/x11/wmdrawer/files: patch-Makefile
diff -ru /usr/ports/x11/wmdrawer/files/patch-wmdrawerrc.example wmdrawer/files/patch-wmdrawerrc.example
--- /usr/ports/x11/wmdrawer/files/patch-wmdrawerrc.example	Sun Apr 13 14:55:42 2003
+++ wmdrawer/files/patch-wmdrawerrc.example	Fri May  2 00:42:23 2003
@@ -1,11 +1,19 @@
---- wmdrawerrc.example.orig	Thu Apr 10 16:36:58 2003
-+++ wmdrawerrc.example	Thu Apr 10 16:38:54 2003
+--- wmdrawerrc.example.orig	Tue Apr  8 04:00:08 2003
++++ wmdrawerrc.example	Fri May  2 00:41:14 2003
 @@ -1,7 +1,7 @@
  # Config file example for wmdrawer
  [general]
  # Dock's icon [optional]
 -#dock_icon	panel-drawer.png
-+dock_icon	daemon.xpm
++dock_icon	daemon.png
  
  # Drawer's opening direction [required]
  # Top to bottom = 0
+@@ -75,6 +75,7 @@
+ [images_paths]
+ /usr/share/pixmaps
+ /usr/local/share/pixmaps/
++/usr/X11R6/share/wmdrawer
+ 
+ # A first column with 5 buttons
+ # Each button must be defined with this syntax:
Only in /usr/ports/x11/wmdrawer/files: patch-wmdrawerrc.example~
diff -ru /usr/ports/x11/wmdrawer/pkg-plist wmdrawer/pkg-plist
--- /usr/ports/x11/wmdrawer/pkg-plist	Sun Apr 13 14:55:42 2003
+++ wmdrawer/pkg-plist	Fri May  2 00:55:27 2003
@@ -1,6 +1,5 @@
-share/wmdrawer/daemon.xpm
-@dirrm share/wmdrawer
 bin/wmdrawer
+%%DATADIR%%/daemon.png
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/ChangeLog
@@ -9,3 +8,4 @@
 %%DOCSDIR%%/TODO
 %%DOCSDIR%%/wmdrawerrc.example
 @dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%
--- wmdrawer.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->arved 
Responsible-Changed-By: arved 
Responsible-Changed-When: Fri May 9 08:21:45 PDT 2003 
Responsible-Changed-Why:  
i'll handle this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=51678 

From: Tilman Linneweh <arved@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, j.el-rayes@daemon.li
Cc:  
Subject: Re: ports/51678: x11/wmdrawer uses transparent icon now
Date: Fri, 9 May 2003 17:28:57 +0200

 Don't use hardcoded CFLAGS!
 
 Ok, how about the following diff.
 Additional Changes:
 
 * USE_GETOPT_LONG
 * Depend on gtk12 instead of gtk20, because gtk20 dependency was bogus. 
 wmdrawer can be built with both, but you have to
 set the USE_GDKPIXBUF Variables in the Makefile. Default is gtk12. I tried 
 gtk20, but it failed, because of GError undeclared. You might want to try to
 fix this.
 * Improved the REINPLACE stuff.
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/x11/wmdrawer/Makefile,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile
 --- Makefile	23 Apr 2003 12:39:51 -0000	1.5
 +++ Makefile	9 May 2003 15:17:00 -0000
 @@ -8,37 +8,39 @@
  
  PORTNAME=	wmdrawer
  PORTVERSION=	0.10.0
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	x11 windowmaker
  MASTER_SITES=	http://people.easter-eggs.org/~valos/wmdrawer/:tarball \
  		http://www.daemon.li/downloads/:pixmap
  DISTNAME=	${PORTNAME}-${PORTVERSION}
  DISTFILES=	${EXTRACT_ONLY}:tarball \
 -		daemon.xpm:pixmap
 +		daemon.png:pixmap
  EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
  
  MAINTAINER=	j.el-rayes@daemon.li
  COMMENT=	A dockapp which provides a drawer to launch applications
  
 -LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 -
  USE_REINPLACE=	yes
 +USE_GETOPT_LONG=yes
  USE_X_PREFIX=	yes
 -USE_GNOME=	gtk20 gdkpixbuf
 +USE_GNOME=	gtk12 gdkpixbuf
  USE_GMAKE=	yes
 -CFLAGS+=	-I${LOCALBASE}/include `gdk-pixbuf-config --cflags`
 -CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt `gdk-pixbuf-config 
 --libs` -lgdk_pixbuf_xlib" DOCSDIR=${DOCSDIR}
 +CONFIGURE_ENV+=	DOCSDIR=${DOCSDIR}
 +MAKE_ENV+=	${CONFIGURE_ENV}
  
  MANCOMPRESSED=	yes
  MAN1=	wmdrawer.1x
  
  post-patch:
 -	@${REINPLACE_CMD} -e "s,/usr/X11R6,${X11BASE},g" ${WRKSRC}/Makefile
 -	@${REINPLACE_CMD} -e "s,$$[(]DESTDIR[)]/usr/local,${PREFIX},g" 
 ${WRKSRC}/Makefile
  	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR},g" 
 ${WRKSRC}/wmdrawerrc.example
 +	@${REINPLACE_CMD} -e "s,CFLAGS = -O3,CFLAGS +=,g; \
 +		s,LDFLAGS =,LDFLAGS+=,g; s,PREFIX =,#PREFIX =,g; \
 +		s,$$[(]DESTDIR[)]/usr/local,${PREFIX},g; \
 +		s,CC =,#CC =,g; \
 +		s,/usr/X11R6,${X11BASE},g" ${WRKSRC}/Makefile
  
  post-install:
  	@${MKDIR} ${DATADIR}
 -	${INSTALL_DATA} ${DISTDIR}/daemon.xpm ${DATADIR}
 +	${INSTALL_DATA} ${DISTDIR}/daemon.png ${DATADIR}
  
  .include <bsd.port.mk>
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/x11/wmdrawer/distinfo,v
 retrieving revision 1.3
 diff -u -r1.3 distinfo
 --- distinfo	13 Apr 2003 12:55:42 -0000	1.3
 +++ distinfo	9 May 2003 14:01:02 -0000
 @@ -1,2 +1,2 @@
  MD5 (wmdrawer-0.10.0.tar.gz) = a12a8ffc04966bf7ddaba2c5ab6a6410
 -MD5 (daemon.xpm) = 73f0efeba877d8c4b4cc863f1ef87bd5
 +MD5 (daemon.png) = 06f903b8a644c8c523833747948b54eb
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/x11/wmdrawer/pkg-plist,v
 retrieving revision 1.2
 diff -u -r1.2 pkg-plist
 --- pkg-plist	13 Apr 2003 12:55:42 -0000	1.2
 +++ pkg-plist	9 May 2003 14:01:08 -0000
 @@ -1,6 +1,5 @@
 -share/wmdrawer/daemon.xpm
 -@dirrm share/wmdrawer
  bin/wmdrawer
 +%%DATADIR%%/daemon.png
  %%DOCSDIR%%/AUTHORS
  %%DOCSDIR%%/COPYING
  %%DOCSDIR%%/ChangeLog
 @@ -9,3 +8,4 @@
  %%DOCSDIR%%/TODO
  %%DOCSDIR%%/wmdrawerrc.example
  @dirrm %%DOCSDIR%%
 +@dirrm %%DATADIR%%
 Index: files/patch-Makefile
 ===================================================================
 RCS file: files/patch-Makefile
 diff -N files/patch-Makefile
 --- files/patch-Makefile	13 Apr 2003 12:55:42 -0000	1.3
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,30 +0,0 @@
 ---- Makefile.orig	Sun Apr 13 13:24:15 2003
 -+++ Makefile	Sun Apr 13 13:25:41 2003
 -@@ -9,7 +9,7 @@
 - 
 - DESTDIR =
 - 
 --PREFIX = $(DESTDIR)/usr/local
 -+PREFIX = /usr/X11R6
 - DOCDIR = $(PREFIX)/share/doc
 - 
 - USE_GDKPIXBUF = 1
 -@@ -19,14 +19,14 @@
 - 
 - ifdef USE_GDKPIXBUF
 - PIXBUF_DEF = -DUSE_GDKPIXBUF
 --CFLAGS = -O3 -Wall `gdk-pixbuf-config --cflags`
 --LDFLAGS = `gdk-pixbuf-config --libs` -lgdk_pixbuf_xlib
 -+CFLAGS = -O -Wall `gdk-pixbuf-config --cflags`
 -+LDFLAGS = -lgnugetopt `gdk-pixbuf-config --libs` -lgdk_pixbuf_xlib
 - endif
 - 
 - ifdef USE_GDKPIXBUF2
 - PIXBUF_DEF = -DUSE_GDKPIXBUF2
 --CFLAGS = -O3  -Wall `pkg-config --cflags gdk-pixbuf-xlib-2.0` 
 -I/usr/X11R6/include
 --LDFLAGS = `pkg-config --libs gdk-pixbuf-xlib-2.0` -rdynamic -lX11 -lXi 
 -lXext -L/usr/X11R6/lib
 -+CFLAGS = -O  -Wall `pkg-config --cflags gdk-pixbuf-xlib-2.0` 
 -I/usr/X11R6/include
 -+LDFLAGS = -lgnugetopt `pkg-config --libs gdk-pixbuf-xlib-2.0` -rdynamic 
 -lX11 -lXi -lXext -L/usr/X11R6/lib
 - endif
 - 
 - DEFS += $(PIXBUF_DEF)
 Index: files/patch-wmdrawerrc.example
 ===================================================================
 RCS file: /home/ncvs/ports/x11/wmdrawer/files/patch-wmdrawerrc.example,v
 retrieving revision 1.2
 diff -u -r1.2 patch-wmdrawerrc.example
 --- files/patch-wmdrawerrc.example	13 Apr 2003 12:55:42 -0000	1.2
 +++ files/patch-wmdrawerrc.example	9 May 2003 14:01:08 -0000
 @@ -1,11 +1,19 @@
 ---- wmdrawerrc.example.orig	Thu Apr 10 16:36:58 2003
 -+++ wmdrawerrc.example	Thu Apr 10 16:38:54 2003
 +--- wmdrawerrc.example.orig	Tue Apr  8 04:00:08 2003
 ++++ wmdrawerrc.example	Fri May  2 00:41:14 2003
  @@ -1,7 +1,7 @@
   # Config file example for wmdrawer
   [general]
   # Dock's icon [optional]
  -#dock_icon	panel-drawer.png
 -+dock_icon	daemon.xpm
 ++dock_icon	daemon.png
   
   # Drawer's opening direction [required]
   # Top to bottom = 0
 +@@ -75,6 +75,7 @@
 + [images_paths]
 + /usr/share/pixmaps
 + /usr/local/share/pixmaps/
 ++/usr/X11R6/share/wmdrawer
 + 
 + # A first column with 5 buttons
 + # Each button must be defined with this syntax:
State-Changed-From-To: open->closed 
State-Changed-By: arved 
State-Changed-When: Mon Jun 30 06:29:56 PDT 2003 
State-Changed-Why:  
Committed, 

http://www.freebsd.org/cgi/query-pr.cgi?pr=51678 
>Unformatted:
