diff options
| author | dholland <dholland@pkgsrc.org> | 2013-06-17 06:15:39 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2013-06-17 06:15:39 +0000 |
| commit | 688053747eeccc7918b1b330f040132ca42fc772 (patch) | |
| tree | 6d877f3f791dcd8429ef741938dbd3811d1fcfdc /sysutils | |
| parent | 26e94eb0b6f1f184772826672e3bb5c2bf08f365 (diff) | |
| download | pkgsrc-688053747eeccc7918b1b330f040132ca42fc772.tar.gz | |
Patch out -m486, which was breaking the build. Not really tested as
this package is i386-only.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/toshutils/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/toshutils/patches/patch-ad | 31 |
2 files changed, 29 insertions, 6 deletions
diff --git a/sysutils/toshutils/distinfo b/sysutils/toshutils/distinfo index bdbbdb73c8b..83417edaa02 100644 --- a/sysutils/toshutils/distinfo +++ b/sysutils/toshutils/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2009/09/18 09:37:01 obache Exp $ +$NetBSD: distinfo,v 1.8 2013/06/17 06:15:39 dholland Exp $ SHA1 (toshutils-991217.tar.gz) = b4eaf35fed37890c08f60999a2143f023cf632c1 RMD160 (toshutils-991217.tar.gz) = ea81ea88f53a4c0ed960868fc0604f9f82aeb836 @@ -6,7 +6,7 @@ Size (toshutils-991217.tar.gz) = 138892 bytes SHA1 (patch-aa) = 1e984f192a9d4b66b0e66acea8ce892e362ba072 SHA1 (patch-ab) = a654bc20cbd3c559038589dbb78c9a1f70552835 SHA1 (patch-ac) = 577362932ded64ac662355ae6a75153536d6faa3 -SHA1 (patch-ad) = 83f38f0f4c1ee3e5c368f34e49c4456dc2966d41 +SHA1 (patch-ad) = 1d8e2efb89cae04a1753c968d4db50ff82260450 SHA1 (patch-ae) = 5f1900c73732b38398fa1e04226c737cc66b220a SHA1 (patch-af) = bc22997f54a9880469749e5f7038c39d5cdc822a SHA1 (patch-ag) = 4ce55b6a00234b201871bbb0fe808f173f99d7d8 diff --git a/sysutils/toshutils/patches/patch-ad b/sysutils/toshutils/patches/patch-ad index 195d3f06417..8917bd8837e 100644 --- a/sysutils/toshutils/patches/patch-ad +++ b/sysutils/toshutils/patches/patch-ad @@ -1,4 +1,9 @@ -$NetBSD: patch-ad,v 1.3 2009/09/18 09:37:01 obache Exp $ +$NetBSD: patch-ad,v 1.4 2013/06/17 06:15:39 dholland Exp $ + +- destdir support +- drop -m486 as compilers don't recognize it any more +- add rpaths (shouldn't this use X11BASE and COMPILER_RPATH_FLAG?) +- add -li386 (shouldn't this be OS-dependent?) --- src/Makefile.in.orig 1999-12-17 13:07:03.000000000 +0000 +++ src/Makefile.in @@ -11,6 +16,15 @@ $NetBSD: patch-ad,v 1.3 2009/09/18 09:37:01 obache Exp $ MANDESTDIR = @mandir@ YACC = @YACC@ LEX = @LEX@ +@@ -40,7 +40,7 @@ LDFLAGS = -s + + PROGRAMS = @PROGRAMS@ + CC = @CC@ +-CFLAGS = -m486 -O2 -Wall -I../pixmaps @OS_CFLAGS@ @DEBUGFLAGS@ @GTK_CFLAGS@ ++CFLAGS = -O2 -Wall -I../pixmaps @OS_CFLAGS@ @DEBUGFLAGS@ @GTK_CFLAGS@ + + + FANOBJS = fan.o sci.o hci.o @@ -62,8 +62,8 @@ OBJS = sci.o hci.o fan.o svpw.o hotkey.o # # if your X11R6 libraries don't need X_LOCALE, remove -DX_LOCALE @@ -22,8 +36,16 @@ $NetBSD: patch-ad,v 1.3 2009/09/18 09:37:01 obache Exp $ GTKLIBS = @GTK_LIBS@ GTKFLAGS = @GTK_CFLAGS@ XMESSAGE = @XMESSAGE@ -@@ -88,37 +88,37 @@ sci.o: sci.c - $(CC) -m486 -Wall -c sci.c +@@ -82,43 +82,43 @@ lex.yy.c: parsetime.l + $(LEX) -i parsetime.l + + hci.o: hci.c +- $(CC) -m486 -Wall -c hci.c ++ $(CC) -Wall -c hci.c + + sci.o: sci.c +- $(CC) -m486 -Wall -c sci.c ++ $(CC) -Wall -c sci.c fan: $(FANOBJS) - $(CC) $(LDFLAGS) -o $@ $(FANOBJS) @@ -35,8 +57,9 @@ $NetBSD: patch-ad,v 1.3 2009/09/18 09:37:01 obache Exp $ hotkey: $(HOTOBJS) - $(CC) $(LDFLAGS) -o $@ $(HOTOBJS) $(XLIBS) +- + $(CC) $(LDFLAGS) -o $@ $(HOTOBJS) $(XLIBS) -li386 - ++ dispswitch: $(DISPOBJS) - $(CC) $(LDFLAGS) -o $@ $(DISPOBJS) $(GTKLIBS) + $(CC) $(LDFLAGS) -o $@ $(DISPOBJS) $(GTKLIBS) -li386 |