diff options
Diffstat (limited to 'ftp/wmget/files')
-rw-r--r-- | ftp/wmget/files/patch-Makefile | 45 | ||||
-rw-r--r-- | ftp/wmget/files/patch-configure.c | 10 | ||||
-rw-r--r-- | ftp/wmget/files/patch-dockapp::Makefile | 17 |
3 files changed, 72 insertions, 0 deletions
diff --git a/ftp/wmget/files/patch-Makefile b/ftp/wmget/files/patch-Makefile new file mode 100644 index 000000000000..5b32b5290c7c --- /dev/null +++ b/ftp/wmget/files/patch-Makefile @@ -0,0 +1,45 @@ +--- Makefile.orig Sun Feb 9 05:04:20 2003 ++++ Makefile Tue Jan 27 16:34:31 2004 +@@ -46,16 +46,18 @@ + + # To specify a different prefix, you can override this on the command line + # make PREFIX=/opt/dockapps install +-PREFIX= /usr/local ++X11BASE?= /usr/X11R6 ++PREFIX?= ${X11BASE} + + INSTALLDIR= install -d -m 755 +-INSTALLBIN= install -m 555 +-INSTALLMAN= install -m 444 +-CC= gcc +-CFLAGS= -ansi -Wall -W -I/usr/X11R6/include -D_GNU_SOURCE ++INSTALLBIN= $(INSTALL_PROGRAM) ++INSTALLMAN= $(INSTALL_MAN) ++CC?= gcc ++CFLAGS?= -ansi -Wall -W ++CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include -D_GNU_SOURCE + # The following line is what I use during development + #CFLAGS:= $(CFLAGS) -Werror -g +-LDFLAGS= -L/usr/X11R6/lib -lXpm -lXext -lX11 -lm -lcurl ++LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib -lXpm -lXext -lX11 -lm -lcurl + DOCS= wmget.1 + + VERSION:= $(shell grep '\#define WMGET_VERSION ' wmget.h \ +@@ -107,7 +109,7 @@ + ##### LIBRARY ########################################################## + + dockapplib: +- make -C $(DALIBDIR) ++ ${MAKE} -C $(DALIBDIR) + + + +@@ -130,7 +132,7 @@ + wmget.html + sed -e '/^# DO NOT/q' < Makefile > Makefile.clean \ + && mv -f Makefile.clean Makefile +- make -C dockapp clean ++ ${MAKE} -C dockapp clean + + docclean: + rm -f $(DOCS) diff --git a/ftp/wmget/files/patch-configure.c b/ftp/wmget/files/patch-configure.c new file mode 100644 index 000000000000..843c35d64603 --- /dev/null +++ b/ftp/wmget/files/patch-configure.c @@ -0,0 +1,10 @@ +--- configure.c.orig Mon Jan 5 18:16:22 2004 ++++ configure.c Mon Jan 5 18:16:32 2004 +@@ -30,7 +30,6 @@ + */ + + #include <string.h> +-#include <malloc.h> + #include <ctype.h> + #include <getopt.h> + #include <stdlib.h> diff --git a/ftp/wmget/files/patch-dockapp::Makefile b/ftp/wmget/files/patch-dockapp::Makefile new file mode 100644 index 000000000000..e047a61e533b --- /dev/null +++ b/ftp/wmget/files/patch-dockapp::Makefile @@ -0,0 +1,17 @@ +--- dockapp/Makefile.orig Sun Feb 9 04:08:07 2003 ++++ dockapp/Makefile Mon Jan 5 18:11:28 2004 +@@ -19,11 +19,11 @@ + + # Makefile for the dockapp library packaged in the ``wmget'' application. + +- + DAOBJS= da_run.o da_x.o da_mouse.o + +-CFLAGS= -ansi -Wall -W -Werror -g +-LDFLAGS= -L/usr/X11R6/lib -lXpm -lXext -lX11 ++CFLAGS?= -ansi -Wall -W -Werror -g ++CFLAGS+= -I${X11BASE}/include ++LDFLAGS= -L${X11BASE}/lib -lXpm -lXext -lX11 + + dockapp.a: $(DAOBJS) + ar rcsv dockapp.a $(DAOBJS) |