From: <drd...@us...> - 2007-08-17 00:17:58
|
Revision: 414 http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=414&view=rev Author: drdoug007 Date: 2007-08-16 17:17:57 -0700 (Thu, 16 Aug 2007) Log Message: ----------- 2007-08-15 Doug Scott <do...@tr...> * patches/ctags-01-destdir.diff: missing from previous update :( * patches/electric-fence-01-solaris.diff: missing from previous update Modified Paths: -------------- spec-files-extra/trunk/ChangeLog Added Paths: ----------- spec-files-extra/trunk/patches/ctags-01-destdir.diff spec-files-extra/trunk/patches/electric-fence-01-solaris.diff Modified: spec-files-extra/trunk/ChangeLog =================================================================== --- spec-files-extra/trunk/ChangeLog 2007-08-16 18:17:17 UTC (rev 413) +++ spec-files-extra/trunk/ChangeLog 2007-08-17 00:17:57 UTC (rev 414) @@ -1,3 +1,8 @@ +2007-08-15 Doug Scott <do...@tr...> + + * patches/ctags-01-destdir.diff: missing from previous update :( + * patches/electric-fence-01-solaris.diff: missing from previous update + 2007-08-16 Brian Cameron <bri...@su...> * SFEconsolekit.spec, patches/ConsoleKit-01-head.diff, Added: spec-files-extra/trunk/patches/ctags-01-destdir.diff =================================================================== --- spec-files-extra/trunk/patches/ctags-01-destdir.diff (rev 0) +++ spec-files-extra/trunk/patches/ctags-01-destdir.diff 2007-08-17 00:17:57 UTC (rev 414) @@ -0,0 +1,70 @@ +--- ctags-5.6/Makefile.in.orig 2007-06-20 13:12:18.827287899 +0700 ++++ ctags-5.6/Makefile.in 2007-06-20 13:12:28.731171525 +0700 +@@ -84,12 +84,12 @@ + # + CTAGS_EXEC = $(CTAGS_PROG)$(EXEEXT) + ETAGS_EXEC = $(ETAGS_PROG)$(EXEEXT) +-DEST_CTAGS = $(bindir)/$(CTAGS_EXEC) +-DEST_ETAGS = $(bindir)/$(ETAGS_EXEC) +-DEST_READ_LIB = $(libdir)/$(READ_LIB) +-DEST_READ_INC = $(incdir)/$(READ_INC) +-DEST_CMAN = $(man1dir)/$(CMAN) +-DEST_EMAN = $(man1dir)/$(EMAN) ++DEST_CTAGS = $(DESTDIR)$(bindir)/$(CTAGS_EXEC) ++DEST_ETAGS = $(DESTDIR)$(bindir)/$(ETAGS_EXEC) ++DEST_READ_LIB = $(DESTDIR)$(libdir)/$(READ_LIB) ++DEST_READ_INC = $(DESTDIR)$(incdir)/$(READ_INC) ++DEST_CMAN = $(DESTDIR)$(man1dir)/$(CMAN) ++DEST_EMAN = $(DESTDIR)$(man1dir)/$(EMAN) + + # + # primary rules +@@ -124,7 +124,7 @@ + install-ctags: install-cbin install-cman + install-etags: install-ebin install-eman + +-$(bindir) $(man1dir) $(libdir) $(incdir): ++$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir): + $(srcdir)/mkinstalldirs $@ + + FORCE: +@@ -135,14 +135,14 @@ + install-bin: install-cbin install-ebin install-lib + install-cbin: $(DEST_CTAGS) + install-ebin: $(DEST_ETAGS) +-install-lib: $(DEST_READ_LIB) $(DEST_READ_INC) ++install-lib: $(DEST_READ_LIB) $(DESTDIR)$(DEST_READ_INC) + +-$(DEST_CTAGS): $(CTAGS_EXEC) $(bindir) FORCE ++$(DEST_CTAGS): $(CTAGS_EXEC) $(DESTDIR)$(bindir) FORCE + $(INSTALL_PROG) $(CTAGS_EXEC) $@ && chmod 755 $@ + + $(DEST_ETAGS): + - if [ -x $(DEST_CTAGS) ]; then \ +- cd $(bindir) && $(SLINK) $(CTAGS_EXEC) $(ETAGS_EXEC); \ ++ cd $(DESTDIR)$(bindir) && $(SLINK) $(CTAGS_EXEC) $(ETAGS_EXEC); \ + fi + + # +@@ -152,7 +152,7 @@ + install-cman: $(DEST_CMAN) + install-eman: $(DEST_EMAN) + +-$(DEST_CMAN): $(man1dir) $(MANPAGE) FORCE ++$(DEST_CMAN): $(DESTDIR)$(man1dir) $(MANPAGE) FORCE + - $(INSTALL_DATA) $(srcdir)/$(MANPAGE) $@ && chmod 644 $@ + + $(DEST_EMAN): +@@ -163,10 +163,10 @@ + # + # install the library + # +-$(DEST_READ_LIB): $(READ_LIB) $(libdir) FORCE ++$(DEST_READ_LIB): $(DESTDIR)$(READ_LIB) $(libdir) FORCE + $(INSTALL_PROG) $(READ_LIB) $@ && chmod 644 $@ + +-$(DEST_READ_INC): $(READ_INC) $(incdir) FORCE ++$(DEST_READ_INC): $(DESTDIR)$(READ_INC) $(incdir) FORCE + $(INSTALL_PROG) $(READ_INC) $@ && chmod 644 $@ + + Added: spec-files-extra/trunk/patches/electric-fence-01-solaris.diff =================================================================== --- spec-files-extra/trunk/patches/electric-fence-01-solaris.diff (rev 0) +++ spec-files-extra/trunk/patches/electric-fence-01-solaris.diff 2007-08-17 00:17:57 UTC (rev 414) @@ -0,0 +1,82 @@ +--- electric-fence-2.1.13/Makefile.orig 2007-08-15 11:19:25.471321735 +0700 ++++ electric-fence-2.1.13/Makefile 2007-08-15 11:30:07.649154986 +0700 +@@ -1,12 +1,9 @@ +-ASFLAGS= -mips2 +-CC= cc + AR= ar + INSTALL= install + MV= mv + CHMOD= chmod +-CFLAGS= -g +-LIB_INSTALL_DIR= /usr/lib +-MAN_INSTALL_DIR= /usr/man/man3 ++LIBDIR ?= /usr/lib ++MANDIR ?= /usr/share/man + + PACKAGE_SOURCE= README libefence.3 Makefile efence.h \ + efence.c page.c print.c eftest.c tstheap.c CHANGES COPYING +@@ -28,21 +25,21 @@ + + OBJECTS= efence.o page.o print.o + +-all: libefence.a tstheap eftest ++all: libefence.so tstheap eftest + @ echo + @ echo "Testing Electric Fence." + @ echo "After the last test, it should print that the test has PASSED." +- ./eftest +- ./tstheap 3072 ++ LD_LIBRARY_PATH=. ./eftest ++ LD_LIBRARY_PATH=. ./tstheap 3072 + @ echo + @ echo "Electric Fence confidence test PASSED." + @ echo + +-install: libefence.a libefence.3 +- $(MV) libefence.a $(LIB_INSTALL_DIR) +- $(CHMOD) 644 $(LIB_INSTALL_DIR)/libefence.a +- $(INSTALL) libefence.3 $(MAN_INSTALL_DIR)/libefence.3 +- $(CHMOD) 644 $(MAN_INSTALL_DIR)/libefence.3 ++install: libefence.so libefence.3 ++ mkdir -p $(DESTDIR)$(LIBDIR) ++ mkdir -p $(DESTDIR)$(MANDIR)/man3 ++ $(INSTALL) -c -m 0755 libefence.so $(DESTDIR)$(LIBDIR)/libefence.so ++ $(INSTALL) -c -m 0644 libefence.3 $(DESTDIR)$(MANDIR)/man3/libefence.3 + + clean: + - rm -f $(OBJECTS) tstheap.o eftest.o tstheap eftest libefence.a \ +@@ -57,16 +54,16 @@ + + shar: ElectricFence.shar + +-libefence.a: $(OBJECTS) +- - rm -f libefence.a +- $(AR) crv libefence.a $(OBJECTS) ++libefence.so: $(OBJECTS) ++ - rm -f libefence.so ++ $(CC) -G $(CFLAGS) -o libefence.so $(OBJECTS) + +-tstheap: libefence.a tstheap.o ++tstheap: libefence.so tstheap.o + - rm -f tstheap +- $(CC) $(CFLAGS) tstheap.o libefence.a -o tstheap -lpthread ++ $(CC) $(CFLAGS) tstheap.o -L. -lefence -o tstheap -lpthread + +-eftest: libefence.a eftest.o ++eftest: libefence.so eftest.o + - rm -f eftest +- $(CC) $(CFLAGS) eftest.o libefence.a -o eftest -lpthread ++ $(CC) $(CFLAGS) eftest.o -L. -lefence -o eftest -lpthread + + $(OBJECTS) tstheap.o eftest.o: efence.h +--- electric-fence-2.1.13/page.c.orig 2007-08-15 11:17:00.748205765 +0700 ++++ electric-fence-2.1.13/page.c 2007-08-15 11:18:42.019603599 +0700 +@@ -39,7 +39,7 @@ + { + #if ( defined(sgi) ) + return strerror(oserror()); +-#elif ( defined(_AIX) ) ++#elif ( defined(_AIX) || defined(sun)) + return strerror(errno); + #else + if ( errno > 0 && errno < sys_nerr ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |