From owner-svn-ports-all@FreeBSD.ORG Fri Jun 27 16:11:10 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 570EF829; Fri, 27 Jun 2014 16:11:10 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 387C32FE0; Fri, 27 Jun 2014 16:11:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5RGBAkN063770; Fri, 27 Jun 2014 16:11:10 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5RGB94r063768; Fri, 27 Jun 2014 16:11:09 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201406271611.s5RGB94r063768@svn.freebsd.org> From: Martin Wilke Date: Fri, 27 Jun 2014 16:11:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359566 - head/textproc/scim-input-pad 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.18 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: Fri, 27 Jun 2014 16:11:10 -0000 Author: miwi Date: Fri Jun 27 16:11:09 2014 New Revision: 359566 URL: http://svnweb.freebsd.org/changeset/ports/359566 QAT: https://qat.redports.org/buildarchive/r359566/ Log: - Stage support - Cleanup PR: 190780 Modified: head/textproc/scim-input-pad/Makefile head/textproc/scim-input-pad/pkg-plist Modified: head/textproc/scim-input-pad/Makefile ============================================================================== --- head/textproc/scim-input-pad/Makefile Fri Jun 27 16:10:15 2014 (r359565) +++ head/textproc/scim-input-pad/Makefile Fri Jun 27 16:11:09 2014 (r359566) @@ -3,7 +3,7 @@ PORTNAME= scim-input-pad PORTVERSION= 0.1.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= SF/scim/${PORTNAME}/0.1.3/ \ http://anthesphoria.net/FreeBSD/ports/distfiles/ @@ -11,13 +11,14 @@ MASTER_SITES= SF/scim/${PORTNAME}/0.1.3/ MAINTAINER= nikola.lecic@anthesphoria.net COMMENT= SCIM add-on to input various symbols with customisable on-screen pad -LIB_DEPENDS= scim-1.0.10:${PORTSDIR}/textproc/scim +LIB_DEPENDS= libscim-1.0.so:${PORTSDIR}/textproc/scim USE_LDCONFIG= yes -USES= gmake pkgconfig +USES= gmake pkgconfig libtool GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__ LDFLAGS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip DESKTOP_ENTRIES="SCIM Input Pad" \ "${COMMENT}" \ @@ -28,8 +29,6 @@ DESKTOP_ENTRIES="SCIM Input Pad" \ DOCS= ChangeLog README -NO_STAGE= yes - OPTIONS_DEFINE= DOCS NLS .include @@ -44,16 +43,15 @@ PLIST_SUB+= NLS="@comment " .endif post-patch: - @${REINPLACE_CMD} -E 's|(SCIM_LIBEXECDIR=).*|\1${PREFIX}/lib/scim-1.0|' \ + @${REINPLACE_CMD} -E 's|(SCIM_LIBEXECDIR=).*|\1${PREFIX}/lib/scim-1.0| ; \ + s|(SCIM_MODULEDIR=).*|\1${PREFIX}/lib/scim-1.0/1.4.0| ; \ + s|(SCIM_ICONDIR=).*|\1${PREFIX}/share/scim/icons| ; \ + s|(SCIM_DATADIR=).*|\1${PREFIX}/share/scim|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -E 's|^_NAME|NAME|g' ${WRKSRC}/data/*.pad.in post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} - @${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\' + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/textproc/scim-input-pad/pkg-plist ============================================================================== --- head/textproc/scim-input-pad/pkg-plist Fri Jun 27 16:10:15 2014 (r359565) +++ head/textproc/scim-input-pad/pkg-plist Fri Jun 27 16:11:09 2014 (r359566) @@ -1,11 +1,10 @@ bin/scim-input-pad lib/scim-1.0/1.4.0/Helper/input-pad.a -lib/scim-1.0/1.4.0/Helper/input-pad.la lib/scim-1.0/1.4.0/Helper/input-pad.so lib/libscim-input-pad.a -lib/libscim-input-pad.la lib/libscim-input-pad.so -lib/libscim-input-pad.so.1 +lib/libscim-input-pad.so.0 +lib/libscim-input-pad.so.0.1.0 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README %%NLS%%share/locale/de/LC_MESSAGES/scim-input-pad.mo