diff options
| author | wiz <wiz@pkgsrc.org> | 2009-04-29 09:24:17 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2009-04-29 09:24:17 +0000 |
| commit | dace830fdc0ff01046078f0ce2ff7df7f948e65d (patch) | |
| tree | 39acd46a1f9a1507b7fa338c98b9c3f79e2d7cb8 /graphics/xli | |
| parent | fbf8c128c7b5f3320d6147b6c0ad4fcad2afce5e (diff) | |
| download | pkgsrc-dace830fdc0ff01046078f0ce2ff7df7f948e65d.tar.gz | |
Convert to user-destdir. From Aleksey Cheusov in PR 40118.
Diffstat (limited to 'graphics/xli')
| -rw-r--r-- | graphics/xli/Makefile | 6 | ||||
| -rw-r--r-- | graphics/xli/distinfo | 4 | ||||
| -rw-r--r-- | graphics/xli/patches/patch-aa | 23 |
3 files changed, 24 insertions, 9 deletions
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index bccfc80e908..6bb3e0c0b2a 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/12/27 13:37:38 joerg Exp $ +# $NetBSD: Makefile,v 1.36 2009/04/29 09:24:17 wiz Exp $ DISTNAME= xli-2005-02-27 PKGNAME= xli-1.17.0 @@ -10,7 +10,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org 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" diff --git a/graphics/xli/distinfo b/graphics/xli/distinfo index 1d9a440b889..809dc986528 100644 --- a/graphics/xli/distinfo +++ b/graphics/xli/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.19 2006/01/12 00:48:36 joerg Exp $ +$NetBSD: distinfo,v 1.20 2009/04/29 09:24:17 wiz Exp $ 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 diff --git a/graphics/xli/patches/patch-aa b/graphics/xli/patches/patch-aa index 6f5a3ede376..d95ddf60f02 100644 --- a/graphics/xli/patches/patch-aa +++ b/graphics/xli/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2005/03/05 23:02:30 fredb Exp $ +$NetBSD: patch-aa,v 1.10 2009/04/29 09:24:18 wiz 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 @@ $NetBSD: patch-aa,v 1.9 2005/03/05 23:02:30 fredb Exp $ +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" |