cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to wmmenu-1.1

Browse Source
This commit is contained in:
wilfried 2002-04-19 13:19:19 +00:00
parent 4a6074040c
commit bf83c747f6
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/wmmenu/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.4 2002/03/21 21:25:56 espie Exp $ # $OpenBSD: Makefile,v 1.5 2002/04/19 13:19:19 wilfried Exp $
COMMENT= 'wm-dockapp; A popup menu of icons that launch programs' COMMENT= 'wm-dockapp; A popup menu of icons that launch programs'
DISTNAME= wmmenu-0.9 DISTNAME= wmmenu-1.1
CATEGORIES= x11 x11/windowmaker CATEGORIES= x11 x11/windowmaker
NEED_VERSION= 1.515 NEED_VERSION= 1.515
@ -10,6 +10,7 @@ HOMEPAGE= http://www.fcoutant.freesurf.fr/wmmenu.html
MAINTAINER= Peter Stromberg <wilfried@openbsd.org> MAINTAINER= Peter Stromberg <wilfried@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes

6
x11/wmmenu/distinfo
View File

@ -1,3 +1,3 @@
MD5 (wmmenu-0.9.tar.gz) = cc1314f6a33547aee4dad832bbdf5cd8 MD5 (wmmenu-1.1.tar.gz) = 13fa367e0c384fa97048827756654b34
RMD160 (wmmenu-0.9.tar.gz) = ec5be5020db68cb6a1e7464a62f832c7a7695980 RMD160 (wmmenu-1.1.tar.gz) = 043ac020dab8367ffd1cfe3ea7c760d0f49147bb
SHA1 (wmmenu-0.9.tar.gz) = 47abe68aefa0c908386069ffb16fb2e0f9b8d548 SHA1 (wmmenu-1.1.tar.gz) = 81c28c5f3eeccbb90f5a36c5bf9fe6916322a205

36
x11/wmmenu/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.2 2001/10/29 10:57:27 wilfried Exp $ $OpenBSD: patch-Makefile,v 1.3 2002/04/19 13:19:19 wilfried Exp $
--- Makefile.orig Sun Oct 21 09:19:36 2001 --- Makefile.orig Sat Mar 23 13:51:36 2002
+++ Makefile Mon Oct 29 11:39:14 2001 +++ Makefile Fri Apr 19 15:02:52 2002
@@ -1,27 +1,23 @@ @@ -1,36 +1,29 @@
-prefix = /usr/local -prefix = /usr/local
+prefix = ${PREFIX} +prefix = ${PREFIX}
BINDIR = $(prefix)/bin BINDIR = $(prefix)/bin
@ -9,9 +9,10 @@ $OpenBSD: patch-Makefile,v 1.2 2001/10/29 10:57:27 wilfried Exp $
-ETCDIR = $(prefix)/etc -ETCDIR = $(prefix)/etc
+ETCDIR = $(prefix)/share/wmmenu +ETCDIR = $(prefix)/share/wmmenu
# comment out to get the old, Xpm-only, version -# comment out both lines to get the old, Xpm-only, version
-GDKPIXBUF = 1 -GDKPIXBUF = 1
-#GDKPIXBUF2 = 1
-
-XROOT = /usr/X11R6 -XROOT = /usr/X11R6
-DAROOT = /usr/local -DAROOT = /usr/local
+XROOT = ${X11BASE} +XROOT = ${X11BASE}
@ -19,19 +20,28 @@ $OpenBSD: patch-Makefile,v 1.2 2001/10/29 10:57:27 wilfried Exp $
# If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command # If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command
-ifdef GDKPIXBUF -ifdef GDKPIXBUF
+.if defined(GDKPIXBUF) +.if GDKPIXBUF
PIXBUF_DEF = -DWITH_GDKPIXBUF PIXBUF_DEF = -DWITH_GDKPIXBUF
-PIXBUF_INC := $(shell gdk-pixbuf-config --cflags) -PIXBUF_INC := $(shell gdk-pixbuf-config --cflags)
-PIXBUF_LIB := -rdynamic -L$(shell gdk-pixbuf-config --prefix)/lib -lgdk_pixbuf_xlib -PIXBUF_LIB := -rdynamic -L$(shell gdk-pixbuf-config --prefix)/lib -lgdk_pixbuf_xlib
-endif -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
+.if 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
+.endif
-CC = gcc #-g -CC = gcc #-g
-CFLAGS = -pipe $(CPPFLAGS) -O2 -CFLAGS = -pipe $(CPPFLAGS) -O2
-CPPFLAGS = -MMD -ansi -pedantic -Wall $(INCDIRS) $(DEFINES) -CPPFLAGS = -MMD -ansi -pedantic -Wall $(INCDIRS) $(DEFINES)
+PIXBUF_INC != gdk-pixbuf-config --cflags
+PIXBUF_LIB = -lgdk_pixbuf_xlib -lgdk -lgmodule -lglib -lintl -ltiff -lpng -ljpeg -lz
+.endif
+
+CFLAGS += $(INCDIRS) $(DEFINES) +CFLAGS += $(INCDIRS) $(DEFINES)
INCDIRS = -I$(DAROOT)/include -I$(XROOT)/include $(PIXBUF_INC) INCDIRS = -I$(DAROOT)/include -I$(XROOT)/include $(PIXBUF_INC)
DEFINES = -DETCDIR='"$(ETCDIR)"' $(PIXBUF_DEF) DEFINES = -DETCDIR='"$(ETCDIR)"' $(PIXBUF_DEF)
@ -39,7 +49,7 @@ $OpenBSD: patch-Makefile,v 1.2 2001/10/29 10:57:27 wilfried Exp $
LIBDIRS = -L$(DAROOT)/lib -L$(XROOT)/lib $(PIXBUF_LIB) LIBDIRS = -L$(DAROOT)/lib -L$(XROOT)/lib $(PIXBUF_LIB)
LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm
@@ -58,4 +54,3 @@ clean : @@ -67,4 +60,3 @@ clean :
$(RM) *.o *.d core tags $(PRGS) $(RM) *.o *.d core tags $(PRGS)
# dependencies -- do not change lines below # dependencies -- do not change lines below