pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/40118: DESTDIR support for graphics/xli (patch)



>Number:         40118
>Category:       pkg
>Synopsis:       DESTDIR support for graphics/xli (patch)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Dec 06 13:25:00 +0000 2008
>Originator:     cheusov%tut.by@localhost
>Release:        NetBSD 4.0_STABLE
>Organization:
>Environment:
System: NetBSD chen.chizhovka.net 4.0_STABLE NetBSD 4.0_STABLE (GENERIC) #1: 
Fri Nov 21 18:49:50 EET 2008 
cheusov%chen.chizhovka.net@localhost:/srv/obj/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
destdir support for xli package is needed
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/xli/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile    27 Dec 2006 13:37:38 -0000      1.35
+++ Makefile    6 Dec 2008 13:17:50 -0000
@@ -10,7 +10,9 @@
 HOMEPAGE=      http://pantransit.reptiles.org/prog/
 COMMENT=       X11 Image Loading Utility
 
-USE_IMAKE=     YES
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+USE_IMAKE=             YES
 INSTALLATION_DIRS+=    lib/X11/app-defaults
 
 .include "../../graphics/jpeg/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/xli/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo    12 Jan 2006 00:48:36 -0000      1.19
+++ distinfo    6 Dec 2008 13:17:50 -0000
@@ -3,7 +3,7 @@
 SHA1 (xli-2005-02-27.tar.gz) = 977d8ece0edd41f3ec606310496cf3231f046d88
 RMD160 (xli-2005-02-27.tar.gz) = fc83fa5173befa73a0eeb56ad323dad148ef1426
 Size (xli-2005-02-27.tar.gz) = 201011 bytes
-SHA1 (patch-aa) = e9092fdad849405c5a42760e64875566ed1e04f7
+SHA1 (patch-aa) = 68e347f4f54884ed3f11260304ef26e6b05e197d
 SHA1 (patch-ab) = 4c9e01d046fb96c056799b078c5d78451270f52e
 SHA1 (patch-ac) = b4fca6bc9c198728aa3adc0a9f8afaf5be5a004a
 SHA1 (patch-ad) = d47bc23051b9e75d265a413fdbde1c5bb9d747de
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/xli/patches/patch-aa,v
retrieving revision 1.9
diff -u -r1.9 patch-aa
--- patches/patch-aa    5 Mar 2005 23:02:30 -0000       1.9
+++ patches/patch-aa    6 Dec 2008 13:17:50 -0000
@@ -1,6 +1,6 @@
 $NetBSD: patch-aa,v 1.9 2005/03/05 23:02:30 fredb Exp $
 
---- Imakefile.orig     2005-02-27 18:42:39.000000000 -0600
+--- Imakefile.orig     2005-02-28 02:42:39.000000000 +0200
 +++ Imakefile
 @@ -13,17 +13,17 @@
        CCOPTIONS = -Aa -D_HPUX_SOURCE
@@ -16,13 +16,26 @@
 +PNG_INCLUDES =  -I${BUILDLINK_DIR}/include
 +PNG_LDFLAGS =  -L${BUILDLINK_DIR}/lib -Wl,-R${LOCALBASE}/lib
  
- SYSPATHFILE = $(XAPPLOADDIR)/Xli
+-SYSPATHFILE = $(XAPPLOADDIR)/Xli
++SYSPATHFILE = $(DESTDIR)$(XAPPLOADDIR)/Xli
  DEPLIBS = $(DEPXLIB)
--LOCAL_LIBRARIES = $(XLIB) $(JPEG_LDFLAGS) $(PNG_LDFLAGS) -ljpeg -lpng -lz
-+LOCAL_LIBRARIES = $(XLIB) $(JPEG_LDFLAGS) $(PNG_LDFLAGS) -ljpeg -lpng -lz
+ LOCAL_LIBRARIES = $(XLIB) $(JPEG_LDFLAGS) $(PNG_LDFLAGS) -ljpeg -lpng -lz
  SYS_LIBRARIES = -lm
 -DEFINES = -DHAS_MEMCPY
 +DEFINES = -DHAS_MEMCPY -DHAVE_GUNZIP -DHAVE_BUNZIP2
  EXTRA_INCLUDES = $(JPEG_INCLUDES) $(PNG_INCLUDES)
  
  SRCS1 = bright.c clip.c cmuwmrast.c compress.c dither.c faces.c fbm.c fill.c  
g3.c gif.c halftone.c imagetypes.c img.c mac.c mcidas.c mc_tables.c merge.c 
misc.c new.c options.c path.c pbm.c pcx.c reduce.c jpeg.c rle.c rlelib.c root.c 
rotate.c send.c smooth.c sunraster.c  value.c window.c xbitmap.c xli.c 
xpixmap.c xwd.c zio.c zoom.c ddxli.c tga.c bmp.c pcd.c png.c
+@@ -37,9 +37,9 @@ ComplexProgramTarget_1(xli,$(DEFINES) $(
+ ComplexProgramTarget_2(xlito,,)
+ 
+ install:: $(SYSPATHFILE)
+-      $(RM) $(BINDIR)/xview $(BINDIR)/xsetbg
+-      $(LN) $(BINDIR)/xli $(BINDIR)/xview
+-      $(LN) $(BINDIR)/xli $(BINDIR)/xsetbg
++      $(RM) $(DESTDIR)$(BINDIR)/xview $(DESTDIR)$(BINDIR)/xsetbg
++      $(LN) $(BINDIR)/xli $(DESTDIR)$(BINDIR)/xview
++      $(LN) $(BINDIR)/xli $(DESTDIR)$(BINDIR)/xsetbg
+ 
+ $(SYSPATHFILE):
+       @echo "*** Creating default $(SYSPATHFILE) since you"



Home | Main Index | Thread Index | Old Index