[Midnightbsd-cvs] mports [17691] trunk/archivers/bzip2/files: use new naming convention
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Oct 1 22:26:06 EDT 2014
Revision: 17691
http://svnweb.midnightbsd.org/mports/?rev=17691
Author: laffer1
Date: 2014-10-01 22:26:06 -0400 (Wed, 01 Oct 2014)
Log Message:
-----------
use new naming convention
Added Paths:
-----------
trunk/archivers/bzip2/files/patch-Makefile
Removed Paths:
-------------
trunk/archivers/bzip2/files/patch-aa
Copied: trunk/archivers/bzip2/files/patch-Makefile (from rev 17688, trunk/archivers/bzip2/files/patch-aa)
===================================================================
--- trunk/archivers/bzip2/files/patch-Makefile (rev 0)
+++ trunk/archivers/bzip2/files/patch-Makefile 2014-10-02 02:26:06 UTC (rev 17691)
@@ -0,0 +1,80 @@
+--- Makefile.orig Tue Jan 2 22:49:21 2007
++++ Makefile Tue Jul 31 21:16:23 2007
+@@ -15,13 +15,15 @@
+ SHELL=/bin/sh
+
+ # To assist in cross-compiling
+-CC=gcc
++CC?=gcc
+ AR=ar
+ RANLIB=ranlib
+ LDFLAGS=
+
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS?=-O2
++CFLAGS+=-Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
++SOFLAGS=-fPIC -fpic -DPIC
+
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr/local
+@@ -35,10 +37,18 @@
+ decompress.o \
+ bzlib.o
+
+-all: libbz2.a bzip2 bzip2recover test
++SO_OBJS= blocksort.so \
++ huffman.so \
++ crctable.so \
++ randtable.so \
++ compress.so \
++ decompress.so \
++ bzlib.so
+
+-bzip2: libbz2.a bzip2.o
+- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
++all: libbz2.so.1 libbz2.a bzip2 bzip2recover test
++
++bzip2: libbz2.so.1 libbz2.a bzip2.o
++ $(CC) $(CFLAGS) -o bzip2 bzip2.o libbz2.a
+
+ bzip2recover: bzip2recover.o
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
+@@ -52,6 +62,10 @@
+ $(RANLIB) libbz2.a ; \
+ fi
+
++libbz2.so.1: $(SO_OBJS)
++ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1 $(SO_OBJS)
++ ln -sf libbz2.so.1 libbz2.so
++
+ check: test
+ test: bzip2
+ @cat words1
+@@ -109,9 +123,25 @@
+ echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
+
+ clean:
+- rm -f *.o libbz2.a bzip2 bzip2recover \
++ rm -f *.o *.so libbz2.a libbz2.so.1 bzip2 bzip2recover \
+ sample1.rb2 sample2.rb2 sample3.rb2 \
+ sample1.tst sample2.tst sample3.tst
++
++blocksort.so: blocksort.c
++ @cat words0
++ $(CC) $(CFLAGS) $(SOFLAGS) -c blocksort.c -o blocksort.so
++huffman.so: huffman.c
++ $(CC) $(CFLAGS) $(SOFLAGS) -c huffman.c -o huffman.so
++crctable.so: crctable.c
++ $(CC) $(CFLAGS) $(SOFLAGS) -c crctable.c -o crctable.so
++randtable.so: randtable.c
++ $(CC) $(CFLAGS) $(SOFLAGS) -c randtable.c -o randtable.so
++compress.so: compress.c
++ $(CC) $(CFLAGS) $(SOFLAGS) -c compress.c -o compress.so
++decompress.so: decompress.c
++ $(CC) $(CFLAGS) $(SOFLAGS) -c decompress.c -o decompress.so
++bzlib.so: bzlib.c
++ $(CC) $(CFLAGS) $(SOFLAGS) -c bzlib.c -o bzlib.so
+
+ blocksort.o: blocksort.c
+ @cat words0
Deleted: trunk/archivers/bzip2/files/patch-aa
===================================================================
--- trunk/archivers/bzip2/files/patch-aa 2014-10-02 02:25:48 UTC (rev 17690)
+++ trunk/archivers/bzip2/files/patch-aa 2014-10-02 02:26:06 UTC (rev 17691)
@@ -1,80 +0,0 @@
---- Makefile.orig Tue Jan 2 22:49:21 2007
-+++ Makefile Tue Jul 31 21:16:23 2007
-@@ -15,13 +15,15 @@
- SHELL=/bin/sh
-
- # To assist in cross-compiling
--CC=gcc
-+CC?=gcc
- AR=ar
- RANLIB=ranlib
- LDFLAGS=
-
- BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS?=-O2
-+CFLAGS+=-Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
-+SOFLAGS=-fPIC -fpic -DPIC
-
- # Where you want it installed when you do 'make install'
- PREFIX=/usr/local
-@@ -35,10 +37,18 @@
- decompress.o \
- bzlib.o
-
--all: libbz2.a bzip2 bzip2recover test
-+SO_OBJS= blocksort.so \
-+ huffman.so \
-+ crctable.so \
-+ randtable.so \
-+ compress.so \
-+ decompress.so \
-+ bzlib.so
-
--bzip2: libbz2.a bzip2.o
-- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
-+all: libbz2.so.1 libbz2.a bzip2 bzip2recover test
-+
-+bzip2: libbz2.so.1 libbz2.a bzip2.o
-+ $(CC) $(CFLAGS) -o bzip2 bzip2.o libbz2.a
-
- bzip2recover: bzip2recover.o
- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
-@@ -52,6 +62,10 @@
- $(RANLIB) libbz2.a ; \
- fi
-
-+libbz2.so.1: $(SO_OBJS)
-+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1 $(SO_OBJS)
-+ ln -sf libbz2.so.1 libbz2.so
-+
- check: test
- test: bzip2
- @cat words1
-@@ -109,9 +123,25 @@
- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-
- clean:
-- rm -f *.o libbz2.a bzip2 bzip2recover \
-+ rm -f *.o *.so libbz2.a libbz2.so.1 bzip2 bzip2recover \
- sample1.rb2 sample2.rb2 sample3.rb2 \
- sample1.tst sample2.tst sample3.tst
-+
-+blocksort.so: blocksort.c
-+ @cat words0
-+ $(CC) $(CFLAGS) $(SOFLAGS) -c blocksort.c -o blocksort.so
-+huffman.so: huffman.c
-+ $(CC) $(CFLAGS) $(SOFLAGS) -c huffman.c -o huffman.so
-+crctable.so: crctable.c
-+ $(CC) $(CFLAGS) $(SOFLAGS) -c crctable.c -o crctable.so
-+randtable.so: randtable.c
-+ $(CC) $(CFLAGS) $(SOFLAGS) -c randtable.c -o randtable.so
-+compress.so: compress.c
-+ $(CC) $(CFLAGS) $(SOFLAGS) -c compress.c -o compress.so
-+decompress.so: decompress.c
-+ $(CC) $(CFLAGS) $(SOFLAGS) -c decompress.c -o decompress.so
-+bzlib.so: bzlib.c
-+ $(CC) $(CFLAGS) $(SOFLAGS) -c bzlib.c -o bzlib.so
-
- blocksort.o: blocksort.c
- @cat words0
More information about the Midnightbsd-cvs
mailing list