Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Nov 2016 21:25:20 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r425273 - in branches/2016Q4/x11/xsel-conrad: . files
Message-ID:  <201611032125.uA3LPKw1070523@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Nov  3 21:25:19 2016
New Revision: 425273
URL: https://svnweb.freebsd.org/changeset/ports/425273

Log:
  MFH: r425189
  
  x11/xsel-conrad: minor fixes
  
  - Plug memory leak [1]
  - Convert to USES=localbase
  - Drop unused X11 dependencies
  - Unsilence install commands
  - Convert DOCS to target helpers
  - Reorder some lines
  
  PR:		212261
  Submitted by:	Tobias Kortkamp <t@tobik.me>
  Obtained from:	OpenBSD Ports [1]
  Approved by:	maintainer timeout (2 months)
  Approved by:	ports-secteam (feld)

Added:
  branches/2016Q4/x11/xsel-conrad/files/
     - copied from r425189, head/x11/xsel-conrad/files/
Modified:
  branches/2016Q4/x11/xsel-conrad/Makefile
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/x11/xsel-conrad/Makefile
==============================================================================
--- branches/2016Q4/x11/xsel-conrad/Makefile	Thu Nov  3 20:34:34 2016	(r425272)
+++ branches/2016Q4/x11/xsel-conrad/Makefile	Thu Nov  3 21:25:19 2016	(r425273)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xsel
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.vergenet.net/~conrad/software/xsel/download/
 PKGNAMESUFFIX=	-conrad
@@ -17,24 +18,21 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 CONFLICTS_INSTALL=	xsel-[0-9]*
-USE_XORG=	x11 xext xt xproto ice sm
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lXext -lX11
+
+USES=		autoreconf localbase
+USE_XORG=	x11 xt
+GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 PORTDOCS=	ChangeLog README
-GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|jmp_buf|sigjmp_buf|g' ${WRKSRC}/xsel.c
-	@${REINPLACE_CMD} -e 's|@X_CFLAGS@|${CFLAGS}|;\
-		s|@X_LIBS@|${LDFLAGS}|' ${WRKSRC}/Makefile.in
-
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
-	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}/
-	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
+
+do-install-DOCS-on:
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
+		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>



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