From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 13 11:10:14 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 6839F16A41F for ; Tue, 13 Sep 2005 11:10:14 +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 7B38943D55 for ; Tue, 13 Sep 2005 11:10:13 +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 j8DBADA8016268 for ; Tue, 13 Sep 2005 11:10:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j8DBADlG016267; Tue, 13 Sep 2005 11:10:13 GMT (envelope-from gnats) Resent-Date: Tue, 13 Sep 2005 11:10:13 GMT Resent-Message-Id: <200509131110.j8DBADlG016267@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, Serge Negodyuck Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C93B16A41F for ; Tue, 13 Sep 2005 11:00:57 +0000 (GMT) (envelope-from petr@petrovich.com.ua) Received: from petrovich.com.ua (office.irex.kiev.ua [194.44.225.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id D874143D45 for ; Tue, 13 Sep 2005 11:00:56 +0000 (GMT) (envelope-from petr@petrovich.com.ua) Received: from petrovich.com.ua (localhost.irex.kiev.ua [127.0.0.1]) by petrovich.com.ua (8.13.4/8.13.4) with ESMTP id j8DB0s4x037067 for ; Tue, 13 Sep 2005 14:00:55 +0300 (EEST) (envelope-from petr@petrovich.com.ua) Received: (from petr@localhost) by petrovich.com.ua (8.13.4/8.13.4/Submit) id j8DB0sQf037066; Tue, 13 Sep 2005 14:00:54 +0300 (EEST) (envelope-from petr) Message-Id: <200509131100.j8DB0sQf037066@petrovich.com.ua> Date: Tue, 13 Sep 2005 14:00:54 +0300 (EEST) From: Serge Negodyuck To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/86066: [maintainer update] ports/graphics/xnview X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Serge Negodyuck List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Sep 2005 11:10:14 -0000 >Number: 86066 >Category: ports >Synopsis: [maintainer update] ports/graphics/xnview >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Sep 13 11:10:12 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Serge Negodyuck >Release: FreeBSD 6.0-BETA4 i386 >Organization: >Environment: System: FreeBSD petrovich.com.ua 6.0-BETA4 FreeBSD 6.0-BETA4 #2: Tue Sep 6 21:27:42 EEST 2005 root@petrovich.com.ua:/usr/obj/usr/src/sys/PETROVICH i386 >Description: Update ports/graphics/xnview to 1.70 for FreeBSD >= 5.x >How-To-Repeat: >Fix: diff -ruN xnview/Makefile xnview-new/Makefile --- xnview/Makefile Mon Feb 23 18:18:03 2004 +++ xnview-new/Makefile Tue Sep 13 13:46:13 2005 @@ -6,10 +6,10 @@ # PORTNAME= xnview -PORTVERSION= 1.68 +PORTVERSION= 1.70 CATEGORIES= graphics -MASTER_SITES= ftp://www.zoo-logique.org/xnview/download/ -DISTNAME= XnView-x86-unknown-FreeBSD4.x-static +MASTER_SITES= http://download.xnview.com/ +DISTNAME= XnView-x86-unknown-FreeBSD5.x-static EXTRACT_SUFX= .tgz MAINTAINER= petr@petrovich.kiev.ua @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 NO_BUILD= yes USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/XnView-${PORTVERSION}-x86-unknown-FreeBSD4.x-static +WRKSRC= ${WRKDIR}/XnView-${PORTVERSION}-x86-unknown-FreeBSD5.x-static INSTALL_SLIB= yes MAN1= xnview.1 nview.1 @@ -27,16 +27,27 @@ .include -.if ${OSVERSION} >= 500000 -LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x +.if ${OSVERSION} < 500000 +PORTVERSION= 1.68 +DISTNAME= XnView-x86-unknown-FreeBSD4.x-static +WRKSRC= ${WRKDIR}/XnView-${PORTVERSION}-x86-unknown-FreeBSD4.x-static +PLIST_SUB+= FREEBSD4="" +.else +PLIST_SUB+= FREEBSD4="@comment " +.endif + +.if ${OSVERSION} >= 600000 + LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/xnview ${PREFIX}/bin/xnview ${INSTALL_PROGRAM} ${WRKSRC}/bin/nview ${PREFIX}/bin/nv ${INSTALL_PROGRAM} ${WRKSRC}/bin/nconvert ${PREFIX}/bin/nconvert +.if ${OSVERSION} < 500000 ${INSTALL_PROGRAM} ${WRKSRC}/lib/libformat.so.4.16 ${PREFIX}/lib/libformat.so.4 ${LN} -sf ${PREFIX}/lib/libformat.so.4 ${PREFIX}/lib/libformat.so +.endif ${INSTALL_DATA} ${WRKSRC}/app-defaults/XnView.ad ${PREFIX}/lib/X11/app-defaults/XnView cd ${WRKSRC}/man && ${INSTALL_MAN} xnview.1 nview.1 ${PREFIX}/man/man1 diff -ruN xnview/distinfo xnview-new/distinfo --- xnview/distinfo Mon Feb 23 18:18:03 2004 +++ xnview-new/distinfo Tue Sep 13 13:14:09 2005 @@ -1,2 +1,4 @@ MD5 (XnView-x86-unknown-FreeBSD4.x-static.tgz) = 44af50cefcb49e397fd02b74639b23e5 SIZE (XnView-x86-unknown-FreeBSD4.x-static.tgz) = 1428509 +MD5 (XnView-x86-unknown-FreeBSD5.x-static.tgz) = a6cbb30e84970f7ce2331f0840663358 +SIZE (XnView-x86-unknown-FreeBSD5.x-static.tgz) = 2630725 diff -ruN xnview/pkg-plist xnview-new/pkg-plist --- xnview/pkg-plist Mon Feb 23 18:18:03 2004 +++ xnview-new/pkg-plist Tue Sep 13 13:32:37 2005 @@ -2,8 +2,8 @@ bin/nv bin/xnview lib/X11/app-defaults/XnView -lib/libformat.so -lib/libformat.so.4 +%%FREEBSD4%%lib/libformat.so +%%FREEBSD4%%lib/libformat.so.4 %%PORTDOCS%%%%DOCSDIR%%/Formats.txt %%PORTDOCS%%%%DOCSDIR%%/ReadMe.txt %%PORTDOCS%%%%DOCSDIR%%/Usage.txt >Release-Note: >Audit-Trail: >Unformatted: