Date: Thu, 27 Jun 2002 01:11:17 -0700 (PDT) From: Jeremy Karlson <karlj000@unbc.ca> To: <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/39917: Update Port: x11/wmmenu 0.9 -> 1.2 Message-ID: <Pine.LNX.4.33.0206270110570.10638-100000@ugrad.unbc.ca>
next in thread | raw e-mail | index | archive | help
>Number: 39917 >Category: ports >Synopsis: Update Port: x11/wmmenu 0.9 -> 1.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jun 27 01:20:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Jeremy Karlson >Release: FreeBSD 4.5-STABLE i386 >Organization: >Environment: System: FreeBSD lucretia.karlson.ca 4.5-STABLE FreeBSD 4.5-STABLE #1: Thu Mar 7 17:28:13 PST 2002 carpathia@lucretia.karlson.ca:/usr/obj/usr/src/sys/LUCRETIA i386 >Description: Update of port x11/wmmenu, from version 0.9 to version 1.2. >How-To-Repeat: >Fix: Apply the following diff to /usr/ports/x11/wmmenu. (Note that files/patch-ad has been removed from the port in the new version.) diff -ruN wmmenu.0.9/Makefile wmmenu/Makefile --- wmmenu.0.9/Makefile Wed Jun 26 18:52:17 2002 +++ wmmenu/Makefile Thu Jun 27 01:05:52 2002 @@ -6,7 +6,7 @@ # PORTNAME= wmmenu -PORTVERSION= 0.9 +PORTVERSION= 1.2 CATEGORIES= x11 gnome MASTER_SITES= http://www.fcoutant.freesurf.fr/download/ @@ -22,18 +22,17 @@ MAN1= wmmenu.1 post-patch: - @ ${MV} ${WRKSRC}/example/defaults ${WRKSRC}/example/defaults.presed - @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' ${WRKSRC}/example/defaults.presed \ + @${MV} ${WRKSRC}/example/defaults ${WRKSRC}/example/defaults.presed + @${SED} -e 's#%%PREFIX%%#${PREFIX}#' ${WRKSRC}/example/defaults.presed \ > ${WRKSRC}/example/defaults post-install: .ifndef(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/wmmenu ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmmenu - ${MKDIR} ${PREFIX}/share/doc/wmmenu/example - ${INSTALL_DATA} ${WRKSRC}/example/apps ${PREFIX}/share/doc/wmmenu/example - ${INSTALL_DATA} ${WRKSRC}/example/defaults ${PREFIX}/share/doc/wmmenu/example + ${INSTALL_DATA} ${WRKSRC}/example/apps ${PREFIX}/share/doc/wmmenu/apps.sample + ${INSTALL_DATA} ${WRKSRC}/example/defaults ${PREFIX}/share/doc/wmmenu/defaults.sample .endif - @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${PKGMESSAGE} + @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${PKGMESSAGE} | ${SED} -e 's#%%PORTNAME%%#${PORTNAME}#g' .include <bsd.port.mk> diff -ruN wmmenu.0.9/distinfo wmmenu/distinfo --- wmmenu.0.9/distinfo Wed Jun 26 18:52:17 2002 +++ wmmenu/distinfo Thu Jun 27 01:05:52 2002 @@ -1 +1 @@ -MD5 (wmmenu-0.9.tar.gz) = cc1314f6a33547aee4dad832bbdf5cd8 +MD5 (wmmenu-1.2.tar.gz) = 0cc8970ff54182a08fe848d65546f70f diff -ruN wmmenu.0.9/files/patch-aa wmmenu/files/patch-aa --- wmmenu.0.9/files/patch-aa Wed Jun 26 18:52:17 2002 +++ wmmenu/files/patch-aa Thu Jun 27 01:05:52 2002 @@ -1,11 +1,11 @@ ---- options.c.BACKUP Thu Nov 16 21:11:16 2000 -+++ options.c Thu Nov 16 21:11:25 2000 -@@ -4,7 +4,7 @@ - #include <string.h> - #include <assert.h> - /* POSIX */ --#include <getopt.h> -+#include <unistd.h> +--- example/apps.Dist Sat Aug 5 00:40:31 2000 ++++ example/apps Sun Nov 19 18:32:02 2000 +@@ -4,8 +4,6 @@ + + "GNUstep.xpm" Menu title + "linuxterm.xpm" xterm -T Terminal -name terminal -geometry 80x50 & +-"HomeNeighborOpen.xpm" xterm -T "Login terminal" -name loginxterm -e bin/rloginsession & +-"FileManager.xpm" xterm -T "Midnight Commander" -name mc -geometry 100x50 -sl 1000 -e mc -c & + "mixer.xpm" gaumix & + "HP-16C-48.xpm" kcalc & - #include "options.h" - #include "version.h" diff -ruN wmmenu.0.9/files/patch-ab wmmenu/files/patch-ab --- wmmenu.0.9/files/patch-ab Wed Jun 26 18:52:17 2002 +++ wmmenu/files/patch-ab Thu Jun 27 01:05:52 2002 @@ -1,11 +1,13 @@ ---- example/apps.Dist Sat Aug 5 00:40:31 2000 -+++ example/apps Sun Nov 19 18:32:02 2000 -@@ -4,8 +4,6 @@ - - "GNUstep.xpm" Menu title - "linuxterm.xpm" xterm -T Terminal -name terminal -geometry 80x50 & --"HomeNeighborOpen.xpm" xterm -T "Login terminal" -name loginxterm -e bin/rloginsession & --"FileManager.xpm" xterm -T "Midnight Commander" -name mc -geometry 100x50 -sl 1000 -e mc -c & - "mixer.xpm" gaumix & - "HP-16C-48.xpm" kcalc & +--- example/defaults.Dist Sat Aug 5 00:40:06 2000 ++++ example/defaults Sun Nov 19 18:28:53 2000 +@@ -12,4 +12,10 @@ + xpmpath /usr/local/share/WindowMaker/Icons + xpmpath /usr/local/share/pixmaps ++ ++xpmpath %%PREFIX%%/share/WindowMaker/Backgrounds ++xpmpath %%PREFIX%%/share/WindowMaker/Icons ++xpmpath %%PREFIX%%/share/WindowMaker/Pixmaps ++xpmpath %%PREFIX%%/include/X11/pixmaps ++ + tile tile2.xpm diff -ruN wmmenu.0.9/files/patch-ac wmmenu/files/patch-ac --- wmmenu.0.9/files/patch-ac Wed Jun 26 18:52:17 2002 +++ wmmenu/files/patch-ac Thu Jun 27 01:05:52 2002 @@ -1,13 +1,9 @@ ---- example/defaults.Dist Sat Aug 5 00:40:06 2000 -+++ example/defaults Sun Nov 19 18:28:53 2000 -@@ -12,4 +12,10 @@ - - xpmpath /usr/local/share/WindowMaker/Icons - xpmpath /usr/local/share/pixmaps -+ -+xpmpath %%PREFIX%%/share/WindowMaker/Backgrounds -+xpmpath %%PREFIX%%/share/WindowMaker/Icons -+xpmpath %%PREFIX%%/share/WindowMaker/Pixmaps -+xpmpath %%PREFIX%%/include/X11/pixmaps -+ - tile tile2.xpm +--- Makefile.orig Sun Dec 2 21:01:18 2001 ++++ Makefile Sun Dec 2 21:01:49 2001 +@@ -1,4 +1,5 @@ +-prefix = /usr/local ++PREFIX ?= /usr/local ++prefix = $(PREFIX) + BINDIR = $(prefix)/bin + MANDIR = $(prefix)/man + ETCDIR = $(prefix)/etc diff -ruN wmmenu.0.9/files/patch-ad wmmenu/files/patch-ad --- wmmenu.0.9/files/patch-ad Wed Jun 26 18:52:17 2002 +++ wmmenu/files/patch-ad Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ ---- Makefile.orig Sun Dec 2 21:01:18 2001 -+++ Makefile Sun Dec 2 21:01:49 2001 -@@ -1,4 +1,5 @@ --prefix = /usr/local -+PREFIX ?= /usr/local -+prefix = $(PREFIX) - BINDIR = $(prefix)/bin - MANDIR = $(prefix)/man - ETCDIR = $(prefix)/etc diff -ruN wmmenu.0.9/pkg-message wmmenu/pkg-message --- wmmenu.0.9/pkg-message Wed Jun 26 18:52:17 2002 +++ wmmenu/pkg-message Thu Jun 27 01:05:52 2002 @@ -1,3 +1 @@ -Read man page on "wmmenu" and see examples in -%%PREFIX%%/share/doc/wmmenu -for info on configuring this dockapp. +Read man page on "%%PORTNAME%%" and see samples in %%PREFIX%%/share/doc/wmmenu for info on configuring this dockapp. diff -ruN wmmenu.0.9/pkg-plist wmmenu/pkg-plist --- wmmenu.0.9/pkg-plist Wed Jun 26 18:52:17 2002 +++ wmmenu/pkg-plist Thu Jun 27 01:05:52 2002 @@ -1,6 +1,5 @@ bin/wmmenu -%%PORTDOCS%%share/doc/wmmenu/example/apps -%%PORTDOCS%%share/doc/wmmenu/example/defaults +%%PORTDOCS%%share/doc/wmmenu/apps.sample +%%PORTDOCS%%share/doc/wmmenu/defaults.sample %%PORTDOCS%%share/doc/wmmenu/README -%%PORTDOCS%%@dirrm share/doc/wmmenu/example %%PORTDOCS%%@dirrm share/doc/wmmenu >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.LNX.4.33.0206270110570.10638-100000>