From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 2 23:00:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B47FC1065675 for ; Sun, 2 Mar 2008 23:00:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7CD868FC17 for ; Sun, 2 Mar 2008 23:00:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m22N028v057281 for ; Sun, 2 Mar 2008 23:00:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m22N02f8057280; Sun, 2 Mar 2008 23:00:02 GMT (envelope-from gnats) Resent-Date: Sun, 2 Mar 2008 23:00:02 GMT Resent-Message-Id: <200803022300.m22N02f8057280@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, bf Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18B601065674 for ; Sun, 2 Mar 2008 22:55:22 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id E66288FC26 for ; Sun, 2 Mar 2008 22:55:21 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m22MqQqM058539 for ; Sun, 2 Mar 2008 22:52:26 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m22MqQTC058538; Sun, 2 Mar 2008 22:52:26 GMT (envelope-from nobody) Message-Id: <200803022252.m22MqQTC058538@www.freebsd.org> Date: Sun, 2 Mar 2008 22:52:26 GMT From: bf To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/121306: [PATCH]archivers/paq: temporarily disable parts of build on 64-bit architectures X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2008 23:00:02 -0000 >Number: 121306 >Category: ports >Synopsis: [PATCH]archivers/paq: temporarily disable parts of build on 64-bit architectures >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Mar 02 23:00:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: bf >Release: 7.0-STABLE i386 >Organization: >Environment: >Description: Temporarily disable lpaq, lpq, and paq9 components on 64-bit architectures, while we are fixing the code. (paq8 is still available for these architectures.) >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN paq.orig/Makefile paq/Makefile --- paq.orig/Makefile 2008-03-02 05:23:08.649286622 -0500 +++ paq/Makefile 2008-03-02 17:47:12.626220281 -0500 @@ -77,31 +77,40 @@ .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 diff -ruN paq.orig/files/pkg-message.in paq/files/pkg-message.in --- paq.orig/files/pkg-message.in 2008-03-02 05:23:08.641287281 -0500 +++ paq/files/pkg-message.in 2008-03-02 17:47:12.626220281 -0500 @@ -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 -ruN paq.orig/pkg-plist paq/pkg-plist --- paq.orig/pkg-plist 2008-03-02 05:23:08.665283627 -0500 +++ paq/pkg-plist 2008-03-02 17:47:12.626220281 -0500 @@ -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%% >Release-Note: >Audit-Trail: >Unformatted: