openbsd-ports/x11/wmmenu/patches/patch-Makefile

$OpenBSD: patch-Makefile,v 1.5 2010/03/26 11:28:15 jasper Exp $
--- Makefile.orig	Sat Mar 23 13:51:36 2002
+++ Makefile	Fri Mar 26 10:00:50 2010
@@ -1,36 +1,29 @@
-prefix = /usr/local
+prefix = ${PREFIX}
 BINDIR = $(prefix)/bin
 MANDIR = $(prefix)/man
-ETCDIR = $(prefix)/etc
+ETCDIR = $(prefix)/share/wmmenu
 
-# comment out both lines to get the old, Xpm-only, version
-GDKPIXBUF = 1
-#GDKPIXBUF2 = 1
+XROOT = ${X11BASE}
+DAROOT = ${LOCALBASE}
 
-XROOT = /usr/X11R6
-DAROOT = /usr/local
-
 # If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command
-ifdef GDKPIXBUF
+.if GDKPIXBUF
 PIXBUF_DEF = -DWITH_GDKPIXBUF
-PIXBUF_INC := $(shell gdk-pixbuf-config --cflags)
-PIXBUF_LIB := -rdynamic -L$(shell gdk-pixbuf-config --prefix)/lib -lgdk_pixbuf_xlib
-endif
+PIXBUF_INC != gdk-pixbuf-config --cflags
+PIXBUF_LIB = -lgdk_pixbuf_xlib -lgtk -lgdk -lgmodule -lglib -lintl -lXext -lX11 -lm -ltiff -ljpeg -lpng -lz
+.endif
 
 # If you want to use gdk-pixbuf-2.0, pass GDKPIXBUF2=1 to make command
-ifdef GDKPIXBUF2
-PIXBUF_CFG = /opt/gtk2/bin/pkg-config gdk-pixbuf-xlib-2.0
-PIXBUF_DEF = -DWITH_GDKPIXBUF
-PIXBUF_INC := $(shell $(PIXBUF_CFG) --cflags)
-PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0
-endif
+.if GDKPIXBUF2
+PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
+PIXBUF_DEF = -DWITH_GDKPIXBUF2
+PIXBUF_INC != pkg-config --cflgas gdk-pixbuf-xlib-2.0
+PIXBUF_LIB = -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0
+.endif
 
-CC = gcc #-g
-CFLAGS = -pipe $(CPPFLAGS) -O2
-CPPFLAGS = -MMD -ansi -pedantic -Wall $(INCDIRS) $(DEFINES)
+CFLAGS += $(INCDIRS) $(DEFINES)
 INCDIRS = -I$(DAROOT)/include -I$(XROOT)/include $(PIXBUF_INC)
 DEFINES = -DETCDIR='"$(ETCDIR)"' $(PIXBUF_DEF)
-LDFLAGS = -s
 LIBDIRS = -L$(DAROOT)/lib -L$(XROOT)/lib $(PIXBUF_LIB)
 LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm
 
@@ -67,4 +60,3 @@ clean :
 	$(RM) *.o *.d core tags $(PRGS)
 
 # dependencies -- do not change lines below
--include *.d
- use gtk+2's gdk_pixbuf ok wilfried@ (MAINTAINER) 2010-03-26 07:28:15 -04:00			$OpenBSD: patch-Makefile,v 1.5 2010/03/26 11:28:15 jasper Exp $
update to wmmenu-1.1 2002-04-19 09:19:19 -04:00			`--- Makefile.orig Sat Mar 23 13:51:36 2002`
- use gtk+2's gdk_pixbuf ok wilfried@ (MAINTAINER) 2010-03-26 07:28:15 -04:00			`+++ Makefile Fri Mar 26 10:00:50 2010`
update to wmmenu-1.1 2002-04-19 09:19:19 -04:00			`@@ -1,36 +1,29 @@`
Import of wmmenu-0.5 A dockapp for Window Maker that provides a pop-up menu of icons that launch applications, like in AfterStep. The program can be run more than once at the same time, which allows many different menus, each one described in a separate file. 2001-04-01 11:17:53 -04:00			`-prefix = /usr/local`
			`+prefix = ${PREFIX}`
			`BINDIR = $(prefix)/bin`
update to wmmenu-0.9 2001-10-29 05:57:27 -05:00			`MANDIR = $(prefix)/man`
Import of wmmenu-0.5 A dockapp for Window Maker that provides a pop-up menu of icons that launch applications, like in AfterStep. The program can be run more than once at the same time, which allows many different menus, each one described in a separate file. 2001-04-01 11:17:53 -04:00			`-ETCDIR = $(prefix)/etc`
			`+ETCDIR = $(prefix)/share/wmmenu`

