aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorarved <arved@FreeBSD.org>2002-11-12 22:13:46 +0800
committerarved <arved@FreeBSD.org>2002-11-12 22:13:46 +0800
commit83e8af8b7b6e35207a03a42998f7f6eb24996ad3 (patch)
tree83ba0ca2cf507591e568242e44f09520bc605296 /x11
parent6e7341364a485145fa22574e61e0936495418999 (diff)
downloadfreebsd-ports-graphics-83e8af8b7b6e35207a03a42998f7f6eb24996ad3.tar.gz
freebsd-ports-graphics-83e8af8b7b6e35207a03a42998f7f6eb24996ad3.tar.zst
freebsd-ports-graphics-83e8af8b7b6e35207a03a42998f7f6eb24996ad3.zip
Update to 1.2
PR:: 39917 Submitted by: Jeremy Karlson <karlj000@unbc.ca> (maintainer)
Diffstat (limited to 'x11')
-rw-r--r--x11/wmmenu/Makefile13
-rw-r--r--x11/wmmenu/distinfo2
-rw-r--r--x11/wmmenu/files/patch-aa20
-rw-r--r--x11/wmmenu/files/patch-ab22
-rw-r--r--x11/wmmenu/files/patch-ac22
-rw-r--r--x11/wmmenu/files/patch-ad9
-rw-r--r--x11/wmmenu/pkg-message4
-rw-r--r--x11/wmmenu/pkg-plist5
8 files changed, 41 insertions, 56 deletions
diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index 5d9c653902a..32ba0d4f603 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= wmmenu
-PORTVERSION= 0.9
+PORTVERSION= 1.2
CATEGORIES= x11 gnome
MASTER_SITES= http://www.fcoutant.freesurf.fr/download/
@@ -23,18 +23,17 @@ USE_GMAKE= yes
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 --git a/x11/wmmenu/distinfo b/x11/wmmenu/distinfo
index 3461391f719..48a0bb41bac 100644
--- a/x11/wmmenu/distinfo
+++ b/x11/wmmenu/distinfo
@@ -1 +1 @@
-MD5 (wmmenu-0.9.tar.gz) = cc1314f6a33547aee4dad832bbdf5cd8
+MD5 (wmmenu-1.2.tar.gz) = 0cc8970ff54182a08fe848d65546f70f
diff --git a/x11/wmmenu/files/patch-aa b/x11/wmmenu/files/patch-aa
index 7b0743152c6..a13d5a43a89 100644
--- a/x11/wmmenu/files/patch-aa
+++ b/x11/wmmenu/files/patch-aa
@@ -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 --git a/x11/wmmenu/files/patch-ab b/x11/wmmenu/files/patch-ab
index a13d5a43a89..0c675beff9c 100644
--- a/x11/wmmenu/files/patch-ab
+++ b/x11/wmmenu/files/patch-ab
@@ -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 --git a/x11/wmmenu/files/patch-ac b/x11/wmmenu/files/patch-ac
index 0c675beff9c..9dcbd06f4d5 100644
--- a/x11/wmmenu/files/patch-ac
+++ b/x11/wmmenu/files/patch-ac
@@ -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 --git a/x11/wmmenu/files/patch-ad b/x11/wmmenu/files/patch-ad
index 9dcbd06f4d5..e69de29bb2d 100644
--- a/x11/wmmenu/files/patch-ad
+++ b/x11/wmmenu/files/patch-ad
@@ -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 --git a/x11/wmmenu/pkg-message b/x11/wmmenu/pkg-message
index f81f08d0e69..84fbe4fef4d 100644
--- a/x11/wmmenu/pkg-message
+++ b/x11/wmmenu/pkg-message
@@ -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 --git a/x11/wmmenu/pkg-plist b/x11/wmmenu/pkg-plist
index 80944b8330c..82cc55867e3 100644
--- a/x11/wmmenu/pkg-plist
+++ b/x11/wmmenu/pkg-plist
@@ -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