Date: Tue, 17 Dec 2002 05:31:52 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46297: Update port: graphics/gqview to 1.2.0 Message-ID: <20021217053152.36e23075.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 46297
>Category: ports
>Synopsis: Update port: graphics/gqview to 1.2.0
>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 Dec 16 12:40:04 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 1.2.0
New file:
files/patch-configure.in
Following PRs shuold be superseded by this one:
[2002/10/01] ports/43551 nakai update: graphics/gqview
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/gqview/Makefile graphics/gqview/Makefile
--- /usr/ports/graphics/gqview/Makefile Tue Sep 10 20:12:06 2002
+++ graphics/gqview/Makefile Fri Dec 13 23:44:31 2002
@@ -6,7 +6,7 @@
#
PORTNAME= gqview
-PORTVERSION= 1.1.1
+PORTVERSION= 1.2.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,29 +17,26 @@
USE_GNOMENG= yes
USE_GNOME= gdkpixbuf
WANT_GNOME= yes
-GNU_CONFIGURE= yes
+USE_REINPLACE= yes
+USE_AUTOCONF_VER= 213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+MAN1= gqview.1
.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mlibcapplet}!=""
-USE_GNOME+= libcapplet
+.if ${HAVE_GNOME:Mgnomelibs}!=""
+USE_GNOME+= gnomehack gnomeprefix gnomelibs
PKGNAMESUFFIX= -gnome
+.else
+CONFIGURE_ARGS+= --disable-gnome
.endif
-MAN1= gqview.1
-
-pre-patch:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
- s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
- 's|GNOME_DATADIR\)/gnome/|GNOME_DATADIR\)/|g'
-
-post-install:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/gqview
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gqview
-.endif
+post-patch:
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|/gnome/|/|g'
+ @${REINPLACE_CMD} -e 's|INCLUDED_LIBINTL=yes|INCLUDED_LIBINTL=no|g' \
+ ${WRKSRC}/aclocal.m4
.include <bsd.port.post.mk>
diff -urN /usr/ports/graphics/gqview/distinfo graphics/gqview/distinfo
--- /usr/ports/graphics/gqview/distinfo Wed Feb 20 21:32:45 2002
+++ graphics/gqview/distinfo Fri Dec 13 22:20:36 2002
@@ -1 +1 @@
-MD5 (gqview-1.1.1.tar.gz) = 777c3ed6905673dd50310ec80b4b0de5
+MD5 (gqview-1.2.0.tar.gz) = a1f940ae13070e0e86aa45be9ef2e0df
diff -urN /usr/ports/graphics/gqview/files/patch-configure.in graphics/gqview/files/patch-configure.in
--- /usr/ports/graphics/gqview/files/patch-configure.in Thu Jan 1 09:00:00 1970
+++ graphics/gqview/files/patch-configure.in Fri Dec 13 23:17:50 2002
@@ -0,0 +1,26 @@
+--- configure.in.orig Fri Dec 13 11:27:07 2002
++++ configure.in Fri Dec 13 23:17:43 2002
+@@ -59,7 +59,14 @@
+ AC_DEFINE_UNQUOTED(GQVIEW_HELPDIR, "$prefix/share/gqview")
+
+ dnl CHECK_GNOME
++AC_ARG_ENABLE(gnome,
++[ --disable-gnome disable use of gnome],
++ gnome=$enableval, gnome=yes)
++if test "$gnome" = yes; then
+ AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
++else
++ GNOME_CONFIG=no
++fi
+ AM_CONDITIONAL(HAVE_GNOME, test $GNOME_CONFIG != no)
+ if test "$GNOME_CONFIG" = no; then
+ AC_MSG_RESULT(GNOME icon and menu entry will NOT be installed)
+@@ -73,7 +80,7 @@
+ AC_CHECK_FUNCS(strverscmp)
+
+ dnl locale location for po
+-localedir='${datadir}/locale'
++localedir='${prefix}/shara/locale'
+ AC_SUBST(localedir)
+
+ ALL_LINGUAS="cs da de es et fi fr hu it ja nl no pl pt_BR ro ru sk sl th tr uk zh_CN.GB2312 zh_TW"
diff -urN /usr/ports/graphics/gqview/pkg-plist graphics/gqview/pkg-plist
--- /usr/ports/graphics/gqview/pkg-plist Wed Feb 20 21:32:45 2002
+++ graphics/gqview/pkg-plist Fri Dec 13 23:38:28 2002
@@ -1,5 +1,4 @@
bin/gqview
-%%PORTDOCS%%share/doc/gqview/README
%%GNOME:%%share/gnome/apps/Graphics/gqview.desktop
%%GNOME:%%share/gnome/pixmaps/gqview.png
share/gqview/README
@@ -17,12 +16,13 @@
share/locale/no/LC_MESSAGES/gqview.mo
share/locale/pl/LC_MESSAGES/gqview.mo
share/locale/pt_BR/LC_MESSAGES/gqview.mo
+share/locale/ro/LC_MESSAGES/gqview.mo
share/locale/ru/LC_MESSAGES/gqview.mo
share/locale/sk/LC_MESSAGES/gqview.mo
share/locale/sl/LC_MESSAGES/gqview.mo
+share/locale/th/LC_MESSAGES/gqview.mo
share/locale/tr/LC_MESSAGES/gqview.mo
share/locale/uk/LC_MESSAGES/gqview.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/gqview.mo
share/locale/zh_TW/LC_MESSAGES/gqview.mo
-%%PORTDOCS%%@dirrm share/doc/gqview
@dirrm share/gqview
>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?20021217053152.36e23075.tkato>