Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Nov 2013 10:57:19 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r333668 - head/print/xtexsh
Message-ID:  <201311131057.rADAvJ8A087824@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Wed Nov 13 10:57:19 2013
New Revision: 333668
URL: http://svnweb.freebsd.org/changeset/ports/333668

Log:
  - Convert to USES+=tk
  - STAGE-clean

Modified:
  head/print/xtexsh/Makefile
  head/print/xtexsh/pkg-plist

Modified: head/print/xtexsh/Makefile
==============================================================================
--- head/print/xtexsh/Makefile	Wed Nov 13 10:41:33 2013	(r333667)
+++ head/print/xtexsh/Makefile	Wed Nov 13 10:57:19 2013	(r333668)
@@ -14,39 +14,41 @@ COMMENT=	Tcl/Tk-based simple TeX interfa
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
+OPTIONS_DEFINE=	DOCS
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 NO_BUILD=	yes
 
 USE_TEX=	latex
-USE_TK_WRAPPER=	yes
+USES+=		tk desktop-file-utils
 INSTALLS_ICONS=	yes
-MAN1=		xtexsh.1
-MANCOMPRESSED=	yes
+PORTDOCS=	*
+
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|/usr/bin|${LOCALBASE}/bin|g ; \
+		's|/usr/bin/wish|${WISH}|g ; \
 		s|"/etc|"${PREFIX}/etc| ; \
 		s|exec bash|exec sh|' ${WRKSRC}/xtexsh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/xtexsh ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xtexsh.1.gz ${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/xtexshrc ${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/xtexsh.desktop ${PREFIX}/share/applications
-	@${MKDIR} ${PREFIX}/share/icons/locolor/16x16/apps
+	${INSTALL_SCRIPT} ${WRKSRC}/xtexsh ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xtexsh.1.gz ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/xtexshrc ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/xtexsh.desktop ${STAGEDIR}${PREFIX}/share/applications
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/locolor/16x16/apps
 	${INSTALL_DATA} ${WRKSRC}/xtexsh-mini.png \
-		${PREFIX}/share/icons/locolor/16x16/apps/xtexsh.png
-	@${MKDIR} ${PREFIX}/share/icons/locolor/32x32/apps
+		${STAGEDIR}${PREFIX}/share/icons/locolor/16x16/apps/xtexsh.png
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/locolor/32x32/apps
 	${INSTALL_DATA} ${WRKSRC}/xtexsh.png \
-		${PREFIX}/share/icons/locolor/32x32/apps/xtexsh.png
-	${INSTALL_DATA} ${WRKSRC}/xtexsh.png ${PREFIX}/share/pixmaps
+		${STAGEDIR}${PREFIX}/share/icons/locolor/32x32/apps/xtexsh.png
+	${INSTALL_DATA} ${WRKSRC}/xtexsh.png ${STAGEDIR}${PREFIX}/share/pixmaps
 
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/index.html ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/print/xtexsh/pkg-plist
==============================================================================
--- head/print/xtexsh/pkg-plist	Wed Nov 13 10:41:33 2013	(r333667)
+++ head/print/xtexsh/pkg-plist	Wed Nov 13 10:57:19 2013	(r333668)
@@ -1,7 +1,6 @@
 bin/xtexsh
 etc/xtexshrc
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/index.html
+man/man1/xtexsh.1.gz
 share/applications/xtexsh.desktop
 share/icons/locolor/16x16/apps/xtexsh.png
 share/icons/locolor/32x32/apps/xtexsh.png
@@ -12,4 +11,3 @@ share/pixmaps/xtexsh.png
 @dirrmtry share/icons/locolor/16x16
 @dirrmtry share/icons/locolor
 @dirrmtry share/icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%



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