diff options
| -rw-r--r-- | x11/wmdrawer/Makefile | 8 | ||||
| -rw-r--r-- | x11/wmdrawer/distinfo | 2 | ||||
| -rw-r--r-- | x11/wmdrawer/files/patch-Makefile | 47 | ||||
| -rw-r--r-- | x11/wmdrawer/files/patch-wmdrawerrc.example | 14 | ||||
| -rw-r--r-- | x11/wmdrawer/pkg-plist | 2 |
5 files changed, 25 insertions, 48 deletions
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile index 05c48468797d..0da92bf6e50b 100644 --- a/x11/wmdrawer/Makefile +++ b/x11/wmdrawer/Makefile @@ -7,7 +7,7 @@ # PORTNAME= wmdrawer -PORTVERSION= 0.9.17.1 +PORTVERSION= 0.10.0 PORTREVISION= 2 CATEGORIES= x11 windowmaker MASTER_SITES= http://people.easter-eggs.org/~valos/wmdrawer/:tarball \ @@ -26,13 +26,15 @@ USE_REINPLACE= yes USE_X_PREFIX= yes USE_GNOME= gtk20 USE_GMAKE= yes -CFLAGS+= -I${LOCALBASE}/include -MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt" DOCSDIR=${DOCSDIR} +CFLAGS+= -I${LOCALBASE}/include `gdk-pixbuf-config --cflags` +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt `gdk-pixbuf-config --libs` -lgdk_pixbuf_xlib" DOCSDIR=${DOCSDIR} 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 post-install: diff --git a/x11/wmdrawer/distinfo b/x11/wmdrawer/distinfo index f469f99fab4b..2730d9955ce9 100644 --- a/x11/wmdrawer/distinfo +++ b/x11/wmdrawer/distinfo @@ -1,2 +1,2 @@ -MD5 (wmdrawer-0.9.17.1.tar.gz) = bb7cfd5a8d5e6d6ab0920536e17e36d6 +MD5 (wmdrawer-0.10.0.tar.gz) = a12a8ffc04966bf7ddaba2c5ab6a6410 MD5 (daemon.xpm) = 73f0efeba877d8c4b4cc863f1ef87bd5 diff --git a/x11/wmdrawer/files/patch-Makefile b/x11/wmdrawer/files/patch-Makefile index e9dbf2bea460..f7a6a77944f0 100644 --- a/x11/wmdrawer/files/patch-Makefile +++ b/x11/wmdrawer/files/patch-Makefile @@ -1,47 +1,30 @@ ---- Makefile.orig Fri Mar 28 01:08:16 2003 -+++ Makefile Tue Apr 8 02:27:07 2003 -@@ -3,13 +3,13 @@ +--- 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 --DOCDIR = $(PREFIX)/share/doc -+#PREFIX = $(DESTDIR)/usr/local -+#DOCDIR = $(PREFIX)/share/doc ++PREFIX = /usr/X11R6 + DOCDIR = $(PREFIX)/share/doc --USE_GDKPIXBUF = 1 --#USE_GDKPIXBUF2 = 1 -+#USE_GDKPIXBUF = 1 -+USE_GDKPIXBUF2 = 1 - --CC = gcc -+#CC = gcc + USE_GDKPIXBUF = 1 +@@ -19,14 +19,14 @@ ifdef USE_GDKPIXBUF PIXBUF_DEF = -DUSE_GDKPIXBUF -@@ -19,8 +19,8 @@ +-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 += `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 - PRGS = wmdrawer -@@ -40,10 +40,10 @@ - $(RM) *.o $(PRGS) - - install : wmdrawer -- $(INSTALL) -m 755 wmdrawer $(PREFIX)/bin -- $(INSTALL) -m 644 doc/wmdrawer.1x.gz $(PREFIX)/man/man1 -- $(INSTALL) -d $(DOCDIR)/wmdrawer -- $(INSTALL) -m 644 wmdrawerrc.example AUTHORS ChangeLog COPYING INSTALL README TODO $(DOCDIR)/wmdrawer -+ $(BSD_INSTALL_PROGRAM) -m 755 wmdrawer $(PREFIX)/bin -+ $(BSD_INSTALL_DATA) -m 644 doc/wmdrawer.1x.gz $(PREFIX)/man/man1 -+ $(INSTALL) -d $(DOCSDIR) -+ $(BSD_INSTALL_DATA) -m 644 wmdrawerrc.example AUTHORS ChangeLog COPYING INSTALL README TODO $(DOCSDIR) - - uninstall: clean - $(RM) $(PREFIX)/bin/wmdrawer + DEFS += $(PIXBUF_DEF) diff --git a/x11/wmdrawer/files/patch-wmdrawerrc.example b/x11/wmdrawer/files/patch-wmdrawerrc.example index fa0e46f0f913..a854bf4f02c2 100644 --- a/x11/wmdrawer/files/patch-wmdrawerrc.example +++ b/x11/wmdrawer/files/patch-wmdrawerrc.example @@ -1,5 +1,5 @@ ---- wmdrawerrc.example.orig Tue Apr 8 23:36:16 2003 -+++ wmdrawerrc.example Tue Apr 8 23:44:28 2003 +--- wmdrawerrc.example.orig Thu Apr 10 16:36:58 2003 ++++ wmdrawerrc.example Thu Apr 10 16:38:54 2003 @@ -1,7 +1,7 @@ # Config file example for wmdrawer [general] @@ -9,13 +9,3 @@ # Drawer's opening direction [required] # Top to bottom = 0 -@@ -67,8 +67,7 @@ - - # Images directories - [images_paths] --/usr/share/pixmaps --/usr/local/share/pixmaps/ -+%%DATADIR%% - - # 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 ea33366adcc9..2ee05b85a28c 100644 --- a/x11/wmdrawer/pkg-plist +++ b/x11/wmdrawer/pkg-plist @@ -1,3 +1,5 @@ +share/wmdrawer/daemon.xpm +@dirrm share/wmdrawer bin/wmdrawer %%DOCSDIR%%/AUTHORS %%DOCSDIR%%/COPYING |