From e8b00682418753bd00bf422870e08069ec488ba8 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Sat, 20 Jul 2002 11:45:53 +0000 Subject: Use USE_LIBTOOL. --- net/gnet-glib2/Makefile | 6 +----- net/gnet-glib2/files/patch-configure | 13 +++++++++++++ net/gnet-glib2/pkg-plist | 1 - net/gnet/Makefile | 6 +----- net/gnet/files/patch-configure | 13 +++++++++++++ net/gnet/pkg-plist | 1 - net/gnet2/Makefile | 6 +----- net/gnet2/files/patch-configure | 13 +++++++++++++ net/gnet2/pkg-plist | 1 - 9 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 net/gnet-glib2/files/patch-configure create mode 100644 net/gnet/files/patch-configure create mode 100644 net/gnet2/files/patch-configure (limited to 'net') diff --git a/net/gnet-glib2/Makefile b/net/gnet-glib2/Makefile index 83643e322dbe..ad79ea436ec5 100644 --- a/net/gnet-glib2/Makefile +++ b/net/gnet-glib2/Makefile @@ -14,7 +14,7 @@ MAINTAINER= nakai@FreeBSD.org USE_REINPLACE= yes USE_GNOMENG= yes -USE_GNOME= glib12 +USE_GNOME= gnomehack glib12 USE_LIBTOOL= yes INSTALLS_SHLIB= yes @@ -36,10 +36,6 @@ post-patch: # install configincludedir correctly @${REINPLACE_CMD} -E -e 's|^(configincludedir).+$$|\1=\$$\(pkgincludedir\)|' \ ${WRKSRC}/Makefile.in -# install *.pc files in correct FreeBSD dir - @${REINPLACE_CMD} -E -e \ - 's|^(pkgconfigdir[ ]+=[ ]+)\$$\(libdir\)/(pkgconfig)|\1${PREFIX}/libdata/\2|' \ - ${WRKSRC}/Makefile.in post-install: @${INSTALL_SCRIPT} ${WRKSRC}/gnet-config ${PREFIX}/bin diff --git a/net/gnet-glib2/files/patch-configure b/net/gnet-glib2/files/patch-configure new file mode 100644 index 000000000000..0071caef4a7f --- /dev/null +++ b/net/gnet-glib2/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/07/20 11:29:10 1.1 ++++ configure 2002/07/20 11:29:19 +@@ -6725,6 +6725,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/net/gnet-glib2/pkg-plist b/net/gnet-glib2/pkg-plist index 0a1adae9262b..3107cd1eff16 100644 --- a/net/gnet-glib2/pkg-plist +++ b/net/gnet-glib2/pkg-plist @@ -15,7 +15,6 @@ include/gnet/udp.h include/gnet/unix.h include/gnet/url.h lib/libgnet.a -lib/libgnet.la lib/libgnet.so lib/libgnet.so.1 libdata/pkgconfig/gnet.pc diff --git a/net/gnet/Makefile b/net/gnet/Makefile index 83643e322dbe..ad79ea436ec5 100644 --- a/net/gnet/Makefile +++ b/net/gnet/Makefile @@ -14,7 +14,7 @@ MAINTAINER= nakai@FreeBSD.org USE_REINPLACE= yes USE_GNOMENG= yes -USE_GNOME= glib12 +USE_GNOME= gnomehack glib12 USE_LIBTOOL= yes INSTALLS_SHLIB= yes @@ -36,10 +36,6 @@ post-patch: # install configincludedir correctly @${REINPLACE_CMD} -E -e 's|^(configincludedir).+$$|\1=\$$\(pkgincludedir\)|' \ ${WRKSRC}/Makefile.in -# install *.pc files in correct FreeBSD dir - @${REINPLACE_CMD} -E -e \ - 's|^(pkgconfigdir[ ]+=[ ]+)\$$\(libdir\)/(pkgconfig)|\1${PREFIX}/libdata/\2|' \ - ${WRKSRC}/Makefile.in post-install: @${INSTALL_SCRIPT} ${WRKSRC}/gnet-config ${PREFIX}/bin diff --git a/net/gnet/files/patch-configure b/net/gnet/files/patch-configure new file mode 100644 index 000000000000..0071caef4a7f --- /dev/null +++ b/net/gnet/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/07/20 11:29:10 1.1 ++++ configure 2002/07/20 11:29:19 +@@ -6725,6 +6725,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/net/gnet/pkg-plist b/net/gnet/pkg-plist index 0a1adae9262b..3107cd1eff16 100644 --- a/net/gnet/pkg-plist +++ b/net/gnet/pkg-plist @@ -15,7 +15,6 @@ include/gnet/udp.h include/gnet/unix.h include/gnet/url.h lib/libgnet.a -lib/libgnet.la lib/libgnet.so lib/libgnet.so.1 libdata/pkgconfig/gnet.pc diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile index 83643e322dbe..ad79ea436ec5 100644 --- a/net/gnet2/Makefile +++ b/net/gnet2/Makefile @@ -14,7 +14,7 @@ MAINTAINER= nakai@FreeBSD.org USE_REINPLACE= yes USE_GNOMENG= yes -USE_GNOME= glib12 +USE_GNOME= gnomehack glib12 USE_LIBTOOL= yes INSTALLS_SHLIB= yes @@ -36,10 +36,6 @@ post-patch: # install configincludedir correctly @${REINPLACE_CMD} -E -e 's|^(configincludedir).+$$|\1=\$$\(pkgincludedir\)|' \ ${WRKSRC}/Makefile.in -# install *.pc files in correct FreeBSD dir - @${REINPLACE_CMD} -E -e \ - 's|^(pkgconfigdir[ ]+=[ ]+)\$$\(libdir\)/(pkgconfig)|\1${PREFIX}/libdata/\2|' \ - ${WRKSRC}/Makefile.in post-install: @${INSTALL_SCRIPT} ${WRKSRC}/gnet-config ${PREFIX}/bin diff --git a/net/gnet2/files/patch-configure b/net/gnet2/files/patch-configure new file mode 100644 index 000000000000..0071caef4a7f --- /dev/null +++ b/net/gnet2/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/07/20 11:29:10 1.1 ++++ configure 2002/07/20 11:29:19 +@@ -6725,6 +6725,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/net/gnet2/pkg-plist b/net/gnet2/pkg-plist index 0a1adae9262b..3107cd1eff16 100644 --- a/net/gnet2/pkg-plist +++ b/net/gnet2/pkg-plist @@ -15,7 +15,6 @@ include/gnet/udp.h include/gnet/unix.h include/gnet/url.h lib/libgnet.a -lib/libgnet.la lib/libgnet.so lib/libgnet.so.1 libdata/pkgconfig/gnet.pc -- cgit v1.2.3