From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 2 22:20:10 2012 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 94E141065698 for ; Mon, 2 Jan 2012 22:20:10 +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 6CA128FC14 for ; Mon, 2 Jan 2012 22:20:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q02MKAIQ028911 for ; Mon, 2 Jan 2012 22:20:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q02MKADl028910; Mon, 2 Jan 2012 22:20:10 GMT (envelope-from gnats) Resent-Date: Mon, 2 Jan 2012 22:20:10 GMT Resent-Message-Id: <201201022220.q02MKADl028910@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, "A.J. Kehoe IV (Nanoman)" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80AB11065702 for ; Mon, 2 Jan 2012 22:15:03 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 50E798FC18 for ; Mon, 2 Jan 2012 22:15:03 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q02MF37H034394 for ; Mon, 2 Jan 2012 22:15:03 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q02MF3RW034393; Mon, 2 Jan 2012 22:15:03 GMT (envelope-from nobody) Message-Id: <201201022215.q02MF3RW034393@red.freebsd.org> Date: Mon, 2 Jan 2012 22:15:03 GMT From: "A.J. Kehoe IV (Nanoman)" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/163790: FreeBSD Port java/diablo-jdk16 Patch 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: Mon, 02 Jan 2012 22:20:10 -0000 >Number: 163790 >Category: ports >Synopsis: FreeBSD Port java/diablo-jdk16 Patch >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: Mon Jan 02 22:20:10 UTC 2012 >Closed-Date: >Last-Modified: >Originator: A.J. Kehoe IV (Nanoman) >Release: 8.2 >Organization: Nanoman's Company >Environment: FreeBSD localhost 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #0: Tue Sep 27 18:07:27 UTC 2011 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: I discovered that the FreeBSD port java/diablo-jdk16 doesn't reinstall as intended. -----BEGIN QUOTE----- # make deinstall ===> Deinstalling for java/diablo-jdk16 ===> Deinstalling diablo-jdk-1.6.0.07.02_18 # make reinstall ===> Installing for diablo-jdk-1.6.0.07.02_18 ===> diablo-jdk-1.6.0.07.02_18 depends on executable: javavm - found ===> diablo-jdk-1.6.0.07.02_18 depends on file: /usr/local/libdata/pkgconfig/xi.pc - found ===> diablo-jdk-1.6.0.07.02_18 depends on file: /usr/local/libdata/pkgconfig/xp.pc - found ===> diablo-jdk-1.6.0.07.02_18 depends on file: /usr/local/libdata/pkgconfig/xt.pc - found ===> diablo-jdk-1.6.0.07.02_18 depends on file: /usr/local/libdata/pkgconfig/xtst.pc - found ===> diablo-jdk-1.6.0.07.02_18 depends on shared library: z.4 - found Updating time zones...mv: rename /usr/ports/java/diablo-jdk16/work/tzupdater-1.3.45-2011n/zi to /usr/ports/java/diablo-jdk16/work/diablo-jdk1.6.0_07/jre/lib/zi: No such file or directory *** Error code 1 Stop in /usr/ports/java/diablo-jdk16. *** Error code 1 Stop in /usr/ports/java/diablo-jdk16. *** Error code 1 Stop in /usr/ports/java/diablo-jdk16. -----END QUOTE----- >How-To-Repeat: cd /usr/ports/java/diablo-jdk16 make install make deinstall make reinstall >Fix: In the "pre-install" part of the Makefile, the required directory is moved from the work directory instead of copied. To fix this, I replaced "MV" with "CP" and added the "-R" option. I've attached a patch for the Makefile. Patch attached with submission follows: --- ports/java/diablo-jdk16/Makefile.old 2011-12-24 14:24:35.000000000 -0500 +++ ports/java/diablo-jdk16/Makefile 2012-01-02 17:12:09.628237000 -0500 @@ -134,7 +134,7 @@ pre-install: @${ECHO_CMD} -n "Updating time zones..." @${RM} -rf ${WRKSRC}/jre/lib/zi - @${MV} -f ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi ${WRKSRC}/jre/lib/ + @${CP} -R -f ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi ${WRKSRC}/jre/lib/ @${ECHO_CMD} "done" @-${RM} -rf ${WRKSRC}/jre/lib/zi.tzdata* .endif >Release-Note: >Audit-Trail: >Unformatted: