diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-05-01 20:23:03 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-05-01 20:23:03 +0000 |
commit | 17b6cc0afe9b40f3959b94130e056a822adc30b4 (patch) | |
tree | 1e3b468b04c0618f2192a0c1300447f2fc6e1b17 /www/libgtkhtml | |
parent | Change MASTER_SITES. (diff) |
- Move misc documentation into share/doc where it belongs;
- use USE_LIBTOOL while I here;
- make gnome-hint from gnomecore actually working;
- bump PORTREVISIONs.
Notes
Notes:
svn path=/head/; revision=58418
Diffstat (limited to 'www/libgtkhtml')
-rw-r--r-- | www/libgtkhtml/Makefile | 4 | ||||
-rw-r--r-- | www/libgtkhtml/files/patch-af | 23 | ||||
-rw-r--r-- | www/libgtkhtml/files/patch-doc::Makefile.in | 14 | ||||
-rw-r--r-- | www/libgtkhtml/files/patch-ltmain.sh | 36 | ||||
-rw-r--r-- | www/libgtkhtml/pkg-plist | 13 |
5 files changed, 42 insertions, 48 deletions
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index eba64859f490..81bc13ca4246 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkhtml PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gtkhtml @@ -25,7 +25,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOMECTRL= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --with-gconf=yes \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/www/libgtkhtml/files/patch-af b/www/libgtkhtml/files/patch-af index d7e199bf43cc..fee4a53519fc 100644 --- a/www/libgtkhtml/files/patch-af +++ b/www/libgtkhtml/files/patch-af @@ -1,7 +1,22 @@ ---- configure.orig Thu Dec 14 12:54:55 2000 -+++ configure Thu Dec 14 16:34:25 2000 -@@ -3932,3 +3932,3 @@ + +$FreeBSD$ + +--- configure.orig Mon Apr 15 19:37:22 2002 ++++ configure Wed May 1 12:17:00 2002 +@@ -7025,6 +7025,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' +@@ -9334,7 +9335,7 @@ + + if test "x$enable_xim" = "xyes"; then BACKUP_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS `gtk-config --libs`" + LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`" - echo $ac_n "checking for gdk_im_begin""... $ac_c" 1>&6 + echo "$as_me:9338: checking for gdk_im_begin" >&5 + echo $ECHO_N "checking for gdk_im_begin... $ECHO_C" >&6 + if test "${ac_cv_func_gdk_im_begin+set}" = set; then diff --git a/www/libgtkhtml/files/patch-doc::Makefile.in b/www/libgtkhtml/files/patch-doc::Makefile.in new file mode 100644 index 000000000000..575490af80ea --- /dev/null +++ b/www/libgtkhtml/files/patch-doc::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- doc/Makefile.in 2002/05/01 09:15:00 1.1 ++++ doc/Makefile.in 2002/05/01 09:16:10 +@@ -151,7 +151,7 @@ + CFLAGS = @CFLAGS@ $(EXTRA_GNOME_CFLAGS) + LDFLAGS = @LDFLAGS@ $(EXTRA_GNOME_LIBS) + +-HTML_DIR = $(datadir)/html ++HTML_DIR = $(prefix)/share/doc/gtkhtml + + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + diff --git a/www/libgtkhtml/files/patch-ltmain.sh b/www/libgtkhtml/files/patch-ltmain.sh deleted file mode 100644 index 91c341790451..000000000000 --- a/www/libgtkhtml/files/patch-ltmain.sh +++ /dev/null @@ -1,36 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Sun Jan 20 16:11:07 2002 -+++ ltmain.sh Tue Jan 22 13:34:20 2002 -@@ -1060,6 +1060,7 @@ - - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2442,6 +2443,9 @@ - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4208,10 +4212,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/www/libgtkhtml/pkg-plist b/www/libgtkhtml/pkg-plist index 68c688d2eaa5..d1b7072f5918 100644 --- a/www/libgtkhtml/pkg-plist +++ b/www/libgtkhtml/pkg-plist @@ -94,6 +94,11 @@ lib/bonobo/plugin/libstorage_http.so lib/libgtkhtml.a lib/libgtkhtml.so lib/libgtkhtml.so.21 +share/doc/gtkhtml/gtkhtml-decl.txt +share/doc/gtkhtml/gtkhtml-sections.txt +share/doc/gtkhtml/gtkhtml.hierarchy +share/doc/gtkhtml/gtkhtml.sgml +share/doc/gtkhtml/gtkhtml.types share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop share/gnome/control-center/Documents/gtkhtml-properties.desktop share/gnome/gtkhtml/Editor.idl @@ -138,11 +143,6 @@ share/gnome/gtkhtml/icons/undo-24.png share/gnome/gtkhtml/keybindingsrc.emacs share/gnome/gtkhtml/keybindingsrc.ms share/gnome/gtkhtml/keybindingsrc.xemacs -share/gnome/html/gtkhtml-decl.txt -share/gnome/html/gtkhtml-sections.txt -share/gnome/html/gtkhtml.hierarchy -share/gnome/html/gtkhtml.sgml -share/gnome/html/gtkhtml.types share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf share/gnome/oaf/GNOME_GtkHTML_Editor.oaf share/gnome/ui/GNOME_GtkHTML_Editor.xml @@ -176,7 +176,8 @@ share/locale/tr/LC_MESSAGES/gtkhtml.mo share/locale/uk/LC_MESSAGES/gtkhtml.mo share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo -@dirrm share/gnome/html/gtkhtml @dirrm share/gnome/gtkhtml/icons @dirrm share/gnome/gtkhtml +@dirrm share/doc/gtkhtml/gtkhtml +@dirrm share/doc/gtkhtml @dirrm include/gtkhtml |