diff options
| author | sbd <sbd@pkgsrc.org> | 2011-11-16 03:53:11 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2011-11-16 03:53:11 +0000 |
| commit | f222fcdd292030f339174ec312151af2c3395423 (patch) | |
| tree | a9e4c4a1585efe754fad977323bb07d9033aa6b2 /sysutils/dmg2img | |
| parent | 5971a53ecd22eeddfe5d21e71fac3d7fce70e3ff (diff) | |
| download | pkgsrc-f222fcdd292030f339174ec312151af2c3395423.tar.gz | |
Add missing archivers/bzip2 buildlink and modify Makefile to respect
any CFLAGS from the environment and use LDFLAGS
Bump PKGREVISION
Diffstat (limited to 'sysutils/dmg2img')
| -rw-r--r-- | sysutils/dmg2img/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/dmg2img/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/dmg2img/patches/patch-aa | 21 |
3 files changed, 18 insertions, 12 deletions
diff --git a/sysutils/dmg2img/Makefile b/sysutils/dmg2img/Makefile index f31f07f813f..a8a1e0320e8 100644 --- a/sysutils/dmg2img/Makefile +++ b/sysutils/dmg2img/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2010/01/17 12:02:45 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2011/11/16 03:53:11 sbd Exp $ DISTNAME= dmg2img-1.6.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES+= http://vu1tur.eu.org/tools/download.pl? @@ -12,6 +12,7 @@ LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir +.include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/sysutils/dmg2img/distinfo b/sysutils/dmg2img/distinfo index 157dc569aa2..e75c2b3cfc4 100644 --- a/sysutils/dmg2img/distinfo +++ b/sysutils/dmg2img/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/29 04:24:27 agc Exp $ +$NetBSD: distinfo,v 1.2 2011/11/16 03:53:11 sbd Exp $ SHA1 (dmg2img-1.6.1.tar.gz) = 92d27819a79757b2d847b7c7b872431e02c37704 RMD160 (dmg2img-1.6.1.tar.gz) = fe9afa6b92ac743166e704a6c49183247f3b3c58 Size (dmg2img-1.6.1.tar.gz) = 38025 bytes -SHA1 (patch-aa) = 8a5c3e3d758ed938e50694f581d66c8160e7d217 +SHA1 (patch-aa) = 3dee9a84b3a456febf73e53f37ec4b5c924ee17e diff --git a/sysutils/dmg2img/patches/patch-aa b/sysutils/dmg2img/patches/patch-aa index 96d7b5e7cb5..ec0c46dd9c6 100644 --- a/sysutils/dmg2img/patches/patch-aa +++ b/sysutils/dmg2img/patches/patch-aa @@ -1,28 +1,33 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/10/29 04:24:27 agc Exp $ +$NetBSD: patch-aa,v 1.2 2011/11/16 03:53:11 sbd Exp $ ---- Makefile 2009/10/29 04:05:47 1.1 -+++ Makefile 2009/10/29 04:06:22 -@@ -1,12 +1,12 @@ +Respect any CFLAGS from the environment, use LDFLAGS and install to +${PREFIX}/bin using ${BSD_INSTALL_PROGRAM} + +--- Makefile.orig 2009-08-12 07:57:55.000000000 +0000 ++++ Makefile +@@ -1,12 +1,13 @@ #CC = gcc ##CFLAGS = -O3 - CFLAGS = -O2 -Wall +-CFLAGS = -O2 -Wall -BIN_DIR = ${DESTDIR}/usr/bin ++CFLAGS ?= -O2 ++CFLAGS += -Wall +BIN_DIR = ${DESTDIR}${PREFIX}/bin all: dmg2img vfdecrypt dmg2img: dmg2img.c dmg2img.h mntcmd.h gpt.h dmg2img.o base64.o adc.o - $(CC) -s -o dmg2img dmg2img.o base64.o adc.o -L. -lz -lbz2 -+ $(CC) -o dmg2img dmg2img.o base64.o adc.o -L. -lz -lbz2 ++ $(CC) $(LDFLAGS) -o dmg2img dmg2img.o base64.o adc.o -L. -lz -lbz2 dmg2img.o: dmg2img.c dmg2img.h $(CC) $(CFLAGS) -c dmg2img.c -@@ -18,11 +18,12 @@ +@@ -18,11 +19,12 @@ adc.o: adc.c adc.h $(CC) $(CFLAGS) -c adc.c vfdecrypt: vfdecrypt.c - $(CC) $(CFLAGS) -s -o vfdecrypt vfdecrypt.c -lcrypto -+ $(CC) $(CFLAGS) -o vfdecrypt vfdecrypt.c -lcrypto ++ $(CC) $(CFLAGS) $(LDFLAGS) -o vfdecrypt vfdecrypt.c -lcrypto install: dmg2img vfdecrypt mkdir -p ${BIN_DIR} |