Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Feb 2016 21:45:09 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r408893 - head/x11-wm/icewm
Message-ID:  <201602142145.u1ELj98f005498@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sun Feb 14 21:45:09 2016
New Revision: 408893
URL: https://svnweb.freebsd.org/changeset/ports/408893

Log:
  - Add LICENSE_FILE
  - Switch to USES=localbase
  - Switch to options helpers

Modified:
  head/x11-wm/icewm/Makefile
  head/x11-wm/icewm/pkg-plist

Modified: head/x11-wm/icewm/Makefile
==============================================================================
--- head/x11-wm/icewm/Makefile	Sun Feb 14 21:44:17 2016	(r408892)
+++ head/x11-wm/icewm/Makefile	Sun Feb 14 21:45:09 2016	(r408893)
@@ -11,8 +11,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window Manager designed for speed, usability and consistency
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake iconv:translit pkgconfig
+USES=		gmake iconv:translit localbase pkgconfig
 USE_XORG=	ice sm x11 xext
 USE_GNOME=	gdkpixbuf2
 GNU_CONFIGURE=	yes
@@ -23,9 +24,6 @@ CONFIGURE_ARGS=	--enable-guievents \
 		--with-docdir=${PREFIX}/share/doc \
 		--with-mkfontdir=${NONEXISTENT}
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 OPTIONS_DEFINE=		BEASTIE ESOUND GNOME LITE MENUFIX NLS XFT XINERAMA \
 			XRANDR DOCS
 OPTIONS_DEFINE_i386=	ASM
@@ -51,26 +49,9 @@ XINERAMA_USE=		XORG=xinerama
 XINERAMA_CONFIGURE_ENABLE=	xinerama
 XRANDR_USE=		XORG=xrandr
 XRANDR_CONFIGURE_ENABLE=	xrandr
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MASM}
-CONFIGURE_ARGS+=--enable-x86-asm
-.else
-CONFIGURE_ARGS+=--disable-x86-asm
-.endif
-
-.if ${PORT_OPTIONS:MBEASTIE}
-STARTUP_PIXMAP=	${DATADIR}/taskbar/bsd-daemon.xpm
-.else
-STARTUP_PIXMAP=	icewm-logo.xpm
-.endif
-
-.if ${PORT_OPTIONS:MLITE}
-PLIST_SUB+=	NOLITE="@comment "
-.else
-PLIST_SUB+=	NOLITE=""
-.endif
+ASM_CONFIGURE_ENABLE=	x86-asm
+BEASTIE_VARS=		STARTUP_PIXMAP=${DATADIR}/taskbar/bsd-daemon.xpm
+BEASTIE_VARS_OFF=	STARTUP_PIXMAP=icewm-logo.xpm
 
 post-extract:
 .for dir in taskbar themes/Infadel2/taskbar
@@ -99,10 +80,11 @@ post-install:
 .for dir in taskbar themes/Infadel2/taskbar
 	@${LN} -s ${STARTUP_PIXMAP} ${STAGEDIR}${DATADIR}/${dir}/start.xpm
 .endfor
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-. for f in CHANGES INSTALL README TODO
+.for f in CHANGES INSTALL README TODO doc/*.html
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-. endfor
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>

Modified: head/x11-wm/icewm/pkg-plist
==============================================================================
--- head/x11-wm/icewm/pkg-plist	Sun Feb 14 21:44:17 2016	(r408892)
+++ head/x11-wm/icewm/pkg-plist	Sun Feb 14 21:45:09 2016	(r408893)
@@ -1,4 +1,4 @@
-%%NOLITE%%bin/icehelp
+%%NO_LITE%%bin/icehelp
 bin/icesh
 bin/icesound
 bin/icewm



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602142145.u1ELj98f005498>