diff options
-rw-r--r-- | devel/dmalloc/Makefile | 21 | ||||
-rw-r--r-- | devel/dmalloc/PLIST | 3 | ||||
-rw-r--r-- | devel/dmalloc/distinfo | 9 | ||||
-rw-r--r-- | devel/dmalloc/patches/patch-aa | 40 |
4 files changed, 53 insertions, 20 deletions
diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile index 7e4bfadb22f..6f92ae90542 100644 --- a/devel/dmalloc/Makefile +++ b/devel/dmalloc/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.20 2009/12/09 20:35:53 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2010/02/11 18:35:07 drochner Exp $ -DISTNAME= dmalloc-5.4.2 +DISTNAME= dmalloc-5.5.2 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dmalloc/} +#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dmalloc/} +MASTER_SITES= http://dmalloc.com/releases/ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org @@ -18,19 +19,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shlib CFLAGS+= -fPIC -DPIC CONFIGURE_ARGS+= --enable-threads -INFO_FILES= # PLIST - -INSTALLATION_DIRS= ${PKGINFODIR} +CONFIGURE_ARGS+= --enable-cxx INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} - -# XXX the "installinfo" target is broken -#INSTALL_TARGET= install installinfo -post-install: - cd ${WRKSRC}/docs; for f in *.info *.info-[0-9]*; do \ - ${TEST} ! -f "$$f" || \ - ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR}; \ - done +INSTALL_TARGET= install installcxx +TEST_TARGET= heavy .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/dmalloc/PLIST b/devel/dmalloc/PLIST index 91feec8ab1b..bdfcce56a52 100644 --- a/devel/dmalloc/PLIST +++ b/devel/dmalloc/PLIST @@ -1,7 +1,6 @@ -@comment $NetBSD: PLIST,v 1.7 2006/03/20 18:15:38 jlam Exp $ +@comment $NetBSD: PLIST,v 1.8 2010/02/11 18:35:07 drochner Exp $ bin/dmalloc include/dmalloc.h -info/dmalloc.info lib/libdmalloc.a lib/libdmalloc.so lib/libdmallocth.a diff --git a/devel/dmalloc/distinfo b/devel/dmalloc/distinfo index 0f2e8ccc5ed..eaa77b6fdd6 100644 --- a/devel/dmalloc/distinfo +++ b/devel/dmalloc/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.6 2006/03/02 19:35:11 drochner Exp $ +$NetBSD: distinfo,v 1.7 2010/02/11 18:35:07 drochner Exp $ -SHA1 (dmalloc-5.4.2.tgz) = ecb53b6db7e4d6b6d16ab8e95d87ae79b5c771c7 -RMD160 (dmalloc-5.4.2.tgz) = b47d8d64f583d8115ef4279964abc229807890fe -Size (dmalloc-5.4.2.tgz) = 371228 bytes +SHA1 (dmalloc-5.5.2.tgz) = 20719de78decbd724bc3ab9d6dce2ea5e5922335 +RMD160 (dmalloc-5.5.2.tgz) = 2cfe4daa453337e0fae0656bdbdaad1214d6243d +Size (dmalloc-5.5.2.tgz) = 666608 bytes +SHA1 (patch-aa) = 04ce2571172eb7ed60aa9d4fa98a5cad0e88aec8 diff --git a/devel/dmalloc/patches/patch-aa b/devel/dmalloc/patches/patch-aa new file mode 100644 index 00000000000..d580e29fb04 --- /dev/null +++ b/devel/dmalloc/patches/patch-aa @@ -0,0 +1,40 @@ +$NetBSD: patch-aa,v 1.3 2010/02/11 18:35:07 drochner Exp $ + +--- Makefile.in.orig 2007-05-14 17:26:14.000000000 +0000 ++++ Makefile.in +@@ -257,7 +257,7 @@ shlib : $(BUILD_SL) + # via: http://256.com/gray/email.html + $(LIB_SL) : $(LIBRARY) + rm -f $@ $@.t +- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS) ++ @shlinkargs@ $(OBJS) $(NORMAL_OBJS) + mv $@.t $@ + + $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) +@@ -270,7 +270,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS) + + $(LIB_TH_SL) : $(LIB_TH) + rm -f $@ $@.t +- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS) ++ @shlinkargs@ $(OBJS) $(THREAD_OBJS) + mv $@.t $@ + + $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) +@@ -279,7 +279,7 @@ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CX + + $(LIB_CXX_SL) : $(LIB_CXX) + rm -f $@ $@.t +- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) ++ @shlinkargs@ $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) + mv $@.t $@ + + $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) +@@ -288,7 +288,7 @@ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $ + + $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) + rm -f $@ $@.t +- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) ++ @shlinkargs@ $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) + mv $@.t $@ + + threadssl : $(LIB_TH_SL) |