diff options
-rw-r--r-- | x11-toolkits/panel--/Makefile | 5 | ||||
-rw-r--r-- | x11-toolkits/panel--/files/patch-configure | 13 | ||||
-rw-r--r-- | x11-toolkits/panel--/files/patch-ltmain.sh | 45 | ||||
-rw-r--r-- | x11-toolkits/panel--/files/patch-panel--::applet-main.gen_h | 18 |
4 files changed, 34 insertions, 47 deletions
diff --git a/x11-toolkits/panel--/Makefile b/x11-toolkits/panel--/Makefile index b9b06c5a564..0efe95db3e5 100644 --- a/x11-toolkits/panel--/Makefile +++ b/x11-toolkits/panel--/Makefile @@ -18,9 +18,10 @@ LIB_DEPENDS= gnomemm.9:${PORTSDIR}/x11-toolkits/gnome-- USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomelibs libpanel INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-static .include <bsd.port.mk> diff --git a/x11-toolkits/panel--/files/patch-configure b/x11-toolkits/panel--/files/patch-configure new file mode 100644 index 00000000000..c17838fe3a7 --- /dev/null +++ b/x11-toolkits/panel--/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/07/18 11:12:39 1.1 ++++ configure 2002/07/18 11:13:01 +@@ -5293,6 +5293,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/panel--/files/patch-ltmain.sh b/x11-toolkits/panel--/files/patch-ltmain.sh deleted file mode 100644 index 2bcec15dcf8..00000000000 --- a/x11-toolkits/panel--/files/patch-ltmain.sh +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- scripts/ltmain.sh.orig Wed Jan 23 11:38:40 2002 -+++ scripts/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" diff --git a/x11-toolkits/panel--/files/patch-panel--::applet-main.gen_h b/x11-toolkits/panel--/files/patch-panel--::applet-main.gen_h new file mode 100644 index 00000000000..eeaa03619f1 --- /dev/null +++ b/x11-toolkits/panel--/files/patch-panel--::applet-main.gen_h @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- panel--/applet-main.gen_h 2002/07/18 11:26:49 1.1 ++++ panel--/applet-main.gen_h 2002/07/18 11:29:40 +@@ -31,9 +31,9 @@ + Applet_Main(const Gtk::string &app_id, + const Gtk::string &app_version, + int argc, char **argv, +- struct poptOption *options = 0, +- unsigned int flags = 0, +- poptContext *return_ctx = 0); ++ struct poptOption *options, ++ unsigned int flags, ++ poptContext *return_ctx); + + ~Applet_Main(); + |