Date: Mon, 7 Dec 2015 04:58:49 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403178 - in head/x11-wm/dwm: . files Message-ID: <201512070458.tB74wnvj096783@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Dec 7 04:58:49 2015 New Revision: 403178 URL: https://svnweb.freebsd.org/changeset/ports/403178 Log: x11-wm/dwm: update to 6.1 Drop unused dependencies likely from overlinking in the past. $ readelf -d /usr/local/bin/dwm | fgrep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libX11.so.6] 0x0000000000000001 (NEEDED) Shared library: [libXinerama.so.1] 0x0000000000000001 (NEEDED) Shared library: [libfontconfig.so.1] 0x0000000000000001 (NEEDED) Shared library: [libXft.so.2] 0x0000000000000001 (NEEDED) Shared library: [libc.so.7] Changes: http://lists.suckless.org/dev/1511/27504.html PR: 203325, 204658 Approved by: maintainer timeout (18 days) Modified: head/x11-wm/dwm/Makefile (contents, props changed) head/x11-wm/dwm/distinfo (contents, props changed) head/x11-wm/dwm/files/patch-config.mk (contents, props changed) Modified: head/x11-wm/dwm/Makefile ============================================================================== --- head/x11-wm/dwm/Makefile Mon Dec 7 04:29:44 2015 (r403177) +++ head/x11-wm/dwm/Makefile Mon Dec 7 04:58:49 2015 (r403178) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dwm -PORTVERSION= 6.0 -PORTREVISION= 2 +PORTVERSION= 6.1 CATEGORIES= x11-wm MASTER_SITES= http://dl.suckless.org/${PORTNAME}/ \ http://schot.a-eskwadraat.nl/files/ @@ -15,12 +14,12 @@ COMMENT= Dynamic, small, fast and simple LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs +LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig -OPTIONS_DEFINE= XINERAMA XFT DOCS +OPTIONS_DEFINE= XINERAMA DOCS OPTIONS_DEFAULT=XINERAMA -USE_XORG= x11 xau xcb xdmcp xext +USE_XORG= x11 xft PLIST_FILES= bin/dwm \ man/man1/dwm.1.gz @@ -32,18 +31,10 @@ PORTDOCS= README USE_XORG+= xinerama .endif -.if ${PORT_OPTIONS:MXFT} -LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libexpat.so:${PORTSDIR}/textproc/expat2 \ - libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig -USE_XORG+= xft xrender -PATCHFILES+= ${PORTNAME}-${PORTVERSION}-xft.diff -.endif - pre-everything:: @${ECHO_MSG} "You can build dwm with your own config.h using the DWM_CONF knob:" @${ECHO_MSG} "make DWM_CONF=/path/to/dwm/config.h install clean" - @${ECHO_MSG} "Note: Pre-6.0 config.h-files no longer work." + @${ECHO_MSG} "Note: Pre-${PORTVERSION} config.h-files may not work." post-extract: .if defined(DWM_CONF) @@ -60,10 +51,6 @@ post-patch: @${REINPLACE_CMD} -e 's,$${XINERAMALIBS},,g' \ -e 's,$${XINERAMAFLAGS},,g' ${WRKSRC}/config.mk .endif -.if empty(PORT_OPTIONS:MXFT) - @${REINPLACE_CMD} -e 's,$${XFTLIBS},,g' \ - -e 's,$${XFTINCS},,g' ${WRKSRC}/config.mk -.endif post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/x11-wm/dwm/distinfo ============================================================================== --- head/x11-wm/dwm/distinfo Mon Dec 7 04:29:44 2015 (r403177) +++ head/x11-wm/dwm/distinfo Mon Dec 7 04:58:49 2015 (r403178) @@ -1,4 +1,2 @@ -SHA256 (dwm-6.0.tar.gz) = b2b9483de69259eeea56844899bb2385158d3e79a42d82b10c142099fc8eeb56 -SIZE (dwm-6.0.tar.gz) = 20810 -SHA256 (dwm-6.0-xft.diff) = badd329b1ec8d2d1b99816d3ca4eafa9fe784a93cfac29b96abca3821b441a4d -SIZE (dwm-6.0-xft.diff) = 6731 +SHA256 (dwm-6.1.tar.gz) = c2f6c56167f0acdbe3dc37cca9c1a19260c040f2d4800e3529a21ad7cce275fe +SIZE (dwm-6.1.tar.gz) = 25887 Modified: head/x11-wm/dwm/files/patch-config.mk ============================================================================== --- head/x11-wm/dwm/files/patch-config.mk Mon Dec 7 04:29:44 2015 (r403177) +++ head/x11-wm/dwm/files/patch-config.mk Mon Dec 7 04:58:49 2015 (r403178) @@ -1,6 +1,6 @@ ---- config.mk.orig 2011-12-19 15:02:46.000000000 +0000 -+++ config.mk 2012-08-18 00:38:31.000000000 +0000 -@@ -4,30 +4,34 @@ +--- config.mk.orig 2015-11-08 22:39:37 UTC ++++ config.mk +@@ -4,11 +4,11 @@ VERSION = 6.1 # Customize below to fit your system # paths @@ -14,28 +14,19 @@ +X11INC = %%LOCALBASE%%/include +X11LIB = %%LOCALBASE%%/lib - # Xinerama - XINERAMALIBS = -L${X11LIB} -lXinerama - XINERAMAFLAGS = -DXINERAMA - -+# Xft -+XFTINCS = -I${X11INC}/freetype2 -+XFTLIBS = -L${X11LIB} -lXft -+ - # includes and libs --INCS = -I. -I/usr/include -I${X11INC} --LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} -+INCS = -I. -I/usr/include -I${X11INC} ${XFTINCS} -+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS} + # Xinerama, comment if you don't want it + XINERAMALIBS = -lXinerama +@@ -25,14 +25,14 @@ INCS = -I${X11INC} -I${FREETYPEINC} + LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} # flags --CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +-CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +-#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} +-CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} +-LDFLAGS = -s ${LIBS} +CPPFLAGS+= -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} - #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} --CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -+CFLAGS+= -std=c99 ${INCS} ${CPPFLAGS} - #LDFLAGS = -g ${LIBS} --LDFLAGS = -s ${LIBS} ++#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} ++CFLAGS+= -std=c99 -Wno-deprecated-declarations ${INCS} ${CPPFLAGS} +LDFLAGS+= ${LIBS} # Solaris
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512070458.tB74wnvj096783>