summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2002-05-01 20:23:03 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2002-05-01 20:23:03 +0000
commit17b6cc0afe9b40f3959b94130e056a822adc30b4 (patch)
tree1e3b468b04c0618f2192a0c1300447f2fc6e1b17 /x11-toolkits
parentChange 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 'x11-toolkits')
-rw-r--r--x11-toolkits/gal/Makefile6
-rw-r--r--x11-toolkits/gal/files/patch-configure13
-rw-r--r--x11-toolkits/gal/files/patch-ltmain.sh45
-rw-r--r--x11-toolkits/gal/pkg-plist16
-rw-r--r--x11-toolkits/gal2/Makefile6
-rw-r--r--x11-toolkits/gal2/files/patch-configure13
-rw-r--r--x11-toolkits/gal2/files/patch-ltmain.sh45
-rw-r--r--x11-toolkits/gal2/pkg-plist16
8 files changed, 50 insertions, 110 deletions
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 64bcd344657e..77724395f714 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gal
PORTVERSION= 0.19.2
+PORTREVISION= 1
CATEGORIES?= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gal
@@ -24,8 +25,9 @@ USE_PERL5= yes
USE_GMAKE= yes
USE_GNOMECTRL= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-static --with-libiconv
+USE_LIBTOOL= yes
+CONFIGURE_ARGS= --enable-static --with-libiconv \
+ --with-html-dir=${PREFIX}/share/doc/gal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gal/files/patch-configure b/x11-toolkits/gal/files/patch-configure
new file mode 100644
index 000000000000..08fc564a6a1f
--- /dev/null
+++ b/x11-toolkits/gal/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure 2002/05/01 01:51:44 1.1
++++ configure 2002/05/01 01:52:07
+@@ -5704,6 +5704,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/gal/files/patch-ltmain.sh b/x11-toolkits/gal/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/x11-toolkits/gal/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"
diff --git a/x11-toolkits/gal/pkg-plist b/x11-toolkits/gal/pkg-plist
index 1acf200a5b21..35c042a5026a 100644
--- a/x11-toolkits/gal/pkg-plist
+++ b/x11-toolkits/gal/pkg-plist
@@ -132,6 +132,12 @@ include/gal/widgets/widget-pixmap-combo.h
lib/libgal.a
lib/libgal.so
lib/libgal.so.19
+share/doc/gal/gal-api.sgml
+share/doc/gal/gal-decl.txt
+share/doc/gal/gal-sections.txt
+share/doc/gal/gal.hierarchy
+share/doc/gal/gal.signals
+share/doc/gal/gal.types
share/gnome/etable/%%VERSION%%/glade/e-table-config-no-group.glade
share/gnome/etable/%%VERSION%%/glade/e-table-config.glade
share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade
@@ -140,12 +146,6 @@ share/gnome/gal/%%VERSION%%/glade/e-categories-master-list-dialog.glade
share/gnome/gal/%%VERSION%%/glade/gal-categories.glade
share/gnome/gal/%%VERSION%%/glade/gal-define-views.glade
share/gnome/gal/%%VERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/gal/html/gal-api.sgml
-share/gnome/gal/html/gal-decl.txt
-share/gnome/gal/html/gal-sections.txt
-share/gnome/gal/html/gal.hierarchy
-share/gnome/gal/html/gal.signals
-share/gnome/gal/html/gal.types
share/gnome/pixmaps/gal/categories/category_birthday_16.png
share/gnome/pixmaps/gal/categories/category_business_16.png
share/gnome/pixmaps/gal/categories/category_favorites_16.png
@@ -194,14 +194,14 @@ share/locale/uk/LC_MESSAGES/gal.mo
share/locale/zh_TW/LC_MESSAGES/gal.mo
@dirrm share/gnome/pixmaps/gal/categories
@dirrm share/gnome/pixmaps/gal
-@dirrm share/gnome/gal/html/gal
-@dirrm share/gnome/gal/html
@dirrm share/gnome/gal/%%VERSION%%/glade
@dirrm share/gnome/gal/%%VERSION%%
@dirrm share/gnome/gal
@dirrm share/gnome/etable/%%VERSION%%/glade
@dirrm share/gnome/etable/%%VERSION%%
@dirrm share/gnome/etable
+@dirrm share/doc/gal/gal
+@dirrm share/doc/gal
@dirrm include/gal/widgets
@dirrm include/gal/util
@dirrm include/gal/unicode
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 64bcd344657e..77724395f714 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gal
PORTVERSION= 0.19.2
+PORTREVISION= 1
CATEGORIES?= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gal
@@ -24,8 +25,9 @@ USE_PERL5= yes
USE_GMAKE= yes
USE_GNOMECTRL= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-static --with-libiconv
+USE_LIBTOOL= yes
+CONFIGURE_ARGS= --enable-static --with-libiconv \
+ --with-html-dir=${PREFIX}/share/doc/gal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gal2/files/patch-configure b/x11-toolkits/gal2/files/patch-configure
new file mode 100644
index 000000000000..08fc564a6a1f
--- /dev/null
+++ b/x11-toolkits/gal2/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure 2002/05/01 01:51:44 1.1
++++ configure 2002/05/01 01:52:07
+@@ -5704,6 +5704,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/gal2/files/patch-ltmain.sh b/x11-toolkits/gal2/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/x11-toolkits/gal2/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"
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index 1acf200a5b21..35c042a5026a 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -132,6 +132,12 @@ include/gal/widgets/widget-pixmap-combo.h
lib/libgal.a
lib/libgal.so
lib/libgal.so.19
+share/doc/gal/gal-api.sgml
+share/doc/gal/gal-decl.txt
+share/doc/gal/gal-sections.txt
+share/doc/gal/gal.hierarchy
+share/doc/gal/gal.signals
+share/doc/gal/gal.types
share/gnome/etable/%%VERSION%%/glade/e-table-config-no-group.glade
share/gnome/etable/%%VERSION%%/glade/e-table-config.glade
share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade
@@ -140,12 +146,6 @@ share/gnome/gal/%%VERSION%%/glade/e-categories-master-list-dialog.glade
share/gnome/gal/%%VERSION%%/glade/gal-categories.glade
share/gnome/gal/%%VERSION%%/glade/gal-define-views.glade
share/gnome/gal/%%VERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/gal/html/gal-api.sgml
-share/gnome/gal/html/gal-decl.txt
-share/gnome/gal/html/gal-sections.txt
-share/gnome/gal/html/gal.hierarchy
-share/gnome/gal/html/gal.signals
-share/gnome/gal/html/gal.types
share/gnome/pixmaps/gal/categories/category_birthday_16.png
share/gnome/pixmaps/gal/categories/category_business_16.png
share/gnome/pixmaps/gal/categories/category_favorites_16.png
@@ -194,14 +194,14 @@ share/locale/uk/LC_MESSAGES/gal.mo
share/locale/zh_TW/LC_MESSAGES/gal.mo
@dirrm share/gnome/pixmaps/gal/categories
@dirrm share/gnome/pixmaps/gal
-@dirrm share/gnome/gal/html/gal
-@dirrm share/gnome/gal/html
@dirrm share/gnome/gal/%%VERSION%%/glade
@dirrm share/gnome/gal/%%VERSION%%
@dirrm share/gnome/gal
@dirrm share/gnome/etable/%%VERSION%%/glade
@dirrm share/gnome/etable/%%VERSION%%
@dirrm share/gnome/etable
+@dirrm share/doc/gal/gal
+@dirrm share/doc/gal
@dirrm include/gal/widgets
@dirrm include/gal/util
@dirrm include/gal/unicode