3 files changed, 20 insertions, 10 deletions

diff --git a/archivers/paq/Makefile b/archivers/paq/Makefile
index 0f5af202e09b..0182f8ee2533 100644
--- a/archivers/paq/Makefile
+++ b/archivers/paq/Makefile
@@ -77,31 +77,41 @@ do-build:
 .else
 	${CXX} ${WRKSRC}/${CPPFILE}.cpp ${CXXFLAGS} ${PAQFLAGS} -o ${WRKSRC}/${CPPFILE}
 .endif
+.if ${ARCH} == "alpha" || ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
+PLIST_SUB+=	THIRTYTWO="@comment "
+.else
 	${CXX} ${WRKSRC}/${LPAQ}.cpp ${CXXFLAGS} -o ${WRKSRC}/${LPAQ}
 	${CXX} ${WRKSRC}/${LPAQ}.cpp ${CXXFLAGS} -DWIKI -o ${WRKSRC}/${LPAQ}e
 	${CXX} ${WRKSRC}/${LPQ}.cpp ${CXXFLAGS} -o ${WRKSRC}/${LPQ}
 	${CXX} ${WRKSRC}/${PAQ9}.cpp ${CXXFLAGS} -o ${WRKSRC}/${PAQ9}
+PLIST_SUB+=	THIRTYTWO=""
+.endif
 
 do-install:
 .if !exists(${PREFIX}/bin)
 	${MKDIR} ${PREFIX}/bin
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/${CPPFILE} ${PREFIX}/bin
+.if ${ARCH} != "alpha" && ${ARCH} != "amd64" && ${ARCH} != "ia64" && ${ARCH} != "sparc64"
 	${INSTALL_PROGRAM} ${WRKSRC}/${LPAQ} ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/${LPAQ}e ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/${LPQ} ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/${PAQ9} ${PREFIX}/bin
+.endif
 .if !defined(NOPORTDOCS)
 .if !exists(${DOCSDIR})
 	${MKDIR} ${DOCSDIR}
 .endif
 	${INSTALL_MAN} ${WRKSRC}/${CPPFILE}.cpp ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/Readme.txt ${DOCSDIR}/${CPPFILE}_readme.txt
+.if ${ARCH} != "alpha" && ${ARCH} != "amd64" && ${ARCH} != "ia64" && ${ARCH} != "sparc64"
 	${INSTALL_MAN} ${WRKSRC}/${LPAQ}.cpp ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/${LPQ}.cpp ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/${PAQ9}.cpp ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/Readme.txt ${DOCSDIR}/${CPPFILE}_readme.txt
 	${INSTALL_MAN} ${WRKSRC}/readme.txt ${DOCSDIR}/${LPAQ}_readme.txt
 .endif
+.endif
 	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/archivers/paq/files/pkg-message.in b/archivers/paq/files/pkg-message.in
index 00de8d130ca5..326c8d0b2e13 100644
--- a/archivers/paq/files/pkg-message.in
+++ b/archivers/paq/files/pkg-message.in
@@ -1,7 +1,7 @@
 *************************************************************************
 
-See %%PREFIX%%/share/doc/paq/*_readme.txt and the comments at the head of 
-%%PREFIX%%/share/doc/paq/*paq*.cpp for instructions and details on usage
+See %%DOCSDIR%%/*_readme.txt and the comments at the head of 
+%%DOCSDIR%%/*paq*.cpp for instructions and details on usage
 and the algorithms employed.
 
 *************************************************************************
diff --git a/archivers/paq/pkg-plist b/archivers/paq/pkg-plist
index a51680f6f9c2..1209e26affeb 100644
--- a/archivers/paq/pkg-plist
+++ b/archivers/paq/pkg-plist
@@ -1,12 +1,12 @@
 bin/%%CPPFILE%%
-bin/%%LPAQ%%
-bin/%%LPAQ%%e
-bin/%%LPQ%%
-bin/%%PAQ9%%
+%%THIRTYTWO%%bin/%%LPAQ%%
+%%THIRTYTWO%%bin/%%LPAQ%%e
+%%THIRTYTWO%%bin/%%LPQ%%
+%%THIRTYTWO%%bin/%%PAQ9%%
 %%PORTDOCS%%%%DOCSDIR%%/%%CPPFILE%%.cpp
-%%PORTDOCS%%%%DOCSDIR%%/%%LPAQ%%.cpp
-%%PORTDOCS%%%%DOCSDIR%%/%%LPQ%%.cpp
-%%PORTDOCS%%%%DOCSDIR%%/%%PAQ9%%.cpp
 %%PORTDOCS%%%%DOCSDIR%%/%%CPPFILE%%_readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%LPAQ%%_readme.txt
+%%THIRTYTWO%%%%PORTDOCS%%%%DOCSDIR%%/%%LPAQ%%.cpp
+%%THIRTYTWO%%%%PORTDOCS%%%%DOCSDIR%%/%%LPQ%%.cpp
+%%THIRTYTWO%%%%PORTDOCS%%%%DOCSDIR%%/%%PAQ9%%.cpp
+%%THIRTYTWO%%%%PORTDOCS%%%%DOCSDIR%%/%%LPAQ%%_readme.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%