summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorPhilippe Audeoud <jadawin@FreeBSD.org>2011-05-23 08:22:21 +0000
committerPhilippe Audeoud <jadawin@FreeBSD.org>2011-05-23 08:22:21 +0000
commit6b73fc574fdb1c3531f55da0b5e341451654a792 (patch)
tree98fd7aabf27d1e9a51b5590f2a434b21f1c57a63 /x11
parent- Clarify VIMAGE option (diff)
- Update to 4.3.1
- Add LICENSE info PR: ports/157263 Submitted by: Jeroen Schot <schot _AT_ A-Eskwadraat.nl>
Notes
Notes: svn path=/head/; revision=274499
Diffstat (limited to 'x11')
-rw-r--r--x11/dmenu/Makefile6
-rw-r--r--x11/dmenu/distinfo4
-rw-r--r--x11/dmenu/files/patch-Makefile28
-rw-r--r--x11/dmenu/files/patch-config.mk14
4 files changed, 16 insertions, 36 deletions
diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile
index e3d6074853da..48f70f9e5261 100644
--- a/x11/dmenu/Makefile
+++ b/x11/dmenu/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= dmenu
-PORTVERSION= 4.2.1
-PORTREVISION= 1
+PORTVERSION= 4.3.1
CATEGORIES= x11
MASTER_SITES= http://dl.suckless.org/tools/ \
http://schot.a-eskwadraat.nl/files/
@@ -22,6 +21,9 @@ USE_XORG= x11
MAN1= dmenu.1
PLIST_FILES= bin/dmenu bin/dmenu_path bin/dmenu_run
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
.include <bsd.port.options.mk>
.if defined(WITH_XINERAMA)
diff --git a/x11/dmenu/distinfo b/x11/dmenu/distinfo
index cb66f9d025c0..aa111b82ac5b 100644
--- a/x11/dmenu/distinfo
+++ b/x11/dmenu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dmenu-4.2.1.tar.gz) = 30bd5ff7d54befcfeb5d5e0bc9316bc4752f4fd125d30c1ed8127eaa668ff069
-SIZE (dmenu-4.2.1.tar.gz) = 9426
+SHA256 (dmenu-4.3.1.tar.gz) = 7da646228b52a2a5966b27190701e9514c08ee16ac538404b5dfa13b10b3c0ca
+SIZE (dmenu-4.3.1.tar.gz) = 8905
diff --git a/x11/dmenu/files/patch-Makefile b/x11/dmenu/files/patch-Makefile
index 1498c47e34ad..6d0fd77f6d7a 100644
--- a/x11/dmenu/files/patch-Makefile
+++ b/x11/dmenu/files/patch-Makefile
@@ -1,28 +1,6 @@
---- Makefile.orig 2010-11-20 10:24:33.000000000 +0100
-+++ Makefile 2011-03-24 17:16:32.000000000 +0100
-@@ -12,16 +12,17 @@
- @echo "CC = ${CC}"
-
- dmenu: dmenu.o draw.o
-+ @echo CC -o $@
-+ @${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
-+
- dmenu_path: dmenu_path.o
-+ @echo CC -o $@
-+ @${CC} -o $@ dmenu_path.o ${LDFLAGS}
-
- .c.o: config.mk
- @echo CC -c $<
- @${CC} -c $< ${CFLAGS}
-
--dmenu dmenu_path:
-- @echo CC -o $@
-- @${CC} -o $@ $+ ${LDFLAGS}
--
- clean:
- @echo cleaning
- @rm -f dmenu dmenu.o draw.o dmenu_path dmenu_path.o dmenu-${VERSION}.tar.gz
-@@ -41,17 +42,17 @@
+--- Makefile.orig 2011-05-18 18:02:16.000000000 +0200
++++ Makefile 2011-05-20 22:52:15.000000000 +0200
+@@ -43,17 +43,17 @@
@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
diff --git a/x11/dmenu/files/patch-config.mk b/x11/dmenu/files/patch-config.mk
index 3dceb844db41..49cc1dd2fea4 100644
--- a/x11/dmenu/files/patch-config.mk
+++ b/x11/dmenu/files/patch-config.mk
@@ -1,7 +1,7 @@
---- config.mk.orig 2010-11-20 10:24:33.000000000 +0100
-+++ config.mk 2011-03-24 17:19:41.000000000 +0100
-@@ -4,11 +4,11 @@
- # Customize below to fit your system
+--- config.mk.orig 2011-05-18 18:02:16.000000000 +0200
++++ config.mk 2011-05-20 22:58:36.000000000 +0200
+@@ -2,11 +2,11 @@
+ VERSION = 4.3.1
# paths
-PREFIX = /usr/local
@@ -16,15 +16,15 @@
# Xinerama, comment if you don't want it
XINERAMALIBS = -lXinerama
-@@ -19,9 +19,9 @@
+@@ -17,9 +17,9 @@
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
# flags
-CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-CFLAGS = -ansi -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
+CPPFLAGS+= -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-+CFLAGS += -std=c99 ${INCS} ${CPPFLAGS}
++CFLAGS += -ansi ${INCS} ${CPPFLAGS}
+LDFLAGS += ${LIBS}
# compiler and linker