Subject: pkg/23833: graphics/xli doesn't compile on FreeBSD; trival fix
To: None <gnats-bugs@gnats.NetBSD.org>
From: None <dotz@irc.pl>
List: netbsd-bugs
Date: 12/21/2003 22:51:05
>Number:         23833
>Category:       pkg
>Synopsis:       graphics/xli doesn't compile on FreeBSD; trival fix
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Dec 21 22:52:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Michal Pasternak
>Release:        N/A
>Organization:
Good people with bad reputation
>Environment:
FreeBSD mainframe.w.lub.pl 4.9-RELEASE FreeBSD 4.9-RELEASE #0: Mon Oct 27 17:51:09 GMT 2003     root@freebsd-stable.sentex.ca:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
xli .tgz contains a png.c,v file (CVS information), propably packed there by mistake.

But, patch provided by FreeBSD is propably somehow different, than NetBSD one. Doesn't want to get around it:

===> Checking for vulnerabilities in xli-1.16nb4
=> Checksum OK for xli.1.16.tar.gz.
=> Checksum OK for xli-png.tar.gz.
===> Extracting for xli-1.16nb4
===> Required installed package png>=1.2.4: png-1.2.5nb2 found
===> Required installed package x11-links>=0.17: x11-links-0.18 found
===> Patching for xli-1.16nb4
===> Applying pkgsrc patches for xli-1.16nb4
patch: **** file png.c seems to be locked by somebody else under RCS
Patch /usr/pkgsrc/graphics/xli/patches/patch-ab failed
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/graphics/xli
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/graphics/xli

>How-To-Repeat:
Obvious.
>Fix:
The fix is to remove the file, propably released together in the package by an error, using rm. As the file is _NOT_ used in the build process (it's CVS information), you can _SAFELY_ delete it.


--- Makefile.orig~      Sun Dec 21 22:29:33 2003
+++ Makefile    Sun Dec 21 22:50:51 2003
@@ -18,6 +18,7 @@
 USE_IMAKE=     YES
 
 pre-patch:
+       ${RM} ${WRKSRC}/png.c,v
        @${PATCH} -d ${WRKSRC} -s -p1 < ${WRKSRC}/png.patch
 
 .include "../../graphics/png/buildlink2.mk"

>Release-Note:
>Audit-Trail:
>Unformatted: