From 8cfda521c7993cc86c41fcea77696e4c1f51981b Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Thu, 3 Oct 2013 06:40:58 +0000 Subject: [PATCH] - Remove unnecessary slash after STAGEDIR --- chinese/auto-cn-l10n/Makefile | 4 ++-- chinese/bg5pdf/Makefile | 16 ++++++++-------- chinese/c2t/Makefile | 8 ++++---- chinese/dictd-database/Makefile | 6 +++--- chinese/gb2ps/Makefile | 12 ++++++------ chinese/hc/Makefile | 12 ++++++------ chinese/hztty/Makefile | 4 ++-- chinese/muni/Makefile | 12 ++++++------ chinese/oicq/Makefile | 4 ++-- chinese/telnet/Makefile | 4 ++-- chinese/ydict/Makefile | 2 +- 11 files changed, 42 insertions(+), 42 deletions(-) diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile index e2b63ac39d38..9fb293050c09 100644 --- a/chinese/auto-cn-l10n/Makefile +++ b/chinese/auto-cn-l10n/Makefile @@ -57,7 +57,7 @@ post-patch: s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dot.xselector ${WRKSRC}/dot.xinitrc do-install: - ${MKDIR} ${STAGEDIR}/${PREFIX}/share/skel/zh_CN.eucCN - ${CP} ${WRKSRC}/* ${STAGEDIR}/${PREFIX}/share/skel/zh_CN.eucCN + ${MKDIR} ${STAGEDIR}${PREFIX}/share/skel/zh_CN.eucCN + ${CP} ${WRKSRC}/* ${STAGEDIR}${PREFIX}/share/skel/zh_CN.eucCN .include diff --git a/chinese/bg5pdf/Makefile b/chinese/bg5pdf/Makefile index a896eb68e4f5..f000187dc8c4 100644 --- a/chinese/bg5pdf/Makefile +++ b/chinese/bg5pdf/Makefile @@ -25,13 +25,13 @@ do-build: -I${PYTHON_INCLUDEDIR} -L${PREFIX}/lib -lpdf -o ${WRKSRC}/bg5pdflib.so do-install: - @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/bg5pdf ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/gbpdf ${STAGEDIR}/${PREFIX}/bin - @${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/bg5pdflib.so ${STAGEDIR}/${PYTHON_SITELIBDIR} - ${INSTALL_DATA} ${WRKSRC}/test.big5 ${STAGEDIR}/${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/test.big5.pdf ${STAGEDIR}/${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/genTest.py ${STAGEDIR}/${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/bg5pdf ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/gbpdf ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/bg5pdflib.so ${STAGEDIR}${PYTHON_SITELIBDIR} + ${INSTALL_DATA} ${WRKSRC}/test.big5 ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/test.big5.pdf ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/genTest.py ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/chinese/c2t/Makefile b/chinese/c2t/Makefile index f25dae7b16b0..c8984a836469 100644 --- a/chinese/c2t/Makefile +++ b/chinese/c2t/Makefile @@ -15,9 +15,9 @@ NO_WRKSUBDIR= yes EXTRACT_ONLY= c2t.tar.gz do-install: - @${MKDIR} ${STAGEDIR}/${PREFIX}/share/chinese/gb - ${INSTALL_PROGRAM} ${WRKSRC}/c2t ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_DATA} ${DISTDIR}/TONEPY.tit ${STAGEDIR}/${PREFIX}/share/chinese/gb - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}/${PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${PREFIX}/share/chinese/gb + ${INSTALL_PROGRAM} ${WRKSRC}/c2t ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${DISTDIR}/TONEPY.tit ${STAGEDIR}${PREFIX}/share/chinese/gb + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1 .include diff --git a/chinese/dictd-database/Makefile b/chinese/dictd-database/Makefile index 0acd19e1b296..775ecc85d7d2 100644 --- a/chinese/dictd-database/Makefile +++ b/chinese/dictd-database/Makefile @@ -20,10 +20,10 @@ SUB_FILES= pkg-message DICTFILES= cedict pydict moecomp netterm do-install: - @${MKDIR} ${STAGEDIR}/${PREFIX}/lib/dict + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/dict for f in ${DICTFILES}; do \ - ${INSTALL_DATA} ${WRKSRC}/$${f}.dict.dz ${STAGEDIR}/${PREFIX}/lib/dict; \ - ${INSTALL_DATA} ${WRKSRC}/$${f}.index ${STAGEDIR}/${PREFIX}/lib/dict; \ + ${INSTALL_DATA} ${WRKSRC}/$${f}.dict.dz ${STAGEDIR}${PREFIX}/lib/dict; \ + ${INSTALL_DATA} ${WRKSRC}/$${f}.index ${STAGEDIR}${PREFIX}/lib/dict; \ done .include diff --git a/chinese/gb2ps/Makefile b/chinese/gb2ps/Makefile index 0df1a1a529c1..4132c056ff68 100644 --- a/chinese/gb2ps/Makefile +++ b/chinese/gb2ps/Makefile @@ -18,15 +18,15 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} WRKSRC= ${WRKDIR}/GB2PS do-install: - @${MKDIR} ${STAGEDIR}/${PREFIX}/share/chinese/gb - ${INSTALL_PROGRAM} ${WRKSRC}/gb2ps ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/cover.ps ${STAGEDIR}/${PREFIX}/share/chinese + @${MKDIR} ${STAGEDIR}${PREFIX}/share/chinese/gb + ${INSTALL_PROGRAM} ${WRKSRC}/gb2ps ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/cover.ps ${STAGEDIR}${PREFIX}/share/chinese .for font in csong24.ccf ckai24.ccf cfang24.ccf chei24.ccf cfan24.ccf - ${GUNZIP_CMD} -c ${DISTDIR}/${font}.gz > ${STAGEDIR}/${PREFIX}/share/chinese/gb/${font} + ${GUNZIP_CMD} -c ${DISTDIR}/${font}.gz > ${STAGEDIR}${PREFIX}/share/chinese/gb/${font} .endfor .if !defined(NOPORTDOCS) - @${MKDIR} ${STAGEDIR}/${PREFIX}/share/doc/gb2ps - ${INSTALL_DATA} ${WRKSRC}/gb2ps.help ${STAGEDIR}/${PREFIX}/share/doc/gb2ps + @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/gb2ps + ${INSTALL_DATA} ${WRKSRC}/gb2ps.help ${STAGEDIR}${PREFIX}/share/doc/gb2ps .endif .include diff --git a/chinese/hc/Makefile b/chinese/hc/Makefile index 7e375f84facb..ddf4614fa727 100644 --- a/chinese/hc/Makefile +++ b/chinese/hc/Makefile @@ -18,12 +18,12 @@ pre-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/hclib.c do-install: - @${MKDIR} ${STAGEDIR}/${PREFIX}/share/chinese - ${INSTALL_PROGRAM} ${WRKSRC}/hc ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/b2g ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/g2b ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/hc.tab ${STAGEDIR}/${PREFIX}/share/chinese - ${INSTALL_DATA} ${DISTDIR}/hc-supp.tab ${STAGEDIR}/${PREFIX}/share/chinese + @${MKDIR} ${STAGEDIR}${PREFIX}/share/chinese + ${INSTALL_PROGRAM} ${WRKSRC}/hc ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/b2g ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/g2b ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/hc.tab ${STAGEDIR}${PREFIX}/share/chinese + ${INSTALL_DATA} ${DISTDIR}/hc-supp.tab ${STAGEDIR}${PREFIX}/share/chinese ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1 .include diff --git a/chinese/hztty/Makefile b/chinese/hztty/Makefile index b152f5771605..88e9dabfebff 100644 --- a/chinese/hztty/Makefile +++ b/chinese/hztty/Makefile @@ -19,7 +19,7 @@ BROKEN= fails to build with new utmpx .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}/${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1 .include diff --git a/chinese/muni/Makefile b/chinese/muni/Makefile index c0603cb17dbd..4d898edb8d9a 100644 --- a/chinese/muni/Makefile +++ b/chinese/muni/Makefile @@ -10,13 +10,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Find Unicode values for Chinese characters do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/muni ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/m7773 ${STAGEDIR}/${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/muni ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/m7773 ${STAGEDIR}${PREFIX}/bin .if !defined(NOPORTDOCS) - ${MKDIR} ${STAGEDIR}/${PREFIX}/share/doc/muni - ${INSTALL_DATA} ${WRKSRC}/index.html ${STAGEDIR}/${PREFIX}/share/doc/muni - ${INSTALL_DATA} ${WRKSRC}/yung.gif ${STAGEDIR}/${PREFIX}/share/doc/muni - ${INSTALL_DATA} ${WRKSRC}/kang.gif ${STAGEDIR}/${PREFIX}/share/doc/muni + ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/muni + ${INSTALL_DATA} ${WRKSRC}/index.html ${STAGEDIR}${PREFIX}/share/doc/muni + ${INSTALL_DATA} ${WRKSRC}/yung.gif ${STAGEDIR}${PREFIX}/share/doc/muni + ${INSTALL_DATA} ${WRKSRC}/kang.gif ${STAGEDIR}${PREFIX}/share/doc/muni .endif .include diff --git a/chinese/oicq/Makefile b/chinese/oicq/Makefile index fad82e73fc9e..2339e24c9335 100644 --- a/chinese/oicq/Makefile +++ b/chinese/oicq/Makefile @@ -17,7 +17,7 @@ USES= perl5 USE_PERL5= configure post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/bin/qq ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/demo1 ${STAGEDIR}/${PREFIX}/bin/qq-demo1 + ${INSTALL_SCRIPT} ${WRKSRC}/bin/qq ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/demo1 ${STAGEDIR}${PREFIX}/bin/qq-demo1 .include diff --git a/chinese/telnet/Makefile b/chinese/telnet/Makefile index a58431138411..b27e1f4690fa 100644 --- a/chinese/telnet/Makefile +++ b/chinese/telnet/Makefile @@ -47,7 +47,7 @@ pre-build: @cd ${WRKSRC}/libtelnet && ${MAKE} do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/telnet ${STAGEDIR}/${PREFIX}/bin/zh-telnet - @${INSTALL_MAN} ${WRKSRC}/telnet.1 ${STAGEDIR}/${MAN1PREFIX}/man/man1/zh-telnet.1 + @${INSTALL_PROGRAM} ${WRKSRC}/telnet ${STAGEDIR}${PREFIX}/bin/zh-telnet + @${INSTALL_MAN} ${WRKSRC}/telnet.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/zh-telnet.1 .include diff --git a/chinese/ydict/Makefile b/chinese/ydict/Makefile index 0377aff78178..82f019a3e32d 100644 --- a/chinese/ydict/Makefile +++ b/chinese/ydict/Makefile @@ -17,6 +17,6 @@ PLIST_FILES= bin/ydict USE_PYTHON_RUN= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/ydict ${STAGEDIR}/${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/ydict ${STAGEDIR}${PREFIX}/bin/ .include