[Midnightbsd-cvs] mports [23829] trunk/x11/dmenu: update to 4.8

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Aug 21 16:44:53 EDT 2018 

Revision: 23829
          http://svnweb.midnightbsd.org/mports/?rev=23829
Author:   laffer1
Date:     2018-08-21 16:44:52 -0400 (Tue, 21 Aug 2018)
Log Message:
-----------
update to 4.8

Modified Paths:
--------------
    trunk/x11/dmenu/Makefile
    trunk/x11/dmenu/distinfo
    trunk/x11/dmenu/files/patch-config.mk
    trunk/x11/dmenu/pkg-descr

Removed Paths:
-------------
    trunk/x11/dmenu/files/patch-Makefile

Modified: trunk/x11/dmenu/Makefile
===================================================================
--- trunk/x11/dmenu/Makefile	2018-08-21 20:11:14 UTC (rev 23828)
+++ trunk/x11/dmenu/Makefile	2018-08-21 20:44:52 UTC (rev 23829)
@@ -1,46 +1,35 @@
 # $MidnightBSD$
 
 PORTNAME=	dmenu
-PORTVERSION=	4.5
+PORTVERSION=	4.8
 CATEGORIES=	x11
 MASTER_SITES=	http://dl.suckless.org/tools/ \
 		http://schot.a-eskwadraat.nl/files/
 
-PATCH_SITES=	http://tools.suckless.org/dmenu/patches/ \
-		http://schot.a-eskwadraat.nl/files/
-PATCH_DIST_STRIP=-p1
-
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	X11 menu application designed for the dwm window manager
+
 LICENSE=	mit
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-OPTIONS_DEFINE=	XINERAMA XFT
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
+
+OPTIONS_DEFINE=	XINERAMA
 OPTIONS_DEFAULT=	XINERAMA
 
-USE_XORG=	x11
+USE_XORG=	x11 xft
+MAKE_ARGS=	CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \
+		X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib" \
+		FREETYPEINC="${LOCALBASE}/include/freetype2"
 
-PLIST_FILES=	bin/dmenu bin/dmenu_run bin/stest \
+PLIST_FILES=	bin/dmenu bin/dmenu_path bin/dmenu_run bin/stest \
 		man/man1/dmenu.1.gz man/man1/stest.1.gz
 
-.include <bsd.mport.options.mk>
+XINERAMA_USE=	XORG=xinerama
+XINERAMA_MAKE_ARGS_OFF=	XINERAMAFLAGS= XINERAMALIBS=
 
-.if ${PORT_OPTIONS:MXINERAMA}
-USE_XORG+=	xinerama
-.endif
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dmenu \
+		${STAGEDIR}${PREFIX}/bin/stest
 
-.if ${PORT_OPTIONS:MXFT}
-USE_XORG+=	xft
-PATCHFILES+=	${PORTNAME}-${PORTVERSION}-xft.diff
-.endif
-
-post-patch:
-	@${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} \
-	         -e "s,%%PREFIX%%,${PREFIX},g" \
-	         -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-	         -e "s,%%MANPREFIX%%,${MANPREFIX},g"
-.if ! ${PORT_OPTIONS:MXINERAMA}
-	@${REINPLACE_CMD} -e 's,$${XINERAMALIBS},,g' \
-	         -e 's,$${XINERAMAFLAGS},,g' ${WRKSRC}/config.mk
-.endif
-
 .include <bsd.port.mk>

Modified: trunk/x11/dmenu/distinfo
===================================================================
--- trunk/x11/dmenu/distinfo	2018-08-21 20:11:14 UTC (rev 23828)
+++ trunk/x11/dmenu/distinfo	2018-08-21 20:44:52 UTC (rev 23829)
@@ -1,4 +1,3 @@
-SHA256 (dmenu-4.5.tar.gz) = 082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850
-SIZE (dmenu-4.5.tar.gz) = 11543
-SHA256 (dmenu-4.5-xft.diff) = efb4095d65e5e86f9dde97294732174409c24f319bdd4824cc22fa1404972b4f
-SIZE (dmenu-4.5-xft.diff) = 12884
+TIMESTAMP = 1521227102
+SHA256 (dmenu-4.8.tar.gz) = fe615a5c3607061e2106700862e82ac62a9fa1e6a7ac3d616a9c76106476db61
+SIZE (dmenu-4.8.tar.gz) = 15658

