diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile index 4476fee365e..aea8e443d7b 100644 --- a/archivers/lzo/Makefile +++ b/archivers/lzo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2003/05/24 02:40:42 jolan Exp $ +# $OpenBSD: Makefile,v 1.31 2004/02/23 00:33:34 naddy Exp $ COMMENT= "portable speedy lossless data compression library" @@ -16,16 +16,11 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -SEPARATE_BUILD= concurrent +SEPARATE_BUILD= simple CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --enable-static -# Internal Compiler Error -.if ${MACHINE_ARCH} == "sparc64" -PATCH_LIST= patch-* sup-sparc64 -.endif - REGRESS_TARGET= test post-install: diff --git a/archivers/lzo/patches/sup-sparc64 b/archivers/lzo/patches/sup-sparc64 deleted file mode 100644 index 0e1e26271df..00000000000 --- a/archivers/lzo/patches/sup-sparc64 +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: sup-sparc64,v 1.2 2002/10/09 14:14:40 brad Exp $ ---- src/Makefile.in.orig Fri Jul 12 21:31:52 2002 -+++ src/Makefile.in Wed Oct 9 05:47:37 2002 -@@ -412,6 +412,18 @@ distclean-depend: - $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ - -+lzo1b_5.lo: -+ $(LIBTOOL) --mode=compile $(COMPILE) -O1 -c $< -+ -+lzo1b_6.lo: -+ $(LIBTOOL) --mode=compile $(COMPILE) -O1 -c $< -+ -+lzo1c_5.lo: -+ $(LIBTOOL) --mode=compile $(COMPILE) -O1 -c $< -+ -+lzo1c_6.lo: -+ $(LIBTOOL) --mode=compile $(COMPILE) -O1 -c $< -+ - mostlyclean-libtool: - -rm -f *.lo - diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile index a8c0b05037e..44fbf4e2f2b 100644 --- a/archivers/unrar/Makefile +++ b/archivers/unrar/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2004/02/11 17:46:02 sturm Exp $ +# $OpenBSD: Makefile,v 1.23 2004/02/23 00:33:34 naddy Exp $ COMMENT= "extract, list, and test RAR archives" @@ -16,7 +16,6 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}rar/ -# - work around optimizer bug in gcc 2.95 # - exceptions don't work on sparc64 .if ${MACHINE_ARCH} == "sparc64" PATCH_LIST= patch-* gcc-patch-* diff --git a/archivers/unrar/patches/gcc-patch-makefile_unix b/archivers/unrar/patches/gcc-patch-makefile_unix deleted file mode 100644 index b2bdc88fa4a..00000000000 --- a/archivers/unrar/patches/gcc-patch-makefile_unix +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: gcc-patch-makefile_unix,v 1.1 2003/04/16 20:59:18 sturm Exp $ ---- makefile.unix.orig Sat Dec 14 16:09:01 2002 -+++ makefile.unix Sat Dec 14 16:09:44 2002 -@@ -41,6 +41,8 @@ OBJECTS=rar.o strlist.o strfn.o pathfn.o - - .cpp.o: - $(COMPILE) -D$(WHAT) -c $< -+sha1.o: sha1.cpp -+ $(COMPILE) -O0 -c $? - - all: unrar - diff --git a/audio/faad/Makefile b/audio/faad/Makefile index 5f407f32aed..56dafbeec55 100644 --- a/audio/faad/Makefile +++ b/audio/faad/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2003/12/29 13:17:53 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2004/02/23 00:33:34 naddy Exp $ COMMENT= "MPEG2 and MPEG-4 AAC decoder" @@ -28,10 +28,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-lm" \ AUTOCONF_VERSION=${AUTOCONF_VERSION} -.if ${MACHINE_ARCH} == "sparc64" -PATCH_LIST= patch-* gcc-* -.endif - .include USE_GCC3?=No .if ${USE_GCC3:L} == "yes" diff --git a/audio/faad/patches/gcc-common_mp4v2_Makefile_am b/audio/faad/patches/gcc-common_mp4v2_Makefile_am deleted file mode 100644 index 72579709565..00000000000 --- a/audio/faad/patches/gcc-common_mp4v2_Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ -$OpenBSD: gcc-common_mp4v2_Makefile_am,v 1.1 2003/08/24 21:27:30 sturm Exp $ ---- common/mp4v2/Makefile.am.orig 2003-08-24 15:28:39.000000000 +0200 -+++ common/mp4v2/Makefile.am 2003-08-24 15:29:43.000000000 +0200 -@@ -111,3 +111,6 @@ EXTRA_DIST = API_CHANGES \ - libmp4v260.dsp \ - libmp4v2_st60.dsp \ - TODO -+ -+mp4file_io.lo: -+ $(LTCXXCOMPILE) -O0 -c mp4file_io.cpp diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile index 8722a0bd779..ccd1f5a57ab 100644 --- a/audio/liba52/Makefile +++ b/audio/liba52/Makefile @@ -1,4 +1,4 @@ -#$OpenBSD: Makefile,v 1.5 2003/11/18 21:22:09 sturm Exp $ +#$OpenBSD: Makefile,v 1.6 2004/02/23 00:33:34 naddy Exp $ CATEGORIES= audio @@ -19,8 +19,4 @@ PERMIT_DISTFILES_FTP=Yes PERMIT_PACKAGE_CDROM=Yes PERMIT_PACKAGE_FTP=Yes -.if ${MACHINE_ARCH} == "sparc64" -PATCH_LIST= patch-* gcc-* -.endif - .include diff --git a/audio/liba52/patches/gcc-liba52_Makefile_in b/audio/liba52/patches/gcc-liba52_Makefile_in deleted file mode 100644 index 0aa89eb8f86..00000000000 --- a/audio/liba52/patches/gcc-liba52_Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: gcc-liba52_Makefile_in,v 1.1 2003/11/18 21:22:09 sturm Exp $ ---- liba52/Makefile.in.orig 2003-11-18 21:59:28.000000000 +0100 -+++ liba52/Makefile.in 2003-11-18 22:10:36.000000000 +0100 -@@ -245,10 +245,16 @@ bitstream.lo bitstream.o : bitstream.c . - ../include/a52.h a52_internal.h bitstream.h - downmix.lo downmix.o : downmix.c ../include/config.h ../include/a52.h \ - a52_internal.h -+downmix.lo : -+ $(LIBTOOL) --mode=compile $(COMPILE:S,-O3,-O1,) -c downmix.c - imdct.lo imdct.o : imdct.c ../include/config.h ../include/a52.h \ - a52_internal.h ../include/mm_accel.h -+imdct.lo : -+ $(LIBTOOL) --mode=compile $(COMPILE:S,-O3,-O1,) -c imdct.c - parse.lo parse.o : parse.c ../include/config.h ../include/a52.h \ - a52_internal.h bitstream.h tables.h -+parse.lo : -+ $(LIBTOOL) --mode=compile $(COMPILE:S,-O3,-O1,) -c parse.c - - info-am: - info: info-am diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile index 8f23fa9059a..bdae2bf8160 100644 --- a/cad/chipmunk/Makefile +++ b/cad/chipmunk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2004/02/21 00:14:56 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.5 2004/02/23 00:33:34 naddy Exp $ COMMENT= "electronic CAD system" @@ -23,10 +23,6 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://www.sightly.net/distfiles/ DIST_SUBDIR= chipmunk -.if ${MACHINE_ARCH} == "sparc64" -PATCH_LIST= patch-* gcc-* -.endif - WRKDIST= ${WRKDIR} ALL_TARGET= makeonly LDIR= ${LOCALBASE}/share/chipmunk/ diff --git a/cad/chipmunk/patches/gcc-psys_src_Makefile b/cad/chipmunk/patches/gcc-psys_src_Makefile deleted file mode 100644 index d2893c0872d..00000000000 --- a/cad/chipmunk/patches/gcc-psys_src_Makefile +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: gcc-psys_src_Makefile,v 1.1 2003/11/21 14:50:41 sturm Exp $ ---- psys/src/Makefile.orig 2003-03-12 15:47:36.000000000 -0700 -+++ psys/src/Makefile 2003-11-21 05:53:03.000000000 -0700 -@@ -190,6 +190,9 @@ libp2c.a: $(OBJS) - p2clib.o: p2clib.c - $(CC) -c $(CFLAGS) $(P2CFLAGS) p2clib.c - -+newasmlib.o: -+ ${CC} ${CFLAGS} -O0 -c newasmlib.c -+ - clean: - -rm -f *.o libp2c.a ../libp2c.a -