diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-08-06 19:06:30 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-08-06 19:06:30 +0000 |
commit | c0633510da317c661ae44bc821eb97649ae74106 (patch) | |
tree | 7ef93f9f261eb1db468322db19874df79369ff2e /x11-toolkits | |
parent | Update to 0.6. (diff) |
Use USE_GNOMENG.
Notes
Notes:
svn path=/head/; revision=64115
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/gdl/Makefile | 12 | ||||
-rw-r--r-- | x11-toolkits/gdl/files/patch-Makefile.in | 12 | ||||
-rw-r--r-- | x11-toolkits/gdl/files/patch-configure | 13 | ||||
-rw-r--r-- | x11-toolkits/gdl/files/patch-ltmain.sh | 28 | ||||
-rw-r--r-- | x11-toolkits/gdl/files/patch-scintilla-control::Makefile.in | 14 |
5 files changed, 36 insertions, 43 deletions
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile index 3012c918cbf4..109a0a5b6937 100644 --- a/x11-toolkits/gdl/Makefile +++ b/x11-toolkits/gdl/Makefile @@ -15,17 +15,15 @@ MAINTAINER?= gnome@FreeBSD.org USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= yes -GNU_CONFIGURE= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack bonobo gnomevfs +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' .include <bsd.port.mk> diff --git a/x11-toolkits/gdl/files/patch-Makefile.in b/x11-toolkits/gdl/files/patch-Makefile.in index a6f6a1be7bf4..a5db1625bf00 100644 --- a/x11-toolkits/gdl/files/patch-Makefile.in +++ b/x11-toolkits/gdl/files/patch-Makefile.in @@ -1,14 +1,10 @@ $FreeBSD$ ---- Makefile.in 2001/07/24 11:08:03 1.1 -+++ Makefile.in 2001/07/24 11:09:14 -@@ -146,10 +146,10 @@ - - SUBDIRS = idl gdl scintilla-control po intl - --m4datadir = $(datadir)/aclocal -+m4datadir = $(prefix)/share/aclocal +--- Makefile.in.orig Mon Aug 5 00:16:11 2002 ++++ Makefile.in Mon Aug 5 00:16:47 2002 +@@ -149,7 +149,7 @@ + m4datadir = $(prefix)/share/aclocal m4data_DATA = gdl.m4 -confexecdir = $(libdir) diff --git a/x11-toolkits/gdl/files/patch-configure b/x11-toolkits/gdl/files/patch-configure new file mode 100644 index 000000000000..d1fec8a86595 --- /dev/null +++ b/x11-toolkits/gdl/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/08/04 21:18:58 1.1 ++++ configure 2002/08/04 21:19:10 +@@ -5853,6 +5853,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/x11-toolkits/gdl/files/patch-ltmain.sh b/x11-toolkits/gdl/files/patch-ltmain.sh deleted file mode 100644 index 98cb05e4ddb3..000000000000 --- a/x11-toolkits/gdl/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/x11-toolkits/gdl/files/patch-scintilla-control::Makefile.in b/x11-toolkits/gdl/files/patch-scintilla-control::Makefile.in new file mode 100644 index 000000000000..589bee588e14 --- /dev/null +++ b/x11-toolkits/gdl/files/patch-scintilla-control::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- scintilla-control/Makefile.in 2002/08/04 21:44:30 1.1 ++++ scintilla-control/Makefile.in 2002/08/04 21:45:56 +@@ -198,7 +198,7 @@ + test_scintilla_LDFLAGS = + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) ++CCLD = $(CXX) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ + DATA = $(oaf_DATA) $(ui_DATA) + |