Date: Fri, 27 Sep 2013 21:00:08 +0000 (UTC) From: Boris Samorodov <bsam@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328524 - in head/sysutils/mapchan: . files Message-ID: <201309272100.r8RL08Hd050462@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> 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 <bsd.port.pre.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309272100.r8RL08Hd050462>