Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Nov 2012 13:56:38 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r307372 - head/misc/xosd
Message-ID:  <201211131356.qADDucdb056607@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Tue Nov 13 13:56:37 2012
New Revision: 307372
URL: http://svnweb.freebsd.org/changeset/ports/307372

Log:
  - Add DOCS knob to OPTIONS_DEFINE
  - Drop no longer relevant adjustment of ltmain.sh
  - Move PATCH_STRIP downstairs a bit
  
  Feature safe:	yes

Modified:
  head/misc/xosd/Makefile

Modified: head/misc/xosd/Makefile
==============================================================================
--- head/misc/xosd/Makefile	Tue Nov 13 13:56:13 2012	(r307371)
+++ head/misc/xosd/Makefile	Tue Nov 13 13:56:37 2012	(r307372)
@@ -12,7 +12,6 @@ COMMENT=	X11 on-screen-display program a
 
 LICENSE=	GPLv2
 
-PATCH_STRIP=	-p1
 USE_AUTOTOOLS=	libtool
 USE_CSTD=	gnu89
 USE_GMAKE=	yes
@@ -23,6 +22,7 @@ CONFIGURE_ENV=	LIBS=${PTHREAD_LIBS}' -L$
 		GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG='${GLIB_CONFIG}' \
 		XMMS_PLUGINDIR=${LOCALBASE}/lib/xmms
 CONFIGURE_ARGS=	--disable-beep_media_player_plugin
+PATCH_STRIP=	-p1
 
 MAN1=		osd_cat.1 xosd-config.1
 MAN3=		xosd.3 xosd_create.3 xosd_destroy.3 xosd_display.3 \
@@ -33,7 +33,7 @@ MAN3=		xosd.3 xosd_create.3 xosd_destroy
 		xosd_show.3 xosd_uninit.3
 PORTDOCS=	AUTHORS ChangeLog TODO
 
-OPTIONS_DEFINE=	XMMS MSEC XFT
+OPTIONS_DEFINE=	XMMS MSEC XFT DOCS
 OPTIONS_DEFAULT=	XMMS
 XMMS_DESC=	Build and install XMMS-OSD plugin
 MSEC_DESC=	Use milliseconds timeout (breaks compatibility!)
@@ -67,7 +67,6 @@ USE_XORG+=	xft
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,-lc_r,-lblahblah,' ${WRKSRC}/ltmain.sh
 	@${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS}, ; \
 		s,echo aout,echo elf,' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,^\(CFLAGS =\)\(.*\)$$,\1 -I..\2,' \



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