Date: Mon, 15 Jan 2001 12:03:53 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/24355: Update port: www/nscache to 0.6 (fix ports/23763) Message-ID: <200101152003.f0FK3rB04011@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 24355 >Category: ports >Synopsis: Update port: www/nscache to 0.6 (fix ports/23763) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jan 15 12:10:03 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.2-RELEASE i386 >Organization: >Environment: >Description: - Update to version 0.6 New file: files/patch-ac This PR supersedes ports/23763. >How-To-Repeat: >Fix: diff -urN /usr/ports/www/nscache/Makefile www/nscache/Makefile --- /usr/ports/www/nscache/Makefile Thu Oct 5 23:08:39 2000 +++ www/nscache/Makefile Tue Jan 16 03:03:19 2001 @@ -6,21 +6,30 @@ # PORTNAME= nscache -PORTVERSION= 0.2p2 +PORTVERSION= 0.6 CATEGORIES= www -MASTER_SITES= http://www.idata.sk/~ondrej/sw/ -DISTNAME= nscache-0.2pl2 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ + http://www.idata.sk/~ondrej/sw/ +MASTER_SITE_SUBDIR= ${PORTNAME} EXTRACT_SUFX= .tgz MAINTAINER= kris@FreeBSD.org +USE_X_PREFIX= yes USE_GTK= yes +WANT_GNOME= yes USE_AUTOMAKE= yes -AUTOMAKE= automake -a -i -CONFIGURE_ENV= CPPFALGS="-I${LOCALBASE}/include" \ +AUTOMAKE_ARGS= --include-deps +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-gtk-config=${GTK_CONFIG} -pre-configure: - @cd ${WRKSRC}; aclocal -I ${X11BASE}/share/aclocal +.include <bsd.port.pre.mk> -.include <bsd.port.mk> +.if defined(HAVE_GNOME) +USE_GNOME= yes +.else +CONFIGURE_ARGS+= --disable-gnome +.endif + +.include <bsd.port.post.mk> diff -urN /usr/ports/www/nscache/distinfo www/nscache/distinfo --- /usr/ports/www/nscache/distinfo Sun Mar 5 19:15:03 2000 +++ www/nscache/distinfo Tue Jan 16 03:03:41 2001 @@ -1 +1 @@ -MD5 (nscache-0.2pl2.tgz) = e95b59b90d7e1f567e2263853be26f7b +MD5 (nscache-0.6.tgz) = aa88ad458be394a2fccac39906226cff diff -urN /usr/ports/www/nscache/files/patch-aa www/nscache/files/patch-aa --- /usr/ports/www/nscache/files/patch-aa Sat Jul 8 04:59:14 2000 +++ www/nscache/files/patch-aa Tue Jan 16 03:06:19 2001 @@ -1,22 +1,23 @@ ---- configure.in.orig Sun Jan 16 02:40:55 2000 -+++ configure.in Sat Jul 1 19:10:54 2000 -@@ -41,17 +41,11 @@ +--- configure.in.orig Sun Jan 14 20:49:31 2001 ++++ configure.in Tue Jan 16 03:06:10 2001 +@@ -195,13 +195,15 @@ + fi - 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")) - --AC_CHECK_LIB(db1, dbopen, CFLAGS="$CFLAGS -DHAVE_DBOPEN";LIBS="$LIBS -ldb1", AC_CHECK_LIB(db, dbopen, CFLAGS="$CFLAGS -DHAVE_DBOPEN";LIBS="$LIBS -ldb", AC_MSG_ERROR("NScache can\'t work withou clasical Berkeley DB libraries"))) -+AC_CHECK_LIB(db1, dbopen, CFLAGS="$CFLAGS -DHAVE_DBOPEN";LIBS="$LIBS -ldb1", AC_CHECK_LIB(c, dbopen, CFLAGS="$CFLAGS -DHAVE_DBOPEN", AC_MSG_ERROR("NScache can\'t work withou clasical Berkeley DB libraries"))) - - 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") --if eval "test x$GTK_CONFIG = xyes"; then -- CFLAGS="$CFLAGS `gtk-config --cflags`" -- LIBS="$LIBS `gtk-config --libs`" --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) + if eval "test x$WITH_GNOME = xyes"; then +- AC_CHECK_PROG(GNOME_CONFIG, gnome-config, "yes", "no") +- if eval "test x$GNOME_CONFIG = xyes"; then +- GNOME_PREFIX=`gnome-config --prefix` ++ AC_PATH_PROG(GNOME_CONFIG, gnome-config, "no") ++ if eval "test x$GNOME_CONFIG = no"; then ++ GNOME_PREFIX= ++ else ++ GNOME_PREFIX=`$GNOME_CONFIG --prefix` + AC_WARN("Will install Gnome things to $GNOME_PREFIX") + if eval "test x$WITH_GNOME = xyes"; then +- GNOME_LIBS=`gnome-config --libs gnomeui` +- GNOME_CFLAGS=`gnome-config --cflags gnomeui` ++ GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui` ++ GNOME_CFLAGS=`$GNOME_CONFIG --cflags gnomeui` + GNOME_CFLAGS="$GNOME_CFLAGS -DHAVE_GNOME" + fi + fi diff -urN /usr/ports/www/nscache/files/patch-ab www/nscache/files/patch-ab --- /usr/ports/www/nscache/files/patch-ab Sat Jul 8 04:59:14 2000 +++ www/nscache/files/patch-ab Tue Jan 16 03:06:33 2001 @@ -1,19 +1,25 @@ ---- 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@ +--- Makefile.am.orig Thu Oct 5 07:38:32 2000 ++++ Makefile.am Tue Jan 16 03:06:23 2001 +@@ -6,16 +6,16 @@ -+INCLUDES = $(GTK_CFLAGS) -+ - bin_PROGRAMS = nscache + install-data-local: + if test -n "$(GNOME_PREFIX)"; then \ +- $(mkinstalldirs) $(DESTDIR)$(GNOME_PREFIX)/share/gnome/apps/Internet; \ +- $(INSTALL_DATA) $(srcdir)/nscache.desktop $(DESTDIR)$(GNOME_PREFIX)/share/gnome/apps/Internet; \ +- $(mkinstalldirs) $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \ +- $(INSTALL_DATA) $(srcdir)/nscache.xpm $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \ ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/apps/Internet; \ ++ $(INSTALL_DATA) $(srcdir)/nscache.desktop $(DESTDIR)$(datadir)/apps/Internet; \ ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps; \ ++ $(INSTALL_DATA) $(srcdir)/nscache.xpm $(DESTDIR)$(datadir)/pixmaps; \ + fi + + uninstall-local: + if test -n "$(GNOME_PREFIX)"; then \ +- rm -f $(DESTDIR)$(GNOME_PREFIX)/share/gnome/apps/Internet/nscache.desktop; \ +- rm -f $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/nscache.xpm; \ ++ rm -f $(DESTDIR)$(datadir)/apps/Internet/nscache.desktop; \ ++ rm -f $(DESTDIR)$(datadir)/pixmaps/nscache.xpm; \ + fi - 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) diff -urN /usr/ports/www/nscache/files/patch-ac www/nscache/files/patch-ac --- /usr/ports/www/nscache/files/patch-ac Thu Jan 1 09:00:00 1970 +++ www/nscache/files/patch-ac Tue Jan 16 03:06:50 2001 @@ -0,0 +1,10 @@ +--- src/re.h.orig Sun Nov 12 23:09:38 2000 ++++ src/re.h Tue Jan 16 03:06:40 2001 +@@ -3,6 +3,7 @@ + + #ifdef HAVE_REGEX + #ifdef HAVE_REGEX_H ++#include <sys/types.h> + #include <regex.h> + #endif + diff -urN /usr/ports/www/nscache/pkg-descr www/nscache/pkg-descr --- /usr/ports/www/nscache/pkg-descr Sun Mar 5 19:15:05 2000 +++ www/nscache/pkg-descr Wed Dec 6 04:26:51 2000 @@ -19,4 +19,4 @@ The viewers you can assign to any MIME type. You can also copy selected URL to clipboard. -WWW: http://www.idata.sk/~ondrej/ +WWW: http://www.idata.sk/~ondrej/nscache/ diff -urN /usr/ports/www/nscache/pkg-plist www/nscache/pkg-plist --- /usr/ports/www/nscache/pkg-plist Sat Jul 8 04:59:14 2000 +++ www/nscache/pkg-plist Tue Jan 16 03:12:56 2001 @@ -1,4 +1,11 @@ bin/nscache share/locale/de/LC_MESSAGES/nscache.mo +share/locale/es/LC_MESSAGES/nscache.mo +share/locale/fr/LC_MESSAGES/nscache.mo share/locale/it/LC_MESSAGES/nscache.mo +share/locale/ja/LC_MESSAGES/nscache.mo +share/locale/pt_BR/LC_MESSAGES/nscache.mo share/locale/sk/LC_MESSAGES/nscache.mo +share/locale/tr/LC_MESSAGES/nscache.mo +%%GNOME:%%share/gnome/apps/Internet/nscache.desktop +%%GNOME:%%share/gnome/pixmaps/nscache.xpm >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101152003.f0FK3rB04011>