Date: Fri, 08 Apr 2011 05:33:54 -0500 From: Zhihao Yuan <lichray@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/156272: graphics/xli updates to snapshot 2006-11-10 Message-ID: <4d9ee495.8b3b2b0a.3c22.7ccb@mx.google.com> Resent-Message-ID: <201104081040.p38Ae8SQ069118@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156272
>Category: ports
>Synopsis: graphics/xli updates to snapshot 2006-11-10
>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: Fri Apr 08 10:40:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Zhihao Yuan
>Release: FreeBSD 8.2-STABLE amd64
>Organization:
Northern Illinois University
>Environment:
System: FreeBSD compaq.yuetime 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Mar 14 02:51:28 CDT 2011 root@compaq.yuetime:/usr/obj/usr/src/sys/HOUKAGO amd64
>Description:
Xli has a newer snapshot version (20061110) witch fixes a PBM crash problem. The distfile is missing, but it's hosted by Debian series distributions.
>How-To-Repeat:
>Fix:
The new revision involves 2 changes:
1. Uses MASTER_SITE_DEBIAN;
2. Includes a one-line patch to fix a multiple image merging problem. This patch first appears in Debian's own patch set.
--- patch-xli-1.17.0_11.diff begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/xli.orig/Makefile /usr/ports/graphics/xli/Makefile
--- /usr/ports/graphics/xli.orig/Makefile 2011-04-08 05:12:21.925784622 -0500
+++ /usr/ports/graphics/xli/Makefile 2011-04-08 05:19:27.167527452 -0500
@@ -7,11 +7,11 @@
PORTNAME= xli
PORTVERSION= 1.17.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
-#MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-#MASTER_SITE_SUBDIR= applications
-DISTNAME= xli-2005-09-04
+MASTER_SITES= ${MASTER_SITE_DEBIAN}
+MASTER_SITE_SUBDIR= pool/main/x/${PORTNAME}
+DISTNAME= xli_${PORTVERSION}+${XLI_SNAPVER:C/-//g}.orig
MAINTAINER= lichray@gmail.com
COMMENT= Utilities to display images in X11
@@ -19,6 +19,8 @@
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
+WRKSRC= ${WRKDIR}/xli-${XLI_SNAPVER}
+
USE_XORG= xi
USE_IMAKE= yes
@@ -26,4 +28,6 @@
MLINKS= xli.1 xview.1 xli.1 xsetbg.1
PLIST_FILES= bin/xli bin/xlito bin/xview bin/xsetbg lib/X11/app-defaults/Xli
+XLI_SNAPVER= 2006-11-10
+
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/xli.orig/distinfo /usr/ports/graphics/xli/distinfo
--- /usr/ports/graphics/xli.orig/distinfo 2011-04-08 05:12:21.925784622 -0500
+++ /usr/ports/graphics/xli/distinfo 2011-04-08 05:16:00.786003729 -0500
@@ -1,2 +1,2 @@
-SHA256 (xli-2005-09-04.tar.gz) = 9f513165fb3bf3fdde813db82c8f529fff66290814ce602c9715f6f52e9309f0
-SIZE (xli-2005-09-04.tar.gz) = 201219
+SHA256 (xli_1.17.0+20061110.orig.tar.gz) = 7b6e28f64012a56e848be4f57263b87a30014418ba4ecda556d8a0bde3c498fb
+SIZE (xli_1.17.0+20061110.orig.tar.gz) = 201326
diff -ruN --exclude=CVS /usr/ports/graphics/xli.orig/files/patch-xli.c /usr/ports/graphics/xli/files/patch-xli.c
--- /usr/ports/graphics/xli.orig/files/patch-xli.c 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/graphics/xli/files/patch-xli.c 2011-04-08 05:15:45.519573055 -0500
@@ -0,0 +1,10 @@
+--- xli.c.orig 2006-11-10 23:52:14.000000000 -0600
++++ xli.c 2011-04-08 04:57:58.469540144 -0500
+@@ -364,6 +364,7 @@ int main(int argc, char *argv[])
+ idisp = itmp;
+ }
+ freeImage(inew);
++ inew = idisp;
+ }
+
+ /*
--- patch-xli-1.17.0_11.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4d9ee495.8b3b2b0a.3c22.7ccb>