From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 13 18:40:15 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 2101816A41F for ; Sat, 13 Aug 2005 18:40:15 +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 71CF943D48 for ; Sat, 13 Aug 2005 18:40:14 +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 j7DIeEUg012167 for ; Sat, 13 Aug 2005 18:40:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j7DIeEE1012166; Sat, 13 Aug 2005 18:40:14 GMT (envelope-from gnats) Resent-Date: Sat, 13 Aug 2005 18:40:14 GMT Resent-Message-Id: <200508131840.j7DIeEE1012166@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 E8AE816A41F; Sat, 13 Aug 2005 18:38:01 +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 57BA843D45; Sat, 13 Aug 2005 18:38:01 +0000 (GMT) (envelope-from chinsan@chinsan.twbbs.org) Received: by chinsan.twbbs.org (Postfix, from userid 1001) id 9836373045; Sun, 14 Aug 2005 02:38:11 +0800 (CST) Message-Id: <20050813183811.9836373045@chinsan.twbbs.org> Date: Sun, 14 Aug 2005 02:38:11 +0800 (CST) From: chinsan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: trevor@FreeBSD.org Subject: ports/84875: [PATCH] print/acroreader7: fix rpm error & apply konb to Master/Slave port 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: Sat, 13 Aug 2005 18:40:15 -0000 >Number: 84875 >Category: ports >Synopsis: [PATCH] print/acroreader7: fix rpm error & apply konb to Master/Slave port >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Aug 13 18:40:14 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 #0: Wed Aug 10 04:42:20 CST 2005 root@chinsan.twbbs.org:/usr/obj/usr/src/sys/TAKAKO i386 >Description: 20050814: - AFFECTS: users of print/acroreader7 AUTHOR: chinsan.tw@gmail.com the former acroreader7 didn't completely clean rpm database. If you currently have the acroreader7 port installed, and want a clean uninstall. Please type: portupgrade -rf acroreader7 - While uninstall acroreader7, it didn't completely clean rpm database. - add ADOBE_LANG knob to apply Master/slave support for other language port. Thanks to Ion-Mihai Tetcu - 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 |grep AdobeReader AdobeReader_enu-7.0.0-2 AdobeReader 7 rpm still live in rpm database....:( >Fix: --- acroread7.diff begins here --- diff -ruN acroread7.orig/Makefile acroread7/Makefile --- acroread7.orig/Makefile Wed Aug 10 09:00:45 2005 +++ acroread7/Makefile Sun Aug 14 02:05:51 2005 @@ -7,17 +7,17 @@ PORTNAME= acroread7 PORTVERSION= 7.0.0 -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/ -DISTNAME= AdobeReader_enu-7.0.0-2.i386.rpm +CATEGORIES+= print linux +MASTER_SITES= http://download.adobe.com/pub/adobe/reader/unix/7x/7.0/${ADOBE_LANG}/ \ + ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/${ADOBE_LANG}/ +DISTNAME= AdobeReader_${ADOBE_LANG}-7.0.0-2.i386.rpm EXTRACT_SUFX= DIST_SUBDIR= acroread EXTRACT_ONLY= RESTRICTED= "Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html" -MAINTAINER= trevor@FreeBSD.org -COMMENT= View, distribute and print PDF documents +MAINTAINER?= trevor@FreeBSD.org +COMMENT?= View, distribute and print PDF documents BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \ @@ -34,6 +34,10 @@ PLIST= ${WRKDIR}/plist PREFIX?= ${LINUXBASE} # have a look at the USE_XLIB comment +.if defined(BATCH) || defined(ADOBE_LANG) +ADOBE_LANG?=enu +.endif + pre-install: @kldstat -v | ${GREP} -E 'linux(aout|elf)' >/dev/null ||\ { ${ECHO_MSG} "Linux ABI compatibility must be enabled to install ${PORTNAME}-${PORTVERSION}"; \ @@ -49,9 +53,11 @@ @${ECHO} @cwd %%LOCALBASE%% >> ${PLIST} @${ECHO} bin/acroread7 >> ${PLIST} @${ECHO} bin/acroread >> ${PLIST} + @${ECHO} "@unexec rpm -e --noscripts --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 --force --ignorearch --ignoreos --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 @@ -63,6 +69,6 @@ cd ${LOCALBASE}/bin ; ${LN} -sf ${PREFIX}/usr/local/Adobe/Acrobat7.0/bin/acroread acroread7 cd ${LOCALBASE}/bin ; ${LN} -sf ${PREFIX}/usr/local/Adobe/Acrobat7.0/bin/acroread acroread @${ECHO_MSG} "Be sure to read the license agreement in" - @${ECHO_MSG} "${PREFIX}/usr/local/Adobe/Acrobat7.0/Reader/Legal/ENU/license_ENU_uc.txt" + @${ECHO_MSG} "${PREFIX}/usr/local/Adobe/Acrobat7.0/Reader/Legal/${ADOBE_LANG:U}/license_${ADOBE_LANG:U}_uc.txt" .include --- acroread7.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: