From owner-svn-ports-all@FreeBSD.ORG Fri Sep 27 21:00:09 2013 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 ESMTP id 85D44B40; Fri, 27 Sep 2013 21:00:09 +0000 (UTC) (envelope-from bsam@FreeBSD.org) 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 6648D2AD2; Fri, 27 Sep 2013 21:00:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8RL09ec050466; Fri, 27 Sep 2013 21:00:09 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8RL08Hd050462; Fri, 27 Sep 2013 21:00:08 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201309272100.r8RL08Hd050462@svn.freebsd.org> From: Boris Samorodov Date: Fri, 27 Sep 2013 21:00:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328524 - in head/sysutils/mapchan: . files 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.14 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 Sep 2013 21:00:09 -0000 Author: bsam Date: Fri Sep 27 21:00:08 2013 New Revision: 328524 URL: http://svnweb.freebsd.org/changeset/ports/328524 Log: . support stage; . remove some cruft. Modified: head/sysutils/mapchan/Makefile head/sysutils/mapchan/files/patch-Makefile head/sysutils/mapchan/pkg-plist Modified: head/sysutils/mapchan/Makefile ============================================================================== --- head/sysutils/mapchan/Makefile Fri Sep 27 20:57:56 2013 (r328523) +++ head/sysutils/mapchan/Makefile Fri Sep 27 21:00:08 2013 (r328524) @@ -12,31 +12,24 @@ COMMENT= Transform the input and output USES= iconv WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV= MAPDIR=${PREFIX}/etc/${PORTNAME} +MAKE_ENV= STAGEDIR=${STAGEDIR} MAPDIR=${STAGEDIR}${PREFIX}/etc/${PORTNAME} CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -ETCDAT= *.map default.sample -MAN8= mapchan.8 -PORTDOCS= README OPTIONS_DEFINE= DOCS -NO_STAGE= yes post-extract: @${CP} ${WRKSRC}/doc/mapchan.F ${WRKSRC}/doc/mapchan.8 .include post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/mapchan.8 ${MANPREFIX}/man/man8 -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/mapchan.8 ${STAGEDIR}${MANPREFIX}/man/man8 .include post-patch: - ${FIND} ${WRKSRC} -name '*.orig' -delete ${CP} ${WRKSRC}/examples/default ${WRKSRC}/examples/default.sample ${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" ${WRKSRC}/mapchan.c .if ${OSVERSION} > 900007 Modified: head/sysutils/mapchan/files/patch-Makefile ============================================================================== --- head/sysutils/mapchan/files/patch-Makefile Fri Sep 27 20:57:56 2013 (r328523) +++ head/sysutils/mapchan/files/patch-Makefile Fri Sep 27 21:00:08 2013 (r328524) @@ -15,8 +15,8 @@ -BINDIR ?= $(DESTDIR)/bin -MAPDIR ?= $(DESTDIR)/etc/mapchan -LDFLAGS ?= -s -+BINDIR?=$(PREFIX)/bin -+MAPDIR?=$(PREFIX)/mapchan ++BINDIR?=${STAGEDIR}$(PREFIX)/bin ++MAPDIR?=${STAGEDIR}$(PREFIX)/mapchan +LDFLAGS+=-s -lutil LOADLIBES = -lutil #-------------------------------------------------------------- Modified: head/sysutils/mapchan/pkg-plist ============================================================================== --- head/sysutils/mapchan/pkg-plist Fri Sep 27 20:57:56 2013 (r328523) +++ head/sysutils/mapchan/pkg-plist Fri Sep 27 21:00:08 2013 (r328524) @@ -2,14 +2,17 @@ bin/mapchan etc/mapchan/altkoi.map @unexec if cmp -s %D/etc/mapchan/default %D/etc/mapchan/default.sample; then rm -f %D/etc/mapchan/default; fi etc/mapchan/default.sample -etc/mapchan/dos2koi.map etc/mapchan/dos2koi-kbd.map +etc/mapchan/dos2koi.map etc/mapchan/k180.map etc/mapchan/koi2win.map etc/mapchan/koiualt.map etc/mapchan/koiumain.map etc/mapchan/msm.map -etc/mapchan/trivial.map etc/mapchan/sm7238.map +etc/mapchan/trivial.map etc/mapchan/win2koi.map +man/man8/mapchan.8.gz +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrmtry etc/mapchan