Date: Thu, 26 May 2011 09:47:38 -0700 (PDT) From: Julien Laffaye <kimelto@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: hrs@FreeBSD.org Subject: ports/157353: [PATCH] print/xdvik-tetex: remove duplicate conflict line Message-ID: <4dde842a.41c6e30a.2f96.3b8e@mx.google.com> Resent-Message-ID: <201105261650.p4QGo8oH031214@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157353
>Category: ports
>Synopsis: [PATCH] print/xdvik-tetex: remove duplicate conflict line
>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: Thu May 26 16:50:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Julien Laffaye
>Release: FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD chulak.jlaffaye.net 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011
>Description:
Remove duplicate conflict line.
While I'm here, remove the MD5 checksum and make portlint happy.
Port maintainer (hrs@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- xdvik-tetex-22.84.16_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/print/xdvik.orig/Makefile /usr/ports/print/xdvik/Makefile
--- /usr/ports/print/xdvik.orig/Makefile 2011-05-26 17:39:02.000000000 +0100
+++ /usr/ports/print/xdvik/Makefile 2011-05-26 17:45:29.000000000 +0100
@@ -26,7 +26,7 @@
USE_GMAKE= yes
USE_MOTIF= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-system-t1lib \
+CONFIGURE_ARGS= --with-system-t1lib \
--with-t1lib-libdir=${LIBT1_PREFIX}/lib \
--with-t1lib-include=${LIBT1_PREFIX}/include \
--disable-multiplatform
@@ -38,8 +38,8 @@
PLIST_SUB= TEXMFDIR=${TEXMFDIR} TEXMFCONFIGDIR=${TEXMFDIR}-config
CONFLICTS= xdvi-[0-9]* xdvi-*-[0-9]* \
- *-xdvi-[0-9]* xdvi-*-[0-9]* \
- *-xdvik-[0-9]* ja-ptex-tetex-[0-9]*
+ *-xdvi-[0-9]* *-xdvik-[0-9]* \
+ ja-ptex-tetex-[0-9]*
MAN1= xdvi.1
MLINKS= xdvi.1 oxdvi.1
@@ -55,10 +55,10 @@
README README.CVS README_maintainer TODO
.if defined(WITH_LETTERSIZE)
-FLAVOR+= letter
-PAPERSIZE= letter
+FLAVOR+= letter
+PAPERSIZE= letter
.else
-PAPERSIZE= a4
+PAPERSIZE= a4
.endif
PKGINSTALL= ${WRKDIR}/pkg-install.sh
diff -ruN --exclude=CVS /usr/ports/print/xdvik.orig/distinfo /usr/ports/print/xdvik/distinfo
--- /usr/ports/print/xdvik.orig/distinfo 2011-05-26 17:39:02.000000000 +0100
+++ /usr/ports/print/xdvik/distinfo 2011-05-26 17:43:44.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (xdvik-22.84.16.tar.gz) = 86554dd666407957bb43b31a5bb352a1
SHA256 (xdvik-22.84.16.tar.gz) = 3e41620f1783bd8265620c93d2597b82a155833f93639add8e877f8eb5f47dbf
SIZE (xdvik-22.84.16.tar.gz) = 2185822
--- xdvik-tetex-22.84.16_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4dde842a.41c6e30a.2f96.3b8e>