diff options
author | xtraeme <xtraeme> | 2005-09-04 06:05:20 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2005-09-04 06:05:20 +0000 |
commit | 9317d62dd884eed15d117a6e876294d67ad47d65 (patch) | |
tree | 194ad189cdb9dd2678c34228e077c73e32814222 /wm/windowlab/patches | |
parent | d46dd8a120e7f2ad93bd7ff0da07a208bd1df768 (diff) | |
download | pkgsrc-9317d62dd884eed15d117a6e876294d67ad47d65.tar.gz |
Updated wm/windowlab to 1.32.
Lots of changes and bugs were fixed, see changelog for more info.
Diffstat (limited to 'wm/windowlab/patches')
-rw-r--r-- | wm/windowlab/patches/patch-aa | 52 | ||||
-rw-r--r-- | wm/windowlab/patches/patch-ab | 20 |
2 files changed, 47 insertions, 25 deletions
diff --git a/wm/windowlab/patches/patch-aa b/wm/windowlab/patches/patch-aa index 4700f93425c..62a4d67b3ec 100644 --- a/wm/windowlab/patches/patch-aa +++ b/wm/windowlab/patches/patch-aa @@ -1,20 +1,20 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/09/02 07:24:00 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2005/09/04 06:05:20 xtraeme Exp $ ---- Makefile.orig 2003-04-19 14:19:28.000000000 +0200 -+++ Makefile 2003-05-16 01:55:05.000000000 +0200 +--- Makefile.orig 2005-09-04 07:44:29.000000000 +0200 ++++ Makefile 2005-09-04 07:47:12.000000000 +0200 @@ -6,7 +6,7 @@ # Information about the location of the menurc file ifndef MENURC --MENURC = /etc/X11/windowlab/menurc -+MENURC = ${PKG_SYSCONFDIR}/menurc +-MENURC = /etc/X11/windowlab/windowlab.menurc ++MENURC = ${PKG_SYSCONFDIR}/windowlab.menurc endif DEFINES += -DDEF_MENURC="\"$(MENURC)\"" -@@ -15,27 +15,26 @@ +@@ -15,28 +15,28 @@ # Uncomment to add freetype support (requires XFree86 4.0.2 or later) - # This needs -lXext above, even if you have disabled shape support. + # This needs -lXext above, even if you have disabled shape support -#DEFINES += -DXFT -#EXTRA_INC += `pkg-config --cflags xft` -#EXTRA_LIBS += `pkg-config --libs xft` @@ -25,35 +25,37 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/09/02 07:24:00 xtraeme Exp $ # Uncomment for debugging info (abandon all hope, ye who enter here) #DEFINES += -DDEBUG - # This should be set to the location of the X installation you want to - # compile against. + # Set this to the location of the X installation you want to compile against -XROOT = /usr/X11R6 +XROOT = ${PREFIX} # -------------------------------------------------------------------- --CC = gcc --CFLAGS = -g -O2 -Wall -+#CC = gcc -+CFLAGS += -g -O2 -Wall +-CC = gcc ++#CC = gcc + ifndef CFLAGS + CFLAGS = -g -O2 -Wall -W + endif - BINDIR = $(DESTDIR)$(XROOT)/bin - MANDIR = $(DESTDIR)$(XROOT)/man/man1 --CFGDIR = $(DESTDIR)/etc/X11/windowlab + BINDIR = $(DESTDIR)$(XROOT)/bin + MANDIR = $(DESTDIR)$(XROOT)/man/man1 +-CFGDIR = $(DESTDIR)/etc/X11/windowlab ++#CFGDIR = $(DESTDIR)/etc/X11/windowlab INCLUDES = -I$(XROOT)/include $(EXTRA_INC) --LDPATH = -L$(XROOT)/lib -+LDPATH = ${LDFLAGS} - LIBS = -lX11 $(EXTRA_LIBS) +-LDPATH = -L$(XROOT)/lib ++LDPATH = ${LDFLAGS} + LIBS = -lX11 $(EXTRA_LIBS) - PROG = windowlab -@@ -52,10 +51,8 @@ + PROG = windowlab +@@ -53,9 +53,10 @@ $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ install: all -- install -s $(PROG) $(BINDIR) -- install -m 644 $(MANPAGE) $(MANDIR) -- gzip -9vf $(MANDIR)/$(MANPAGE) -- mkdir -p $(CFGDIR) && cp menurc.sample $(CFGDIR)/menurc +- mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR) +- mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vf $(MANDIR)/$(MANPAGE) +- mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc ++ ${BSD_INSTALL_PROGRAM_DIR} $(BINDIR) ++ ${BSD_INSTALL_MAN_DIR} $(MANDIR) + ${BSD_INSTALL_PROGRAM} $(PROG) $(BINDIR) + ${BSD_INSTALL_MAN} $(MANPAGE) $(MANDIR)/windowlab.1 diff --git a/wm/windowlab/patches/patch-ab b/wm/windowlab/patches/patch-ab new file mode 100644 index 00000000000..56297b6540e --- /dev/null +++ b/wm/windowlab/patches/patch-ab @@ -0,0 +1,20 @@ +$NetBSD: patch-ab,v 1.1 2005/09/04 06:05:20 xtraeme Exp $ + +--- menufile.c.orig 2005-09-04 07:57:21.000000000 +0200 ++++ menufile.c 2005-09-04 07:57:40.000000000 +0200 +@@ -44,6 +44,7 @@ + #endif + if ((menufile = fopen(menurcpath, "r")) == NULL) + { ++#ifdef __linux__ + // get location of the executable + if (readlink("/proc/self/exe", menurcpath, PATH_MAX) == -1) + { +@@ -51,6 +52,7 @@ + menurcpath[0] = '.'; + menurcpath[1] = '\0'; + } ++#endif + *(strrchr(menurcpath, '/')) = '\0'; + *(strrchr(menurcpath, '/')) = '\0'; + strncat(menurcpath, "/etc/windowlab.menurc", PATH_MAX); |