update to wmmenu-1.1 2002-04-19 09:19:19 -04:00			`-# comment out both lines to get the old, Xpm-only, version`
Import of wmmenu-0.5 A dockapp for Window Maker that provides a pop-up menu of icons that launch applications, like in AfterStep. The program can be run more than once at the same time, which allows many different menus, each one described in a separate file. 2001-04-01 11:17:53 -04:00			`-GDKPIXBUF = 1`
update to wmmenu-1.1 2002-04-19 09:19:19 -04:00			`-#GDKPIXBUF2 = 1`
Import of wmmenu-0.5 A dockapp for Window Maker that provides a pop-up menu of icons that launch applications, like in AfterStep. The program can be run more than once at the same time, which allows many different menus, each one described in a separate file. 2001-04-01 11:17:53 -04:00			`+XROOT = ${X11BASE}`
			`+DAROOT = ${LOCALBASE}`

- regen 2010-03-26 04:51:44 -04:00			`-XROOT = /usr/X11R6`
			`-DAROOT = /usr/local`
			`-`
Import of wmmenu-0.5 A dockapp for Window Maker that provides a pop-up menu of icons that launch applications, like in AfterStep. The program can be run more than once at the same time, which allows many different menus, each one described in a separate file. 2001-04-01 11:17:53 -04:00			`# If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command`
			`-ifdef GDKPIXBUF`
update to wmmenu-1.1 2002-04-19 09:19:19 -04:00			`+.if GDKPIXBUF`
Import of wmmenu-0.5 A dockapp for Window Maker that provides a pop-up menu of icons that launch applications, like in AfterStep. The program can be run more than once at the same time, which allows many different menus, each one described in a separate file. 2001-04-01 11:17:53 -04:00			`PIXBUF_DEF = -DWITH_GDKPIXBUF`
			`-PIXBUF_INC := $(shell gdk-pixbuf-config --cflags)`
			`-PIXBUF_LIB := -rdynamic -L$(shell gdk-pixbuf-config --prefix)/lib -lgdk_pixbuf_xlib`
			`-endif`
update to wmmenu-1.1 2002-04-19 09:19:19 -04:00			`+PIXBUF_INC != gdk-pixbuf-config --cflags`
			`+PIXBUF_LIB = -lgdk_pixbuf_xlib -lgtk -lgdk -lgmodule -lglib -lintl -lXext -lX11 -lm -ltiff -ljpeg -lpng -lz`
			`+.endif`

			`# If you want to use gdk-pixbuf-2.0, pass GDKPIXBUF2=1 to make command`
			`-ifdef GDKPIXBUF2`
- use gtk+2's gdk_pixbuf ok wilfried@ (MAINTAINER) 2010-03-26 07:28:15 -04:00			`-PIXBUF_CFG = /opt/gtk2/bin/pkg-config gdk-pixbuf-xlib-2.0`
			`-PIXBUF_DEF = -DWITH_GDKPIXBUF`
			`-PIXBUF_INC := $(shell $(PIXBUF_CFG) --cflags)`
			`-PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0`
update to wmmenu-1.1 2002-04-19 09:19:19 -04:00			`-endif`
- use gtk+2's gdk_pixbuf ok wilfried@ (MAINTAINER) 2010-03-26 07:28:15 -04:00			`+.if GDKPIXBUF2`
			`+PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0`
			`+PIXBUF_DEF = -DWITH_GDKPIXBUF2`
			`+PIXBUF_INC != pkg-config --cflgas gdk-pixbuf-xlib-2.0`
			`+PIXBUF_LIB = -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0`
update to wmmenu-1.1 2002-04-19 09:19:19 -04:00			`+.endif`

Import of wmmenu-0.5 A dockapp for Window Maker that provides a pop-up menu of icons that launch applications, like in AfterStep. The program can be run more than once at the same time, which allows many different menus, each one described in a separate file. 2001-04-01 11:17:53 -04:00			`-CC = gcc #-g`
			`-CFLAGS = -pipe $(CPPFLAGS) -O2`
			`-CPPFLAGS = -MMD -ansi -pedantic -Wall $(INCDIRS) $(DEFINES)`
			`+CFLAGS += $(INCDIRS) $(DEFINES)`
			`INCDIRS = -I$(DAROOT)/include -I$(XROOT)/include $(PIXBUF_INC)`
			`DEFINES = -DETCDIR='"$(ETCDIR)"' $(PIXBUF_DEF)`
			`-LDFLAGS = -s`
			`LIBDIRS = -L$(DAROOT)/lib -L$(XROOT)/lib $(PIXBUF_LIB)`
			`LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm`

update to wmmenu-1.1 2002-04-19 09:19:19 -04:00			`@@ -67,4 +60,3 @@ clean :`
Import of wmmenu-0.5 A dockapp for Window Maker that provides a pop-up menu of icons that launch applications, like in AfterStep. The program can be run more than once at the same time, which allows many different menus, each one described in a separate file. 2001-04-01 11:17:53 -04:00			`$(RM) .o .d core tags $(PRGS)`

			`# dependencies -- do not change lines below`
			`--include *.d`