diff options
| -rw-r--r-- | x11/wmdrawer/Makefile | 22 | ||||
| -rw-r--r-- | x11/wmdrawer/distinfo | 2 | ||||
| -rw-r--r-- | x11/wmdrawer/files/patch-Makefile | 30 | ||||
| -rw-r--r-- | x11/wmdrawer/files/patch-wmdrawerrc.example | 14 | ||||
| -rw-r--r-- | x11/wmdrawer/pkg-plist | 4 |
5 files changed, 26 insertions, 46 deletions
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile index 02207ed..7ebd16f 100644 --- a/x11/wmdrawer/Makefile +++ b/x11/wmdrawer/Makefile @@ -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> diff --git a/x11/wmdrawer/distinfo b/x11/wmdrawer/distinfo index 2730d99..02762d3 100644 --- a/x11/wmdrawer/distinfo +++ b/x11/wmdrawer/distinfo @@ -1,2 +1,2 @@ MD5 (wmdrawer-0.10.0.tar.gz) = a12a8ffc04966bf7ddaba2c5ab6a6410 -MD5 (daemon.xpm) = 73f0efeba877d8c4b4cc863f1ef87bd5 +MD5 (daemon.png) = 06f903b8a644c8c523833747948b54eb diff --git a/x11/wmdrawer/files/patch-Makefile b/x11/wmdrawer/files/patch-Makefile deleted file mode 100644 index f7a6a77..0000000 --- a/x11/wmdrawer/files/patch-Makefile +++ /dev/null @@ -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) diff --git a/x11/wmdrawer/files/patch-wmdrawerrc.example b/x11/wmdrawer/files/patch-wmdrawerrc.example index a854bf4..22c3be0 100644 --- a/x11/wmdrawer/files/patch-wmdrawerrc.example +++ b/x11/wmdrawer/files/patch-wmdrawerrc.example @@ -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: diff --git a/x11/wmdrawer/pkg-plist b/x11/wmdrawer/pkg-plist index 2ee05b8..3ec2f70 100644 --- a/x11/wmdrawer/pkg-plist +++ b/x11/wmdrawer/pkg-plist @@ -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 @@ bin/wmdrawer %%DOCSDIR%%/TODO %%DOCSDIR%%/wmdrawerrc.example @dirrm %%DOCSDIR%% +@dirrm %%DATADIR%% |