Deleted: trunk/x11/dmenu/files/patch-Makefile
===================================================================
--- trunk/x11/dmenu/files/patch-Makefile	2018-08-21 20:11:14 UTC (rev 23828)
+++ trunk/x11/dmenu/files/patch-Makefile	2018-08-21 20:44:52 UTC (rev 23829)
@@ -1,32 +0,0 @@
---- Makefile.orig	2012-01-08 13:18:43.000000000 +0100
-+++ Makefile	2012-02-13 16:54:54.000000000 +0100
-@@ -47,20 +47,20 @@
- 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
- 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
- 	@chmod 755 ${DESTDIR}${PREFIX}/bin/stest
--	@echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
--	@sed "s/VERSION/${VERSION}/g" < stest.1 > ${DESTDIR}${MANPREFIX}/man1/stest.1
--	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
--	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/stest.1
-+	@echo installing manual pages to ${DESTDIR}${MANPREFIX}/man/man1
-+	@mkdir -p ${DESTDIR}${MANPREFIX}/man/man1
-+	@sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man/man1/dmenu.1
-+	@sed "s/VERSION/${VERSION}/g" < stest.1 > ${DESTDIR}${MANPREFIX}/man/man1/stest.1
-+	@chmod 644 ${DESTDIR}${MANPREFIX}/man/man1/dmenu.1
-+	@chmod 644 ${DESTDIR}${MANPREFIX}/man/man1/stest.1
- 
- uninstall:
- 	@echo removing executables from ${DESTDIR}${PREFIX}/bin
- 	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu
- 	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
- 	@rm -f ${DESTDIR}${PREFIX}/bin/stest
--	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
--	@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
--	@rm -f ${DESTDIR}${MANPREFIX}/man1/stest.1
-+	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man/man1
-+	@rm -f ${DESTDIR}${MANPREFIX}/man/man1/dmenu.1
-+	@rm -f ${DESTDIR}${MANPREFIX}/man/man1/stest.1
- 
- .PHONY: all options clean dist install uninstall

Modified: trunk/x11/dmenu/files/patch-config.mk
===================================================================
--- trunk/x11/dmenu/files/patch-config.mk	2018-08-21 20:11:14 UTC (rev 23828)
+++ trunk/x11/dmenu/files/patch-config.mk	2018-08-21 20:44:52 UTC (rev 23829)
@@ -1,33 +1,15 @@
---- config.mk.orig	2012-01-08 13:18:43.000000000 +0100
-+++ config.mk	2012-02-13 16:57:04.000000000 +0100
-@@ -2,11 +2,11 @@
- VERSION = 4.5
+--- config.mk.orig	2018-03-16 19:56:18 UTC
++++ config.mk
+@@ -23,9 +23,9 @@ INCS = -I${X11INC} -I${FREETYPEINC}
+ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
  
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+PREFIX = %%PREFIX%%
-+MANPREFIX = %%MANPREFIX%%
- 
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = %%LOCALBASE%%/include
-+X11LIB = %%LOCALBASE%%/lib
- 
- # Xinerama, comment if you don't want it
- XINERAMALIBS  = -lXinerama
-@@ -17,10 +17,10 @@
- LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
- 
  # flags
--CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-+CPPFLAGS+= -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
- #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
+-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
 -CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 -LDFLAGS  = -s ${LIBS}
++CPPFLAGS+= -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
 +CFLAGS  += -std=c99 ${INCS} ${CPPFLAGS}
 +LDFLAGS += ${LIBS}
  
  # compiler and linker
--CC = cc
-+CC?= cc
+ CC = cc

Modified: trunk/x11/dmenu/pkg-descr
===================================================================
--- trunk/x11/dmenu/pkg-descr	2018-08-21 20:11:14 UTC (rev 23828)
+++ trunk/x11/dmenu/pkg-descr	2018-08-21 20:44:52 UTC (rev 23829)
@@ -1,9 +1,9 @@
 dmenu is a minimalistic X11 menu. It reads a newline separated list of items
 from stdin and shows them as a menu on the top of the screen. When the user
-selects one item or types any text and presses Enter, his choice is printed to
-stdout.
+selects one item or types any text and presses Enter, their choice is printed
+to stdout.
 
 dmenu was developed as an addition to the dynamic window manager (dwm), but can
 be used in any X11-environment.
 
-WWW: http://tools.suckless.org/dmenu
+WWW: https://tools.suckless.org/dmenu

More information about the Midnightbsd-cvs mailing list