ports/51678: x11/wmdrawer uses transparent icon now

[Josef El-Rayes]

>Number:         51678
>Category:       ports
>Synopsis:       x11/wmdrawer uses transparent icon now
>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 May 01 16:20:10 PDT 2003
>Closed-Date:
>Last-Modified:
>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 at 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 at 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
- at 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%%
+ at dirrm %%DATADIR%%
--- wmdrawer.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: