From 99488bee3cdeb7fef4dfa928acaf8f468eca55d8 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 19 Jun 2006 09:46:43 +0000 Subject: [PATCH] kill a few MODGNU_SHARED_LIBS, no actual package changes. --- devel/chmlib/Makefile | 3 +-- devel/chmlib/patches/patch-Makefile_in | 12 ------------ devel/fribidi/Makefile | 3 +-- devel/libdsk/Makefile | 3 +-- devel/pcre++/Makefile | 4 +--- devel/pcre/Makefile | 5 +---- devel/pcre/patches/patch-Makefile_in | 25 ------------------------- japanese/kakasi/Makefile | 3 +-- 8 files changed, 6 insertions(+), 52 deletions(-) delete mode 100644 devel/chmlib/patches/patch-Makefile_in diff --git a/devel/chmlib/Makefile b/devel/chmlib/Makefile index 2fcf289be0d..690145edd56 100644 --- a/devel/chmlib/Makefile +++ b/devel/chmlib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2005/12/29 13:56:07 bernd Exp $ +# $OpenBSD: Makefile,v 1.3 2006/06/19 09:46:43 espie Exp $ COMMENT= "handling CHM files" CATEGORIES= devel textproc @@ -9,7 +9,6 @@ EXTRACT_SUFX= .tgz DISTNAME= chmlib-0.37.4 PKGNAME= ${DISTNAME}p0 SHARED_LIBS= chm 0.0 -MODGNU_SHARED_LIBS= chm '' WRKDIST= ${WRKDIR}/chmlib-0.37 CONFIGURE_STYLE=gnu diff --git a/devel/chmlib/patches/patch-Makefile_in b/devel/chmlib/patches/patch-Makefile_in deleted file mode 100644 index 20e9ee531f9..00000000000 --- a/devel/chmlib/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.1 2005/12/29 13:56:07 bernd Exp $ ---- Makefile.in.orig Wed Dec 28 15:28:17 2005 -+++ Makefile.in Wed Dec 28 15:28:42 2005 -@@ -31,7 +31,7 @@ src/%.lo: $(srcdir)/src/%.c - ${LIBTOOL} --mode=compile ${CC} -c -o $@ $^ ${CFLAGS} - - src/libchm.la: src/chm_lib.lo src/lzx.lo -- ${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath $(libdir) -+ ${LIBTOOL} --mode=link ${CC} -o $@ $^ ${libchm_la_LDFLAGS} ${LDFLAGS} -rpath $(libdir) - - install: src/libchm.la - mkdir -p $(DESTDIR)$(prefix) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) diff --git a/devel/fribidi/Makefile b/devel/fribidi/Makefile index 8a3acdee871..326c0edab7f 100644 --- a/devel/fribidi/Makefile +++ b/devel/fribidi/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2005/12/29 13:56:08 bernd Exp $ +# $OpenBSD: Makefile,v 1.6 2006/06/19 09:46:43 espie Exp $ COMMENT= "library implementing the Unicode Bidirectional Algorithm" DISTNAME= fribidi-0.10.4 PKGNAME= ${DISTNAME}p0 SHARED_LIBS= fribidi 0.0 -MODGNU_SHARED_LIBS= fribidi '' CATEGORIES= devel HOMEPAGE= http://fribidi.sourceforge.net/ diff --git a/devel/libdsk/Makefile b/devel/libdsk/Makefile index 1e5b57b9f35..b9f18a6f8e0 100644 --- a/devel/libdsk/Makefile +++ b/devel/libdsk/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.6 2006/01/02 18:15:53 bernd Exp $ +# $OpenBSD: Makefile,v 1.7 2006/06/19 09:46:43 espie Exp $ COMMENT= "library for accessing disks and disk image files" DISTNAME= libdsk-1.0.0 PKGNAME= ${DISTNAME}p0 SHARED_LIBS= dsk 2.2 -MODGNU_SHARED_LIBS= dsk '' CATEGORIES= devel HOMEPAGE= http://www.seasip.demon.co.uk/Unix/LibDsk/ diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile index 94f92110d72..8d3fafce34c 100644 --- a/devel/pcre++/Makefile +++ b/devel/pcre++/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2006/01/13 23:40:23 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2006/06/19 09:46:43 espie Exp $ COMMENT= "wrapper class around the pcre library" DISTNAME= pcre++-0.9.5 PKGNAME= ${DISTNAME}p1 SHARED_LIBS= pcre++ 1.0 -MODGNU_SHARED_LIBS= pcre++ '' -LIBpcre++_ALIAS= pcre__ CATEGORIES= devel HOMEPAGE= http://www.daemon.de/PCRE diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index cc6ee3563d3..2992f887221 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2006/01/13 23:40:23 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2006/06/19 09:46:43 espie Exp $ COMMENT= "perl-compatible regular expression library" @@ -7,9 +7,6 @@ PKGNAME= ${DISTNAME}p1 SHARED_LIBS= pcre 1.0 \ pcrecpp 2.0 \ pcreposix 1.0 -MODGNU_SHARED_LIBS= pcre '' \ - pcrecpp '' \ - pcreposix '' CATEGORIES= devel diff --git a/devel/pcre/patches/patch-Makefile_in b/devel/pcre/patches/patch-Makefile_in index 6e7d24f62f0..5b06fb19af5 100644 --- a/devel/pcre/patches/patch-Makefile_in +++ b/devel/pcre/patches/patch-Makefile_in @@ -1,30 +1,5 @@ --- Makefile.in.orig Mon Sep 12 10:45:39 2005 +++ Makefile.in Thu Dec 22 17:27:13 2005 -@@ -198,18 +198,18 @@ pcre_stringpiece_unittest@EXEEXT@: libpc - - libpcre.la: $(OBJ) - -rm -f libpcre.la -- $(LINKLIB) -rpath $(LIBDIR) -version-info \ -- '$(PCRELIBVERSION)' -o libpcre.la $(LOBJ) -+ $(LINKLIB) -rpath $(LIBDIR) $(libpcre_la_LDFLAGS) \ -+ -o libpcre.la $(LOBJ) - - libpcreposix.la: libpcre.la pcreposix.@OBJEXT@ - -rm -f libpcreposix.la -- $(LINKLIB) -rpath $(LIBDIR) libpcre.la -version-info \ -- '$(PCREPOSIXLIBVERSION)' -o libpcreposix.la pcreposix.lo -+ $(LINKLIB) -rpath $(LIBDIR) libpcre.la $(libpcreposix_la_LDFLAGS) \ -+ -o libpcreposix.la pcreposix.lo - - libpcrecpp.la: libpcre.la $(CPPOBJ) - -rm -f libpcrecpp.la -- $(CXXLINKLIB) -rpath $(LIBDIR) libpcre.la -version-info \ -- '$(PCRECPPLIBVERSION)' -o libpcrecpp.la $(CPPLOBJ) -+ $(CXXLINKLIB) -rpath $(LIBDIR) libpcre.la $(libpcrecpp_la_LDFLAGS) \ -+ -o libpcrecpp.la $(CPPLOBJ) - - # Note that files generated by ./configure and by dftables are in the current - # directory, not the source directory. @@ -438,7 +438,6 @@ install: all @ON_WINDOWS@ wininst @NOT_ON_WINDOWS@ $(LIBTOOL) --mode=install $(INSTALL) libpcreposix.la $(DESTDIR)$(LIBDIR)/libpcreposix.la @NOT_ON_WINDOWS@@HAVE_CPP@ echo "$(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la" diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile index f256032922e..37802c4b0b9 100644 --- a/japanese/kakasi/Makefile +++ b/japanese/kakasi/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.11 2005/12/24 16:21:03 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2006/06/19 09:46:43 espie Exp $ # FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $ COMMENT= "Kanji -> kana converter" DISTNAME= kakasi-2.3.4 SHARED_LIBS= kakasi 3.0 -MODGNU_SHARED_LIBS= kakasi -export-dynamic CATEGORIES= japanese MASTER_SITES= http://kakasi.namazu.org/stable/