svn commit: r412066 - head/misc/xosd
Dmitry Marakasov
amdmi3 at FreeBSD.org
Mon Mar 28 18:43:59 UTC 2016
Author: amdmi3
Date: Mon Mar 28 18:43:58 2016
New Revision: 412066
URL: https://svnweb.freebsd.org/changeset/ports/412066
Log:
- Clarify LICENSE
- Add LICENSE_FILE
- Switch to options helpers
Modified:
head/misc/xosd/Makefile
Modified: head/misc/xosd/Makefile
==============================================================================
--- head/misc/xosd/Makefile Mon Mar 28 18:16:36 2016 (r412065)
+++ head/misc/xosd/Makefile Mon Mar 28 18:43:58 2016 (r412066)
@@ -10,7 +10,8 @@ MASTER_SITES= SF/libxosd/libxosd/${PORTN
MAINTAINER= ports at FreeBSD.org
COMMENT= X11 on-screen-display program and library
-LICENSE= GPLv2
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake pkgconfig libtool
USE_CSTD= gnu89
@@ -31,30 +32,25 @@ XFT_DESC= Unofficial Xft support
OPTIONS_SUB= yes
MSEC_EXTRA_PATCHES= ${FILESDIR}/extra-patch-msec-timeout
+MSEC_VARS= DELAY_UNITS=milliseconds
+MSEC_VARS_OFF= DELAY_UNITS=seconds
XFT_EXTRA_PATCHES= ${FILESDIR}/extra-patch-xft
XFT_USE= GNOME=pango XORG=xft
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMSEC}
-DELAY_UNITS= milliseconds
-.else
-DELAY_UNITS= seconds
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's,^\(CFLAGS =\)\(.*\)$$,\1 -I..\2,' \
${WRKSRC}/src/libxosd/Makefile.in \
${WRKSRC}/src/xmms_plugin/Makefile.in
@${REINPLACE_CMD} -e 's,specified time,& (${DELAY_UNITS}),' \
${WRKSRC}/src/osd_cat.c
-.if ${PORT_OPTIONS:MXFT} # unbreak against Clang
+
+post-patch-XFT-on:
+# unbreak against Clang
@${REINPLACE_CMD} -e '52s,^,void xosd_xypos(xosd *osd);,' \
${WRKSRC}/src/libxosd/xosd.c
-.endif
-post-install:
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
More information about the svn-ports-all
mailing list