From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 10 13:30:11 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22D4716A41F for ; Wed, 10 Aug 2005 13:30:11 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9786943D5C for ; Wed, 10 Aug 2005 13:30:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j7ADU9ZC018859 for ; Wed, 10 Aug 2005 13:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j7ADU9Il018857; Wed, 10 Aug 2005 13:30:09 GMT (envelope-from gnats) Resent-Date: Wed, 10 Aug 2005 13:30:09 GMT Resent-Message-Id: <200508101330.j7ADU9Il018857@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, chinsan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BF2616A41F; Wed, 10 Aug 2005 13:22:53 +0000 (GMT) (envelope-from chinsan@chinsan.twbbs.org) Received: from chinsan.twbbs.org (220-135-48-40.HINET-IP.hinet.net [220.135.48.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BFC743D53; Wed, 10 Aug 2005 13:22:51 +0000 (GMT) (envelope-from chinsan@chinsan.twbbs.org) Received: by chinsan.twbbs.org (Postfix, from userid 1001) id 8525D7301F; Wed, 10 Aug 2005 21:22:57 +0800 (CST) Message-Id: <20050810132257.8525D7301F@chinsan.twbbs.org> Date: Wed, 10 Aug 2005 21:22:57 +0800 (CST) From: chinsan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: trevor@FreeBSD.org Subject: ports/84751: [PATCH] print/acroreader7: fix error of rpm database(while uninstall) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: chinsan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 13:30:11 -0000 >Number: 84751 >Category: ports >Synopsis: [PATCH] print/acroreader7: fix error of rpm database(while uninstall) >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Aug 10 13:30:08 GMT 2005 >Closed-Date: >Last-Modified: >Originator: chinsan >Release: FreeBSD 5.4-STABLE i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD chinsan.twbbs.org 5.4-STABLE FreeBSD 5.4-STABLE #2: Sat Jul 30 16:27:25 CST 2005 root@chinsan.twbbs.org:/usr/obj/usr/src/sys/TAKAKO i386 >Description: - While uninstall acroreader7, it didn't completely clean rpm database. - add CONFLICTS list for other language port - port maintainer(trevor@FreeBSD.org) is CC'd. Thanks! :) >How-To-Repeat: # cd /usr/ports/print/acroread7 # make install clean # make deinstall # rpm -qa --root /usr/compat/linux/ --dbpath /var/lib/rpm : [skip] AdobeReader_enu-7.0.0-2 >Fix: --- acroread7.diff begins here --- diff -ruN acroread7.orig/Makefile acroread7/Makefile --- acroread7.orig/Makefile Wed Aug 10 09:00:45 2005 +++ acroread7/Makefile Wed Aug 10 20:43:59 2005 @@ -7,6 +7,7 @@ PORTNAME= acroread7 PORTVERSION= 7.0.0 +PORTREVISION= 1 CATEGORIES= print linux MASTER_SITES= http://download.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/ \ ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/ @@ -23,7 +24,13 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \ ${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango -CONFLICTS= acroread +CONFLICTS= acroread zh-acroread7-chs-[0-9]* zh-acroread7-cht-[0-9]* \ + acroread7-dan-[0-9]* de-acroread7-deu-[0-9]* \ + acroread7-esp-[0-9]* fr-acroread7-fra-[0-9]* \ + acroread7-ita-[0-9]* ja-acroread7-jpn-[0-9]* \ + ko-acroread7-kor-[0-9]* acroread7-nld-[0-9]* \ + acroread7-nor-[0-9]* acroread7-ptb-[0-9]* \ + acroread7-suo-[0-9]* acroread7-sve-[0-9]* ONLY_FOR_ARCHS= amd64 i386 USE_REINPLACE= yes @@ -49,9 +56,11 @@ @${ECHO} @cwd %%LOCALBASE%% >> ${PLIST} @${ECHO} bin/acroread7 >> ${PLIST} @${ECHO} bin/acroread >> ${PLIST} + @${ECHO} "@unexec rpm -e --root ${PREFIX} --dbpath /var/lib/rpm \ + ${DISTNAME:S/.i386.rpm//} 2>/dev/null || ${TRUE}" >> ${PLIST} do-install: - @rpm -U --ignorearch --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm \ + @rpm -U --ignorearch --ignoreos --force --root ${PREFIX} --dbpath /var/lib/rpm \ --nodeps --replacepkgs ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} || ${TRUE} # disable the PPKLite plugin as it requires an LDAP share lib ${CHMOD} 0 ${PREFIX}/usr/local/Adobe/Acrobat7.0/Reader/intellinux/plug_ins/PPKLite.api --- acroread7.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: