2 files changed, 108 insertions, 109 deletions

diff --git a/textproc/mguesser/Makefile b/textproc/mguesser/Makefile
index c412c4079906..cf5e8581fcd6 100644
--- a/textproc/mguesser/Makefile
+++ b/textproc/mguesser/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES=	http://www.mnogosearch.org/guesser/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for guessing a text's charset and language
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -E \
 		"s/^CC=.+//g; s|^CFLAGS=|CFLAGS+=|g; s|-Wall -g||g; \
@@ -18,8 +17,8 @@ post-patch:
 		${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mguesser ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/mguesser
-	${INSTALL_DATA} ${WRKSRC}/maps/*.lm ${PREFIX}/share/mguesser
+	${INSTALL_PROGRAM} ${WRKSRC}/mguesser ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/maps/*.lm ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/mguesser/pkg-plist b/textproc/mguesser/pkg-plist
index aa8c391f84ec..cf541d4e7e3d 100644
--- a/textproc/mguesser/pkg-plist
+++ b/textproc/mguesser/pkg-plist
@@ -1,106 +1,106 @@
 bin/mguesser
-share/mguesser/af.latin1.bible.lm
-share/mguesser/af.latin1.lm
-share/mguesser/ar.arabic.lm
-share/mguesser/ar.arabic.quran.lm
-share/mguesser/ar.cp1256.lm
-share/mguesser/ar.cp1256.quran.lm
-share/mguesser/az.utf8.lm
-share/mguesser/az1.utf8.lm
-share/mguesser/az2.utf8.lm
-share/mguesser/be.cp1251.lm
-share/mguesser/bg.cp1251.bible.lm
-share/mguesser/bg.cp1251.lm
-share/mguesser/bg.cyrillic.bible.lm
-share/mguesser/bg.cyrillic.lm
-share/mguesser/br.latin1.lm
-share/mguesser/bs.ascii.lm
-share/mguesser/bs.cp1250.lm
-share/mguesser/bs.latin2.lm
-share/mguesser/ca.latin1.lit.lm
-share/mguesser/el.greek.lm
-share/mguesser/ca.latin1.lm
-share/mguesser/cs.cp1250.lm
-share/mguesser/cs.latin2.lm
-share/mguesser/cy.latin1.lm
-share/mguesser/da.latin1.bible.lm
-share/mguesser/da.latin1.lm
-share/mguesser/de.latin1.bible.lm
-share/mguesser/de.latin1.lm
-share/mguesser/el.cp1253.lm
-share/mguesser/en.ascii.lm
-share/mguesser/eo.latin1-h.as.lm
-share/mguesser/eo.latin1-x.as.lm
-share/mguesser/eo.latin3.as.lm
-share/mguesser/eo.latin3.lm
-share/mguesser/eo.utf8.as.lm
-share/mguesser/es.latin1.bible.lm
-share/mguesser/es.latin1.lm
-share/mguesser/et.cp1257.lm
-share/mguesser/et.latin4.lm
-share/mguesser/eu.latin1.lm
-share/mguesser/fi.latin1.lm
-share/mguesser/fr.latin1.bible.lm
-share/mguesser/fr.latin1.lm
-share/mguesser/ga.latin1.lit.lm
-share/mguesser/ga.latin1.lm
-share/mguesser/he.hebrew.lm
-share/mguesser/hi.utf8.lm
-share/mguesser/hr.ascii.lm
-share/mguesser/hr.cp1250.bible.lm
-share/mguesser/hr.cp1250.lm
-share/mguesser/hr.latin2.lm
-share/mguesser/hu.cp1250.lm
-share/mguesser/hu.latin2.lm
-share/mguesser/hy.armscii-8.lm
-share/mguesser/is.latin1.lm
-share/mguesser/it.latin1.lm
-share/mguesser/ja.euc-jp.lm
-share/mguesser/ja.sjis.lm
-share/mguesser/la.ascii.lm
-share/mguesser/lt.cp1257.lm
-share/mguesser/lt.latin4.lm
-share/mguesser/lv.cp1257.lm
-share/mguesser/lv.latin4.lm
-share/mguesser/nl.latin1.bible.lm
-share/mguesser/nl.latin1.lm
-share/mguesser/no.latin1.lm
-share/mguesser/pl.latin2.lm
-share/mguesser/po.latin2.lm
-share/mguesser/pt-br.latin1.lm
-share/mguesser/pt-pt.latin1.lm
-share/mguesser/ro.ascii.lm
-share/mguesser/ro.cp1250.lm
-share/mguesser/ro.latin2.lm
-share/mguesser/ru.cp1251.lm
-share/mguesser/ru.cp866.lm
-share/mguesser/ru.cyrillic.lm
-share/mguesser/ru.koi8-r.lm
-share/mguesser/ru.maccyr.lm
-share/mguesser/ru.utf8.lm
-share/mguesser/sk.ascii.lm
-share/mguesser/sk.cp1250.lm
-share/mguesser/sk.latin2.lm
-share/mguesser/sl.ascii.lm
-share/mguesser/sl.cp1250.lm
-share/mguesser/sl.latin2.lm
-share/mguesser/sq.latin1.lm
-share/mguesser/sr.cp1250.lm
-share/mguesser/sr.latin2.lm
-share/mguesser/sv.latin1.bible.lm
-share/mguesser/sv.latin1.lm
-share/mguesser/sw.latin1.lm
-share/mguesser/ta.tscii.lm
-share/mguesser/th.cp874.lm
-share/mguesser/th.tis-620.lm
-share/mguesser/tl.ascii.bible.lm
-share/mguesser/tl.ascii.lm
-share/mguesser/tr.cp1254.lm
-share/mguesser/tr.cp857.lm
-share/mguesser/tr.latin5.lm
-share/mguesser/ua.cp1251.lm
-share/mguesser/ua.koi8-u.lm
-share/mguesser/vi.viscii.lm
-share/mguesser/zh.big5.lm
-share/mguesser/zh.gb2312.lm
-@dirrm share/mguesser
+%%DATADIR%%/af.latin1.bible.lm
+%%DATADIR%%/af.latin1.lm
+%%DATADIR%%/ar.arabic.lm
+%%DATADIR%%/ar.arabic.quran.lm
+%%DATADIR%%/ar.cp1256.lm
+%%DATADIR%%/ar.cp1256.quran.lm
+%%DATADIR%%/az.utf8.lm
+%%DATADIR%%/az1.utf8.lm
+%%DATADIR%%/az2.utf8.lm
+%%DATADIR%%/be.cp1251.lm
+%%DATADIR%%/bg.cp1251.bible.lm
+%%DATADIR%%/bg.cp1251.lm
+%%DATADIR%%/bg.cyrillic.bible.lm
+%%DATADIR%%/bg.cyrillic.lm
+%%DATADIR%%/br.latin1.lm
+%%DATADIR%%/bs.ascii.lm
+%%DATADIR%%/bs.cp1250.lm
+%%DATADIR%%/bs.latin2.lm
+%%DATADIR%%/ca.latin1.lit.lm
+%%DATADIR%%/el.greek.lm
+%%DATADIR%%/ca.latin1.lm
+%%DATADIR%%/cs.cp1250.lm
+%%DATADIR%%/cs.latin2.lm
+%%DATADIR%%/cy.latin1.lm
+%%DATADIR%%/da.latin1.bible.lm
+%%DATADIR%%/da.latin1.lm
+%%DATADIR%%/de.latin1.bible.lm
+%%DATADIR%%/de.latin1.lm
+%%DATADIR%%/el.cp1253.lm
+%%DATADIR%%/en.ascii.lm
+%%DATADIR%%/eo.latin1-h.as.lm
+%%DATADIR%%/eo.latin1-x.as.lm
+%%DATADIR%%/eo.latin3.as.lm
+%%DATADIR%%/eo.latin3.lm
+%%DATADIR%%/eo.utf8.as.lm
+%%DATADIR%%/es.latin1.bible.lm
+%%DATADIR%%/es.latin1.lm
+%%DATADIR%%/et.cp1257.lm
+%%DATADIR%%/et.latin4.lm
+%%DATADIR%%/eu.latin1.lm
+%%DATADIR%%/fi.latin1.lm
+%%DATADIR%%/fr.latin1.bible.lm
+%%DATADIR%%/fr.latin1.lm
+%%DATADIR%%/ga.latin1.lit.lm
+%%DATADIR%%/ga.latin1.lm
+%%DATADIR%%/he.hebrew.lm
+%%DATADIR%%/hi.utf8.lm
+%%DATADIR%%/hr.ascii.lm
+%%DATADIR%%/hr.cp1250.bible.lm
+%%DATADIR%%/hr.cp1250.lm
+%%DATADIR%%/hr.latin2.lm
+%%DATADIR%%/hu.cp1250.lm
+%%DATADIR%%/hu.latin2.lm
+%%DATADIR%%/hy.armscii-8.lm
+%%DATADIR%%/is.latin1.lm
+%%DATADIR%%/it.latin1.lm
+%%DATADIR%%/ja.euc-jp.lm
+%%DATADIR%%/ja.sjis.lm
+%%DATADIR%%/la.ascii.lm
+%%DATADIR%%/lt.cp1257.lm
+%%DATADIR%%/lt.latin4.lm
+%%DATADIR%%/lv.cp1257.lm
+%%DATADIR%%/lv.latin4.lm
+%%DATADIR%%/nl.latin1.bible.lm
+%%DATADIR%%/nl.latin1.lm
+%%DATADIR%%/no.latin1.lm
+%%DATADIR%%/pl.latin2.lm
+%%DATADIR%%/po.latin2.lm
+%%DATADIR%%/pt-br.latin1.lm
+%%DATADIR%%/pt-pt.latin1.lm
+%%DATADIR%%/ro.ascii.lm
+%%DATADIR%%/ro.cp1250.lm
+%%DATADIR%%/ro.latin2.lm
+%%DATADIR%%/ru.cp1251.lm
+%%DATADIR%%/ru.cp866.lm
+%%DATADIR%%/ru.cyrillic.lm
+%%DATADIR%%/ru.koi8-r.lm
+%%DATADIR%%/ru.maccyr.lm
+%%DATADIR%%/ru.utf8.lm
+%%DATADIR%%/sk.ascii.lm
+%%DATADIR%%/sk.cp1250.lm
+%%DATADIR%%/sk.latin2.lm
+%%DATADIR%%/sl.ascii.lm
+%%DATADIR%%/sl.cp1250.lm
+%%DATADIR%%/sl.latin2.lm
+%%DATADIR%%/sq.latin1.lm
+%%DATADIR%%/sr.cp1250.lm
+%%DATADIR%%/sr.latin2.lm
+%%DATADIR%%/sv.latin1.bible.lm
+%%DATADIR%%/sv.latin1.lm
+%%DATADIR%%/sw.latin1.lm
+%%DATADIR%%/ta.tscii.lm
+%%DATADIR%%/th.cp874.lm
+%%DATADIR%%/th.tis-620.lm
+%%DATADIR%%/tl.ascii.bible.lm
+%%DATADIR%%/tl.ascii.lm
+%%DATADIR%%/tr.cp1254.lm
+%%DATADIR%%/tr.cp857.lm
+%%DATADIR%%/tr.latin5.lm
+%%DATADIR%%/ua.cp1251.lm
+%%DATADIR%%/ua.koi8-u.lm
+%%DATADIR%%/vi.viscii.lm
+%%DATADIR%%/zh.big5.lm
+%%DATADIR%%/zh.gb2312.lm
+@dirrm %%DATADIR%%