From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 24 11:30:05 2007 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 10C5316A421 for ; Wed, 24 Oct 2007 11:30:05 +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 00BD613C4A6 for ; Wed, 24 Oct 2007 11:30:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l9OBU4Fw040279 for ; Wed, 24 Oct 2007 11:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l9OBU47X040276; Wed, 24 Oct 2007 11:30:04 GMT (envelope-from gnats) Resent-Date: Wed, 24 Oct 2007 11:30:04 GMT Resent-Message-Id: <200710241130.l9OBU47X040276@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, denisehg@hotpop.com Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 083F116A46E for ; Wed, 24 Oct 2007 11:27:11 +0000 (UTC) (envelope-from denisehg@hotpop.com) Received: from smtp-out.hotpop.com (smtp-out.hotpop.com [38.113.3.61]) by mx1.freebsd.org (Postfix) with ESMTP id D184213C4A8 for ; Wed, 24 Oct 2007 11:27:10 +0000 (UTC) (envelope-from denisehg@hotpop.com) Received: from hotpop.com (kubrick.hotpop.com [38.113.3.105]) by smtp-out.hotpop.com (Postfix) with SMTP id 36EE4A24DFC6 for ; Wed, 24 Oct 2007 11:26:52 +0000 (UTC) Received: from hotpop.com (unknown [123.117.32.165]) by smtp-1.hotpop.com (Postfix) with ESMTP id DC47A148255 for ; Wed, 24 Oct 2007 11:25:28 +0000 (UTC) Received: by hotpop.com (sSMTP sendmail emulation); Wed, 24 Oct 2007 19:25:29 +0800 Message-Id: <20071024112650.DC47A148255@smtp-1.hotpop.com> Date: Wed, 24 Oct 2007 19:25:29 +0800 From: denisehg@hotpop.com To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/117449: [PATCH] fixed install problem when `WITHOUT_KDE' is set X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: denisehg@hotpop.com List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2007 11:30:05 -0000 >Number: 117449 >Category: ports >Synopsis: [PATCH] fixed install problem when `WITHOUT_KDE' is set >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Oct 24 11:30:04 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Denise H. G. >Release: FreeBSD 6.2-STABLE amd64 >Organization: >Environment: System: FreeBSD pluton.xbsd.name 6.2-STABLE FreeBSD 6.2-STABLE #0: Sat Oct 20 01:41:47 CST 2007 dhg@pluton.xbsd.name:/opt/obj/usr/src/sys/mibsd-SMP-ULE amd64 >Description: If `WITHOUT_KDE' is set, the install scripts will install locale files into the root dir, and icons into `/usr/share/icons'. These dirs are not correct places to hold the data, I think. >How-To-Repeat: Set the environment `WITHOUT_KDE' and then make install. >Fix: --- Makefile.patch begins here --- --- /usr/ports/deskutils/kchmviewer/Makefile 2007-05-20 04:01:41.000000000 +0800 +++ Makefile 2007-10-24 18:57:52.000000000 +0800 @@ -25,13 +25,17 @@ .if !defined(WITHOUT_KDE) USE_KDELIBS_VER=3 PLIST_SUB+= KDE="" +PLIST_SUB+= QT="@comment " CONFIGURE_ARGS+=--with-kde .else USE_QT_VER= 3 +PLIST_SUB+= QT="" PLIST_SUB+= KDE="@comment " CONFIGURE_TARGET= CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} DO_NOT_COMPILE+=kio-msits +KDE_LOCALEDIR=${LOCALBASE}/share/locale +KDE_ICONDIR=${LOCALBASE}/share/icons .endif pre-everything:: @@ -43,4 +47,22 @@ @${REINPLACE_CMD} -e 's|-O2||g;s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} +post-configure: +.if defined(WITHOUT_KDE) + @${REINPLACE_CMD} -e 's|kde_locale =.*|kde_locale = ${KDE_LOCALEDIR}|g' \ + ${WRKSRC}/po/Makefile + @${REINPLACE_CMD} -e 's|kde_icondir =.*|kde_icondir = ${KDE_ICONDIR}|g' \ + ${WRKSRC}/src/pics/Makefile + @${REINPLACE_CMD} -e 's|crystalsvg|hicolor|g' \ + ${WRKSRC}/src/pics/Makefile +.endif + +pre-install: +.if defined(WITHOUT_KDE) + @${REINPLACE_CMD} -e 's|Categories=.*|Categories=Utility;|g' \ + ${WRKSRC}/lib/kio-msits/kchmviewer.desktop + @${INSTALL_DATA} ${WRKSRC}/lib/kio-msits/kchmviewer.desktop \ + ${LOCALBASE}/share/applications +.endif + .include --- Makefile.patch ends here --- --- pkg-plist.patch begins here --- --- /opt/ports/deskutils/kchmviewer/pkg-plist 2007-03-28 04:38:22.000000000 +0800 +++ pkg-plist 2007-10-24 18:54:04.000000000 +0800 @@ -8,16 +8,20 @@ %%KDE%%share/icons/crystalsvg/128x128/apps/kchmviewer.png %%KDE%%share/icons/crystalsvg/48x48/apps/kchmviewer.png %%KDE%%share/icons/crystalsvg/64x64/apps/kchmviewer.png -%%KDE%%share/locale/cs/LC_MESSAGES/kchmviewer.mo -%%KDE%%share/locale/du/LC_MESSAGES/kchmviewer.mo -%%KDE%%share/locale/fr/LC_MESSAGES/kchmviewer.mo -%%KDE%%share/locale/ru/LC_MESSAGES/kchmviewer.mo -%%KDE%%share/locale/tr/LC_MESSAGES/kchmviewer.mo -%%KDE%%share/locale/zh_CN/LC_MESSAGES/kchmviewer.mo +%%QT%%share/applications/kchmviewer.desktop +%%QT%%share/icons/hicolor/128x128/apps/kchmviewer.png +%%QT%%share/icons/hicolor/48x48/apps/kchmviewer.png +%%QT%%share/icons/hicolor/64x64/apps/kchmviewer.png +share/locale/cs/LC_MESSAGES/kchmviewer.mo +share/locale/du/LC_MESSAGES/kchmviewer.mo +share/locale/fr/LC_MESSAGES/kchmviewer.mo +share/locale/ru/LC_MESSAGES/kchmviewer.mo +share/locale/tr/LC_MESSAGES/kchmviewer.mo +share/locale/zh_CN/LC_MESSAGES/kchmviewer.mo %%KDE%%share/services/msits.protocol -%%KDE%%@dirrmtry share/locale/zh_CN/LC_MESSAGES -%%KDE%%@dirrmtry share/locale/zh_CN -%%KDE%%@dirrmtry share/locale/du/LC_MESSAGES -%%KDE%%@dirrmtry share/locale/du -%%KDE%%@dirrmtry share/locale/cs/LC_MESSAGES -%%KDE%%@dirrmtry share/locale/cs +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/du/LC_MESSAGES +@dirrmtry share/locale/du +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs --- pkg-plist.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: