diff options
| author | adam <adam@pkgsrc.org> | 2011-04-12 13:17:20 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2011-04-12 13:17:20 +0000 |
| commit | 0db37778417d11eb1a77a82c5188b3fdfff5e659 (patch) | |
| tree | dbc90324a4b4eac948ada3017b3719a765643e5d /security | |
| parent | 1c88a889cd183513c5faede8ad352b333cf04273 (diff) | |
| download | pkgsrc-0db37778417d11eb1a77a82c5188b3fdfff5e659.tar.gz | |
Fix building on Mac OS X; pkglint clean-up
Diffstat (limited to 'security')
| -rw-r--r-- | security/libassuan2/Makefile | 12 | ||||
| -rw-r--r-- | security/libassuan2/PLIST | 3 | ||||
| -rw-r--r-- | security/libassuan2/buildlink3.mk | 4 | ||||
| -rw-r--r-- | security/libassuan2/distinfo | 3 | ||||
| -rw-r--r-- | security/libassuan2/patches/patch-src_Makefile.in | 15 |
5 files changed, 25 insertions, 12 deletions
diff --git a/security/libassuan2/Makefile b/security/libassuan2/Makefile index bd2178507bf..8f68bbc7977 100644 --- a/security/libassuan2/Makefile +++ b/security/libassuan2/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/08/16 21:42:18 wiz Exp $ -# +# $NetBSD: Makefile,v 1.3 2011/04/12 13:17:20 adam Exp $ DISTNAME= libassuan-2.0.1 CATEGORIES= security @@ -14,11 +13,10 @@ LICENSE= gnu-gpl-v3 PKG_DESTDIR_SUPPORT= user-destdir -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -CONFIGURE_ARGS+=--infodir=${PREFIX}/info -INFO_FILES= yes +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --infodir=${PREFIX}/info +INFO_FILES= yes .include "../../security/libgpg-error/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/security/libassuan2/PLIST b/security/libassuan2/PLIST index 9b9c9072558..42051070dfc 100644 --- a/security/libassuan2/PLIST +++ b/security/libassuan2/PLIST @@ -1,6 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/07/03 04:45:38 manu Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/04/12 13:17:20 adam Exp $ bin/libassuan-config include/assuan.h lib/libassuan.la share/aclocal/libassuan.m4 -info/assuan.info diff --git a/security/libassuan2/buildlink3.mk b/security/libassuan2/buildlink3.mk index 920beb91ab5..a9a5ac2572f 100644 --- a/security/libassuan2/buildlink3.mk +++ b/security/libassuan2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/07/03 04:45:38 manu Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2011/04/12 13:17:20 adam Exp $ BUILDLINK_TREE+= libassuan @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libassuan LIBASSUAN_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libassuan+= libassuan>=2.0.0 -BUILDLINK_ABI_DEPENDS.libassuan?= libassuan>=2.0.0 +BUILDLINK_ABI_DEPENDS.libassuan+= libassuan>=2.0.0 BUILDLINK_PKGSRCDIR.libassuan?= ../../security/libassuan2 .include "../../security/libgpg-error/buildlink3.mk" diff --git a/security/libassuan2/distinfo b/security/libassuan2/distinfo index 0250ab5b448..e3b818d2292 100644 --- a/security/libassuan2/distinfo +++ b/security/libassuan2/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2010/08/16 21:42:18 wiz Exp $ +$NetBSD: distinfo,v 1.3 2011/04/12 13:17:20 adam Exp $ SHA1 (libassuan-2.0.1.tar.bz2) = b7e9dbd41769cc20b1fb7db9f2ecdf276ffc352c RMD160 (libassuan-2.0.1.tar.bz2) = 2064f7f977f7084ba4780e0a87de0c808ee6f680 Size (libassuan-2.0.1.tar.bz2) = 494384 bytes +SHA1 (patch-src_Makefile.in) = 30d1e1c156090e761efbae28cdc22f9017bc259f diff --git a/security/libassuan2/patches/patch-src_Makefile.in b/security/libassuan2/patches/patch-src_Makefile.in new file mode 100644 index 00000000000..55f836515bc --- /dev/null +++ b/security/libassuan2/patches/patch-src_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2011/04/12 13:17:20 adam Exp $ + +Pass CFLAGS (needed on Mac OS X). + +--- src/Makefile.in.orig 2011-04-12 13:13:02.000000000 +0000 ++++ src/Makefile.in +@@ -981,7 +981,7 @@ uninstall-am: uninstall-binPROGRAMS unin + @HAVE_W32CE_SYSTEM_TRUE@ $(DESTDIR)$(bindir)/gpgcedev.dll + + mkheader: mkheader.c Makefile +- $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c ++ $(CC_FOR_BUILD) $(CFLAGS) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c + + assuan.h: assuan.h.in mkheader $(parts_of_assuan_h) + ./mkheader $(host_os) $(srcdir)/assuan.h.in >$@ |