From owner-freebsd-ports Thu Jan 9 10:50: 8 2003 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A5EC737B401 for ; Thu, 9 Jan 2003 10:50:03 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6E6443F43 for ; Thu, 9 Jan 2003 10:50:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h09Io2NS066479 for ; Thu, 9 Jan 2003 10:50:02 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h09Io2Al066478; Thu, 9 Jan 2003 10:50:02 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9AB6537B401; Thu, 9 Jan 2003 10:42:20 -0800 (PST) Received: from christine.energyhq.tk (213-97-200-73.uc.nombres.ttd.es [213.97.200.73]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A1AC43F3F; Thu, 9 Jan 2003 10:42:18 -0800 (PST) (envelope-from flynn@christine.energyhq.tk) Received: from christine.energyhq.tk (localhost.energyhq.tk [127.0.0.1]) by christine.energyhq.tk (8.12.6/8.12.6) with ESMTP id h08LAnNx048835; Wed, 8 Jan 2003 22:10:49 +0100 (CET) (envelope-from flynn@christine.energyhq.tk) Received: (from flynn@localhost) by christine.energyhq.tk (8.12.6/8.12.6/Submit) id h08LAmgE048834; Wed, 8 Jan 2003 22:10:48 +0100 (CET) Message-Id: <200301082110.h08LAmgE048834@christine.energyhq.tk> Date: Wed, 8 Jan 2003 22:10:48 +0100 (CET) From: Miguel Mendez Reply-To: Miguel Mendez To: FreeBSD-gnats-submit@FreeBSD.org Cc: demon@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/46901: Update port: x11-fm/xnc to 5.0.0 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46901 >Category: ports >Synopsis: Update port: x11-fm/xnc to 5.0.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jan 09 10:50:01 PST 2003 >Closed-Date: >Last-Modified: >Originator: Miguel Mendez >Release: FreeBSD 5.0-RC i386 >Organization: >Environment: System: FreeBSD christine.energyhq.tk 5.0-RC FreeBSD 5.0-RC #0: Tue Dec 31 14:56:19 CET 2002 root@christine.energyhq.tk:/usr/obj/usr/src/sys/CHRISTINE i386 >Description: xnc 5.0.0 is out >How-To-Repeat: >Fix: --- xnc.diff begins here --- diff -ruN xnc.old/Makefile xnc/Makefile --- xnc.old/Makefile Sat Jun 29 16:03:42 2002 +++ xnc/Makefile Wed Jan 8 21:32:03 2003 @@ -6,9 +6,9 @@ # PORTNAME= xnc -PORTVERSION= 4.4.7 +PORTVERSION= 5.0.0 CATEGORIES= x11-fm -MASTER_SITES= http://www.xnc.dubna.su/src/ +MASTER_SITES= http://www.xnc.dubna.su/src-5/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src MAINTAINER= demon@FreeBSD.org @@ -34,15 +34,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -MAN1= es.1 ives.1 vs.1 xjpegroot.1 xnc.1 xnlaunch.1 +MAN1= iedit.1 ives.1 iview.1 xjpegroot.1 xnc.1 xnlaunch.1 pre-patch: - @${PERL} -pi -e 's,,,' ${WRKSRC}/image2/picinfo.h + @${PERL} -pi -e 's,,,' ${WRKSRC}/src/lib/image2/picinfo.h post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/Docs/* ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} diff -ruN xnc.old/distinfo xnc/distinfo --- xnc.old/distinfo Sat Jun 29 10:31:23 2002 +++ xnc/distinfo Wed Jan 8 21:15:16 2003 @@ -1 +1 @@ -MD5 (xnc-4.4.7.src.tar.gz) = 5f6a6a95aa83c35268c2d339bbd3ef83 +MD5 (xnc-5.0.0.src.tar.gz) = 5a13c391b9dff86942289a64fbc3d2e4 diff -ruN xnc.old/files/patch-aa xnc/files/patch-aa --- xnc.old/files/patch-aa Thu Jan 1 01:00:00 1970 +++ xnc/files/patch-aa Wed Jan 8 21:23:06 2003 @@ -0,0 +1,11 @@ +--- src/lib/filedir/makefile.in.orig Wed Jan 8 21:22:24 2003 ++++ src/lib/filedir/makefile.in Wed Jan 8 21:22:35 2003 +@@ -33,7 +33,7 @@ + PROGRAM = $(MYLIBDIR)/libxncfiledir.a + + VERSION = 3.20.1 +-MAGIC = /usr/share/magic ++MAGIC = /usr/share/misc/magic + + CINCLUDES=-DMAGIC='"$(MAGIC)"' -DMAGIC_FOR_XNC $(DEFS) $(DEB) $(STRIPPING) + diff -ruN xnc.old/files/patch-ab xnc/files/patch-ab --- xnc.old/files/patch-ab Thu Jan 1 01:00:00 1970 +++ xnc/files/patch-ab Wed Jan 8 21:59:47 2003 @@ -0,0 +1,18 @@ +--- Makefile.in.orig Wed Jan 8 14:00:53 2003 ++++ Makefile.in Wed Jan 8 21:59:14 2003 +@@ -47,7 +47,6 @@ + install: install-$(PLUGINS) + $(MKINSTALLDIRS) $(DESTDIR)$(INSTDIR) + $(MKINSTALLDIRS) $(DESTDIR)$(INSTMAN) +- $(MKINSTALLDIRS) $(DESTDIR)$(INSTDOCDIR) + $(MKINSTALLDIRS) $(DESTDIR)$(INSTICONDIR) + $(MKINSTALLDIRS) $(DESTDIR)$(INSTDESKDIR1) + $(MKINSTALLDIRS) $(DESTDIR)$(INSTDESKDIR2) +@@ -68,7 +67,6 @@ + $(INSTALL_PROGRAM) bin/xncsetup $(DESTDIR)$(INSTDIR) + $(INSTALL_PROGRAM) bin/xnlaunch $(DESTDIR)$(INSTDIR) + $(INSTALL_DATA) ./yo-man/*.1 $(DESTDIR)$(INSTMAN) +- $(INSTALL_DATA) ./doc/*.html $(DESTDIR)$(INSTDOCDIR) + $(INSTALL_DATA) ./desktop/xnc.xpm $(DESTDIR)$(INSTICONDIR) + $(INSTALL_DATA) ./desktop/xnc.png $(DESTDIR)$(INSTICONDIR) + $(INSTALL_DATA) ./desktop/xnc.xpm $(DESTDIR)$(INSTICONDIR) diff -ruN xnc.old/files/patch-ac xnc/files/patch-ac --- xnc.old/files/patch-ac Fri Apr 27 15:45:18 2001 +++ xnc/files/patch-ac Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- filedir/makefile.in.orig Wed Apr 25 20:11:20 2001 -+++ filedir/makefile.in Wed Apr 25 20:11:28 2001 -@@ -34,7 +34,7 @@ - @MCOMMON@ - - VERSION = 3.20.1 --MAGIC = /usr/share/magic -+MAGIC = /usr/share/misc/magic - #MAGIC = /usr/local/etc/magic - - MAGDEFS = -DMAGIC='"$(MAGIC)"' -DMAGIC_FOR_XNC $(DEFS)# -Dvoid=int diff -ruN xnc.old/files/patch-ad xnc/files/patch-ad --- xnc.old/files/patch-ad Sat Jun 29 10:31:23 2002 +++ xnc/files/patch-ad Thu Jan 1 01:00:00 1970 @@ -1,38 +0,0 @@ ---- Makefile.in.orig Sat Jun 29 11:57:34 2002 -+++ Makefile.in Sat Jun 29 12:00:28 2002 -@@ -257,23 +257,23 @@ - install: install-$(PLUGINS) - #Installing X Northern Captain... - $(INSD) $(INSTDIR) -- $(INS) ./users.xnc $(INSTDIR) -- $(INS) ./groups.xnc $(INSTDIR) -+ $(INSTALL_PROGRAM) ./users.xnc $(INSTDIR) -+ $(INSTALL_PROGRAM) ./groups.xnc $(INSTDIR) - $(INS) ./rpm.xnc $(INSTDIR) -- $(INS) ./zips.xnc $(INSTDIR) -+ $(INSTALL_PROGRAM) ./zips.xnc $(INSTDIR) - $(INS) ./gzip.xnc $(INSTDIR) - $(INS) ./bzip.xnc $(INSTDIR) -- $(INS) ./nc $(INSTDIR)/xnc -+ $(INSTALL_PROGRAM) ./nc $(INSTDIR)/xnc - $(INSD) $(INSTMAN) - $(INSM) ./yo-man/*.1 $(INSTMAN)/man1 -- $(INS) ./ives/ives $(INSTDIR) -- $(INS) ./ives/iedit $(INSTDIR) -- $(INS) ./ives/iview $(INSTDIR) -- $(INS) ./xsetup/xncsetup $(INSTDIR) -- $(INS) ./xjroot/xjpegroot $(INSTDIR) -- $(INS) ./launch/xnlaunch $(INSTDIR) -- $(INS) ./resloader/xncloader $(INSTDIR) -- /bin/sh ./replace.script -+ $(INSTALL_PROGRAM) ./ives/ives $(INSTDIR) -+ $(INSTALL_PROGRAM) ./ives/iedit $(INSTDIR) -+ $(INSTALL_PROGRAM) ./ives/iview $(INSTDIR) -+ $(INSTALL_PROGRAM) ./xsetup/xncsetup $(INSTDIR) -+ $(INSTALL_PROGRAM) ./xjroot/xjpegroot $(INSTDIR) -+ $(INSTALL_PROGRAM) ./launch/xnlaunch $(INSTDIR) -+ $(INSTALL_PROGRAM) ./resloader/xncloader $(INSTDIR) -+# /bin/sh ./replace.script - @echo "Don't foget run 'xncsetup' before starting XNC" - - diff -ruN xnc.old/pkg-plist xnc/pkg-plist --- xnc.old/pkg-plist Sat Jun 29 10:31:23 2002 +++ xnc/pkg-plist Wed Jan 8 21:52:41 2003 @@ -6,6 +6,7 @@ bin/iview bin/rpm.xnc bin/users.xnc +bin/view.xnc bin/xjpegroot bin/xnc bin/xncloader @@ -24,4 +25,12 @@ %%PORTDOCS%%share/doc/xnc/doc8.html %%PORTDOCS%%share/doc/xnc/index.html %%PORTDOCS%%@dirrm share/doc/xnc +share/applications/xnc-gnome2.desktop +share/gnome/apps/Applications/xnc.desktop +share/locale/ru/LC_MESSAGES/xnc.mo +share/locale/pl/LC_MESSAGES/xnc.mo +share/locale/pt/LC_MESSAGES/xnc.mo +share/locale/fr/LC_MESSAGES/xnc.mo +share/pixmaps/xnc.xpm +share/pixmaps/xnc.png @dirrm lib/xnc --- xnc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message