Date: Sat, 20 Mar 2004 01:30:38 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/64474: Update port: www/nscache Message-ID: <20040320013038.10fc1ed9.tkato@prontomail.com> Resent-Message-ID: <200403191640.i2JGeH8F011416@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64474
>Category: ports
>Synopsis: Update port: www/nscache
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 19 08:40:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Rearrange USE_GNOME
- Utilize USE_GETOPT_LONG
Remove file:
files/patch-aa
files/patch-ab
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/www/nscache/Makefile www/nscache/Makefile
--- /usr/ports/www/nscache/Makefile Sun Mar 14 18:19:01 2004
+++ www/nscache/Makefile Sat Mar 20 01:05:07 2004
@@ -7,7 +7,7 @@
PORTNAME= nscache
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.idata.sk/~ondrej/sw/
@@ -18,20 +18,22 @@
COMMENT= Netscape cache browser
USE_X_PREFIX= yes
-WANT_GNOME= yes
-USE_AUTOMAKE_VER= 14
-AUTOMAKE_ARGS= --include-deps
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-gtk-config=${GTK_CONFIG}
+USE_GNOME= gnomehier gtk12
+USE_GETOPT_LONG= yes
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS= --with-gtk-config=${GTK_CONFIG} --disable-gnome
+MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+ AUTOHEADER="${TRUE}"
-.include <bsd.port.pre.mk>
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
-.if defined(HAVE_GNOME)
-USE_GNOME+= gtk12
-PKGNAMESUFFIX= -gtk
-.else
-CONFIGURE_ARGS+= --disable-gnome
-.endif
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/nscache.desktop \
+ ${PREFIX}/share/gnome/apps/Internet
+ ${INSTALL_DATA} ${WRKSRC}/nscache.xpm \
+ ${PREFIX}/share/gnome/pixmaps
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/www/nscache/files/patch-aa www/nscache/files/patch-aa
--- /usr/ports/www/nscache/files/patch-aa Sat Feb 24 19:36:13 2001
+++ www/nscache/files/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,23 +0,0 @@
---- configure.in.orig Sun Jan 14 20:49:31 2001
-+++ configure.in Tue Jan 16 03:06:10 2001
-@@ -195,13 +195,15 @@
- fi
-
- 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 Feb 24 19:36:13 2001
+++ www/nscache/files/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,25 +0,0 @@
---- Makefile.am.orig Thu Oct 5 07:38:32 2000
-+++ Makefile.am Tue Jan 16 03:06:23 2001
-@@ -6,16 +6,16 @@
-
- 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
-
-
diff -urN /usr/ports/www/nscache/pkg-plist www/nscache/pkg-plist
--- /usr/ports/www/nscache/pkg-plist Sat Feb 24 19:36:12 2001
+++ www/nscache/pkg-plist Fri Mar 19 13:25:51 2004
@@ -7,5 +7,5 @@
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
+share/gnome/apps/Internet/nscache.desktop
+share/gnome/pixmaps/nscache.xpm
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040320013038.10fc1ed9.tkato>