diff options
| author | steve <steve@FreeBSD.org> | 2000-07-08 03:59:26 +0800 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 2000-07-08 03:59:26 +0800 |
| commit | 7879264d29ab2a706345ab21de9f9cd3139efc7a (patch) | |
| tree | 0fb8a7b052271f54c6bdf617de3027472d998225 /www/nscache/files | |
| parent | c691dd330a3da8e70bfc74508b9fb3b585604a4d (diff) | |
| download | freebsd-ports-gnome-7879264d29ab2a706345ab21de9f9cd3139efc7a.tar.gz freebsd-ports-gnome-7879264d29ab2a706345ab21de9f9cd3139efc7a.tar.zst freebsd-ports-gnome-7879264d29ab2a706345ab21de9f9cd3139efc7a.zip | |
- Use GTK_CONFIG/GLIB_CONFIG instead of hardcoded gtk12-config/glib12-config
- Support CC/CFLAGS/PREIFX/LOCALBASE/X11BASE/MAKE/etc. properly
PR: 19623
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to 'www/nscache/files')
| -rw-r--r-- | www/nscache/files/patch-aa | 21 | ||||
| -rw-r--r-- | www/nscache/files/patch-ab | 19 |
2 files changed, 30 insertions, 10 deletions
diff --git a/www/nscache/files/patch-aa b/www/nscache/files/patch-aa index 9730c34de154..dac7af60e7bc 100644 --- a/www/nscache/files/patch-aa +++ b/www/nscache/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.in.orig Sat Jan 15 09:40:55 2000 -+++ configure.in Sun Mar 5 02:00:42 2000 -@@ -41,14 +41,14 @@ +--- configure.in.orig Sun Jan 16 02:40:55 2000 ++++ configure.in Sat Jul 1 19:10:54 2000 +@@ -41,17 +41,11 @@ AC_CHECK_LIB(c, gettext, CFLAGS="$CFLAGS -DHAVE_GETTEXT -DNLS_DIR=\"\\\"\$(prefix)/share/locale\\\"\"";MSUBDIRS="po", AC_CHECK_LIB(intl, gettext, LIBS="$LIBS -lintl";CFLAGS="$CFLAGS -DHAVE_GETTEXT -DNLS_DIR=\"\\\"\$(prefix)/share/locale\\\"\"";MSUBDIRS="po")) @@ -10,12 +10,13 @@ AC_CHECK_HEADER(db1/db.h, CFLAGS="$CFLAGS -DHAVE_DB1_H", AC_CHECK_HEADER(db.h, CFLAGS="$CFLAGS -DHAVE_DB_H")) -AC_CHECK_PROG(GTK_CONFIG, gtk-config, "yes", "no") -+AC_CHECK_PROG(GTK_CONFIG, gtk12-config, "yes", "no") - if eval "test x$GTK_CONFIG = xyes"; then +-if eval "test x$GTK_CONFIG = xyes"; then - CFLAGS="$CFLAGS `gtk-config --cflags`" - LIBS="$LIBS `gtk-config --libs`" -+ CFLAGS="$CFLAGS `gtk12-config --cflags`" -+ LIBS="$LIBS `gtk12-config --libs`" - else - AC_MSG_ERROR("Unable to find \"gtk-config\" program") - fi +-else +- AC_MSG_ERROR("Unable to find \"gtk-config\" program") +-fi ++AM_PATH_GTK(1.2.0, , AC_MSG_ERROR(GTK+ is not installed or badly configured on your system...)) + + AC_SUBST(CFLAGS) + AC_SUBST(LIBS) diff --git a/www/nscache/files/patch-ab b/www/nscache/files/patch-ab new file mode 100644 index 000000000000..25f015017a95 --- /dev/null +++ b/www/nscache/files/patch-ab @@ -0,0 +1,19 @@ +--- Makefile.am.orig Tue Jan 18 04:49:06 2000 ++++ Makefile.am Sat Jul 1 20:03:06 2000 +@@ -1,5 +1,7 @@ + SUBDIRS = @MSUBDIRS@ + ++INCLUDES = $(GTK_CFLAGS) ++ + bin_PROGRAMS = nscache + + nscache_SOURCES = \ +@@ -12,6 +14,8 @@ + indexdb.h \ + nls.h \ + setup.c ++ ++nscache_LDADD = $(GTK_LIBS) + + nscache.pot: $(nscache_SOURCES) + xgettext --default-domain=nscache -n -E -o $@ $(nscache_SOURCES) |