diff options
Diffstat (limited to 'devel/glade')
| -rw-r--r-- | devel/glade/Makefile | 14 | ||||
| -rw-r--r-- | devel/glade/files/patch-configure | 13 | ||||
| -rw-r--r-- | devel/glade/files/patch-ltmain.sh | 45 |
3 files changed, 19 insertions, 53 deletions
diff --git a/devel/glade/Makefile b/devel/glade/Makefile index d8e10f056cac..a456c114dd12 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -14,20 +14,18 @@ MASTER_SITE_SUBDIR= stable/sources/glade MAINTAINER= gnome@FreeBSD.org USE_X_PREFIX= yes -USE_GNOME= yes -GNU_CONFIGURE= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack bonobo gnomedb +USE_LIBTOOL= yes CONFIGURE_ARGS= --with-bonobo --enable-gnome-db CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/libs" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -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 ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ - s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + s|[$$][(]top_builddir[)]/intl/libintl.a|-lintl|g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/devel/glade/files/patch-configure b/devel/glade/files/patch-configure new file mode 100644 index 000000000000..e7c57cd91030 --- /dev/null +++ b/devel/glade/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/07/11 17:36:30 1.1 ++++ configure 2002/07/11 17:36:40 +@@ -6336,6 +6336,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/devel/glade/files/patch-ltmain.sh b/devel/glade/files/patch-ltmain.sh deleted file mode 100644 index 91713d2306f8..000000000000 --- a/devel/glade/files/patch-ltmain.sh +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Wed Jan 23 11:38:40 2002 -+++ ltmain.sh Sun Feb 3 01:44:17 2002 -@@ -1037,8 +1037,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2412,6 +2420,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 -@@ -4179,10 +4190,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" |