diff options
| -rw-r--r-- | misc/usbprog/distinfo | 9 | ||||
| -rw-r--r-- | misc/usbprog/patches/patch-ac | 6 | ||||
| -rw-r--r-- | misc/usbprog/patches/patch-ad | 6 | ||||
| -rw-r--r-- | misc/usbprog/patches/patch-md5_Makefile.in | 13 | ||||
| -rw-r--r-- | misc/usbprog/patches/patch-usbprog_Makefile.am | 11 | ||||
| -rw-r--r-- | misc/usbprog/patches/patch-usbprog_Makefile.in | 22 |
6 files changed, 58 insertions, 9 deletions
diff --git a/misc/usbprog/distinfo b/misc/usbprog/distinfo index 9a2c2699566..bd7dc08632e 100644 --- a/misc/usbprog/distinfo +++ b/misc/usbprog/distinfo @@ -1,9 +1,12 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/07/21 11:25:42 drochner Exp $ +$NetBSD: distinfo,v 1.2 2013/03/07 22:03:41 joerg Exp $ SHA1 (usbprog-0.2.0.tar.bz2) = f025c42c0d43f14471a15bc3868efaea46284693 RMD160 (usbprog-0.2.0.tar.bz2) = 7d096717217d1ae426a8187cedd6c8fd87dd6139 Size (usbprog-0.2.0.tar.bz2) = 4388629 bytes SHA1 (patch-aa) = f76d7f18471b10a11b1073df1b88b8421960d5e0 SHA1 (patch-ab) = a336e677be50385c522c1b82c92f5fc85408dde8 -SHA1 (patch-ac) = fe0c9cdbaacbc325ed205be7873347b343bd08f6 -SHA1 (patch-ad) = 9634874d725628070bba635eeb66ae62a23cec56 +SHA1 (patch-ac) = 135639c97ffd8f755c00b31ab3641b9f63c94868 +SHA1 (patch-ad) = b8046699af3f341e8342c43e2c4887df4a6c0fd1 +SHA1 (patch-md5_Makefile.in) = afb069637d8811c4b9f2f4d5ff60d9e30947dd1c +SHA1 (patch-usbprog_Makefile.am) = d4bff3c2c1d9de347d849ec0486de3f2a727c152 +SHA1 (patch-usbprog_Makefile.in) = c52a94cc6cefd20206edff792deed700f3affab2 diff --git a/misc/usbprog/patches/patch-ac b/misc/usbprog/patches/patch-ac index ad5fde66cb2..7cc756ac9f6 100644 --- a/misc/usbprog/patches/patch-ac +++ b/misc/usbprog/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.1.1.1 2010/07/21 11:25:42 drochner Exp $ +$NetBSD: patch-ac,v 1.2 2013/03/07 22:03:42 joerg Exp $ ---- src/Makefile.in.orig 2010-07-15 16:35:33.000000000 +0000 +--- src/Makefile.in.orig 2010-01-05 15:24:18.000000000 +0000 +++ src/Makefile.in @@ -255,7 +255,7 @@ usbprog_SOURCES = io.h io.cc \ commands.cc commands.h \ main.cc -usbprog_LDADD = ../usbprog/libusbprog.la -+usbprog_LDADD = ../usbprog/libusbprog.la ../md5/libmd5.a ++usbprog_LDADD = ../usbprog/libusbprog.la ../md5/md5.lo man_MANS = usbprog.1 all: all-am diff --git a/misc/usbprog/patches/patch-ad b/misc/usbprog/patches/patch-ad index 2a0300296bd..a4b164144f1 100644 --- a/misc/usbprog/patches/patch-ad +++ b/misc/usbprog/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.1.1.1 2010/07/21 11:25:42 drochner Exp $ +$NetBSD: patch-ad,v 1.2 2013/03/07 22:03:42 joerg Exp $ ---- gui/Makefile.in.orig 2010-07-15 16:36:15.000000000 +0000 +--- gui/Makefile.in.orig 2010-01-05 15:24:18.000000000 +0000 +++ gui/Makefile.in @@ -268,7 +268,7 @@ EXTRA_DIST = usbprog.xpm usbprog_icon.xp @GUI_TRUE@ pindialog.cc pindialog.h \ @GUI_TRUE@ viewer.cc viewer.h -@GUI_TRUE@usbprog_gui_LDADD = ../usbprog/libusbprog.la \ -+@GUI_TRUE@usbprog_gui_LDADD = ../usbprog/libusbprog.la ../md5/libmd5.a \ ++@GUI_TRUE@usbprog_gui_LDADD = ../usbprog/libusbprog.la ../md5/md5.lo \ @GUI_TRUE@ @WX_LIBS@ @GUI_TRUE@man_MANS = usbprog-gui.1 diff --git a/misc/usbprog/patches/patch-md5_Makefile.in b/misc/usbprog/patches/patch-md5_Makefile.in new file mode 100644 index 00000000000..1514a40815b --- /dev/null +++ b/misc/usbprog/patches/patch-md5_Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-md5_Makefile.in,v 1.1 2013/03/07 22:03:42 joerg Exp $ + +--- md5/Makefile.in.orig 2010-01-05 15:24:18.000000000 +0000 ++++ md5/Makefile.in +@@ -216,7 +216,7 @@ libmd5_a_CFLAGS = -fPIC + libmd5_a_SOURCES = md5.c \ + md5.h + +-all: all-am ++all: md5.lo + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj diff --git a/misc/usbprog/patches/patch-usbprog_Makefile.am b/misc/usbprog/patches/patch-usbprog_Makefile.am new file mode 100644 index 00000000000..f40fb7ed31d --- /dev/null +++ b/misc/usbprog/patches/patch-usbprog_Makefile.am @@ -0,0 +1,11 @@ +$NetBSD: patch-usbprog_Makefile.am,v 1.1 2013/03/07 22:03:42 joerg Exp $ + +--- usbprog/Makefile.am.orig 2013-03-06 20:33:44.000000000 +0000 ++++ usbprog/Makefile.am +@@ -23,5 +23,5 @@ libusbprog_la_SOURCES = inifile.cc \ + optionparser.cc \ + digest.cc \ + stringutil.cc +-libusbprog_la_LIBADD = ../md5/libmd5.a ++libusbprog_la_LIBADD = ../md5/md5.lo + libusbprog_la_LDFLAGS = -version-info 3:0:3 diff --git a/misc/usbprog/patches/patch-usbprog_Makefile.in b/misc/usbprog/patches/patch-usbprog_Makefile.in new file mode 100644 index 00000000000..4ba051e3c63 --- /dev/null +++ b/misc/usbprog/patches/patch-usbprog_Makefile.in @@ -0,0 +1,22 @@ +$NetBSD: patch-usbprog_Makefile.in,v 1.1 2013/03/07 22:03:42 joerg Exp $ + +--- usbprog/Makefile.in.orig 2013-03-06 20:33:42.000000000 +0000 ++++ usbprog/Makefile.in +@@ -71,7 +71,7 @@ am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" + LTLIBRARIES = $(lib_LTLIBRARIES) +-libusbprog_la_DEPENDENCIES = ../md5/libmd5.a ++libusbprog_la_DEPENDENCIES = ../md5/md5.lo + am_libusbprog_la_OBJECTS = inifile.lo util.lo downloader.lo date.lo \ + firmwarepool.lo devices.lo usbprog.lo optionparser.lo \ + digest.lo stringutil.lo +@@ -262,7 +262,7 @@ libusbprog_la_SOURCES = inifile.cc \ + digest.cc \ + stringutil.cc + +-libusbprog_la_LIBADD = ../md5/libmd5.a ++libusbprog_la_LIBADD = ../md5/md5.lo + libusbprog_la_LDFLAGS = -version-info 3:0:3 + all: all-am + |