From owner-svn-ports-all@FreeBSD.ORG Thu Mar 6 09:13:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C58FEFB; Thu, 6 Mar 2014 09:13:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 29D81686; Thu, 6 Mar 2014 09:13:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s269DQla099924; Thu, 6 Mar 2014 09:13:26 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s269DPBQ099920; Thu, 6 Mar 2014 09:13:25 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201403060913.s269DPBQ099920@svn.freebsd.org> From: Hiroki Sato Date: Thu, 6 Mar 2014 09:13:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347175 - head/print/xdvik X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 09:13:26 -0000 Author: hrs Date: Thu Mar 6 09:13:25 2014 New Revision: 347175 URL: http://svnweb.freebsd.org/changeset/ports/347175 QAT: https://qat.redports.org/buildarchive/r347175/ Log: Fix iconv issue [*]: - Add USES=iconv. - Fix libiconv detection on FreeBSD < 10 by setting CPPFLAGS and LDFLAGS. - Patch Makefile.in so it doesn't use libiconv on FreeBSD 10. - Use new syntax of LIB_DEPENDS. - Minor style cleanups. Submitted by: tijl [*] PR: ports/187014 Modified: head/print/xdvik/Makefile head/print/xdvik/pkg-plist Modified: head/print/xdvik/Makefile ============================================================================== --- head/print/xdvik/Makefile Thu Mar 6 09:13:24 2014 (r347174) +++ head/print/xdvik/Makefile Thu Mar 6 09:13:25 2014 (r347175) @@ -3,7 +3,7 @@ PORTNAME= xdvik PORTVERSION= 22.84.16 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print MASTER_SITES= SF/hoge #/xdvi/${PORTNAME}/${PORTVERSION} @@ -12,9 +12,9 @@ PKGNAMESUFFIX= -tetex MAINTAINER= hrs@FreeBSD.org COMMENT= DVI Previewer(kpathsearch) for X -LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib +LIB_DEPENDS= libt1.so:${PORTSDIR}/devel/t1lib -USES= gmake motif +USES= gmake iconv motif USE_TEX= base texmf MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes @@ -25,7 +25,8 @@ CONFIGURE_ARGS= --with-system-t1lib \ CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib INSTALL_WRKSRC= ${WRKSRC}/texk/xdvik PLIST_SUB= TEXMFDIR=${TEXMFDIR} TEXMFCONFIGDIR=${TEXMFDIR}-config @@ -45,7 +46,7 @@ TEXMFLOCAL_LSR?=${LOCALBASE}/${TEXMFLOCA TEXCONFIGBIN= ${LOCALBASE}/bin/texconfig-sys MKTEXLSR?= ${LOCALBASE}/bin/mktexlsr LIBT1_PREFIX?= ${LOCALBASE} -DOC_FILES= BUGS CHANGES INSTALL \ +PORTDOCS= BUGS CHANGES INSTALL \ README README.CVS README_maintainer TODO .if defined(WITH_LETTERSIZE) @@ -55,9 +56,10 @@ PAPERSIZE= letter PAPERSIZE= a4 .endif -PKGINSTALL= ${WRKDIR}/pkg-install.sh -PKGDEINSTALL= ${WRKDIR}/pkg-install.sh -PKGINSTALL_SUB= MKTEXLSR=${MKTEXLSR} \ +PKGINSTALL= ${WRKDIR}/pkg-install +PKGDEINSTALL= ${WRKDIR}/pkg-install +SUB_FILES= pkg-install +SUB_LIST= MKTEXLSR=${MKTEXLSR} \ XDVIDIR=${PREFIX}/${TEXMFDIR}/xdvi \ XDVICONFDIR=${PREFIX}/${TEXMFDIR}-config/xdvi \ PAPERSIZE=${PAPERSIZE} \ @@ -65,15 +67,15 @@ PKGINSTALL_SUB= MKTEXLSR=${MKTEXLSR} \ LOCALBASE=${LOCALBASE} NO_STAGE= yes -pre-install: - ${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} - ${CHMOD} 0755 ${PKGINSTALL} +post-patch: + @${REINPLACE_CMD} 's/@iconv_libs@/${ICONV_LIB}/' \ + ${WRKSRC}/texk/xdvik/Makefile.in \ + ${WRKSRC}/texk/xdvik/tests/Makefile.in post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES:S@^@${WRKSRC}/@} ${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif @${PKGINSTALL} ${PKGNAME} POST-INSTALL Modified: head/print/xdvik/pkg-plist ============================================================================== --- head/print/xdvik/pkg-plist Thu Mar 6 09:13:24 2014 (r347174) +++ head/print/xdvik/pkg-plist Thu Mar 6 09:13:25 2014 (r347175) @@ -7,11 +7,3 @@ bin/xdvi-motif %%TEXMFDIR%%/xdvi/pixmaps/toolbar2.xpm @dirrm %%TEXMFDIR%%/xdvi/pixmaps %%TEXMFCONFIGDIR%%/xdvi/XDvi -%%PORTDOCS%%%%DOCSDIR%%/BUGS -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.CVS -%%PORTDOCS%%%%DOCSDIR%%/README_maintainer -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%@dirrm %%DOCSDIR%%