Date: Wed, 16 Feb 2000 16:45:32 +0300 (MSK) From: Dmitry Sivachenko <dima@Chg.RU> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16751: Update x11-fm/xnc Message-ID: <200002161345.QAA37639@netserv1.chg.ru>
next in thread | raw e-mail | index | archive | help
>Number: 16751 >Category: ports >Synopsis: Update x11-fm/xnc >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: Wed Feb 16 15:30:02 PST 2000 >Closed-Date: >Last-Modified: >Originator: Dmitry Sivachenko >Release: FreeBSD 3.3-RELEASE i386 >Organization: >Environment: >Description: >How-To-Repeat: >Fix: diff -Nur xnc.old/Makefile xnc/Makefile --- xnc.old/Makefile Tue Aug 31 06:58:25 1999 +++ xnc/Makefile Wed Feb 16 16:36:55 2000 @@ -1,60 +1,40 @@ # New ports collection makefile for: xnc -# Version required: 4.0.8 +# Version required: 4.2.1 # Date created: 5 February 1999 # Whom: Dima Sivachenko <dima@chg.ru> # # $FreeBSD: ports/x11-fm/xnc/Makefile,v 1.2 1999/08/31 02:58:25 peter Exp $ # -DISTNAME= xnc-4.0.8.src -PKGNAME= xnc-4.0.8 +DISTNAME= xnc-4.2.1.src +PKGNAME= xnc-4.2.1 CATEGORIES= x11-fm -MASTER_SITES= ftp://ftp.chg.ru/pub/Linux/sunsite/X11/desktop/ \ +MASTER_SITES= http://www.xnc.dubna.su/src/ \ + ftp://ftp.chg.ru/pub/Linux/sunsite/X11/desktop/ \ ftp://sunsite.unx.edu/pub/Linux/X11/desktop/ -MAINTAINER= dima@chg.ru +MAINTAINER= dima@Chg.RU -RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \ - unzip:${PORTSDIR}/archivers/unzip \ - rpm:${PORTSDIR}/misc/rpm \ - rar:${PORTSDIR}/archivers/rar \ - unarj:${PORTSDIR}/archivers/unarj \ - lha:${PORTSDIR}/archivers/lha \ - bzip2:${PORTSDIR}/archivers/bzip2 +# xnc will use the following programs if you have them installed. +#RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \ +# unzip:${PORTSDIR}/archivers/unzip \ +# rpm:${PORTSDIR}/misc/rpm \ +# rar:${PORTSDIR}/archivers/rar \ +# unarj:${PORTSDIR}/archivers/unarj \ +# lha:${PORTSDIR}/archivers/lha \ +# bzip2:${PORTSDIR}/archivers/bzip2 USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/${PKGNAME} GNU_CONFIGURE= yes -USE_GMAKE= yes -do-install: - @ ${INSTALL_SCRIPT} ${WRKSRC}/findslave.xnc ${PREFIX}/bin - @ ${INSTALL_SCRIPT} ${WRKSRC}/users.xnc ${PREFIX}/bin - @ ${INSTALL_SCRIPT} ${WRKSRC}/groups.xnc ${PREFIX}/bin - @ ${INSTALL_SCRIPT} ${WRKSRC}/rpm.xnc ${PREFIX}/bin - @ ${INSTALL_SCRIPT} ${WRKSRC}/zips.xnc ${PREFIX}/bin - @ ${INSTALL_SCRIPT} ${WRKSRC}/gzip.xnc ${PREFIX}/bin - @ ${INSTALL_SCRIPT} ${WRKSRC}/bzip.xnc ${PREFIX}/bin - @ ${INSTALL_PROGRAM} ${WRKSRC}/nc ${PREFIX}/bin/xnc - @ ${INSTALL_PROGRAM} ${WRKSRC}/ives/ives ${PREFIX}/bin - @ ${INSTALL_PROGRAM} ${WRKSRC}/ives/es ${PREFIX}/bin - @ ${INSTALL_PROGRAM} ${WRKSRC}/ives/vs ${PREFIX}/bin - @ ${INSTALL_PROGRAM} ${WRKSRC}/xsetup/xncsetup ${PREFIX}/bin - @ ${INSTALL_PROGRAM} ${WRKSRC}/xjroot/xjpegroot ${PREFIX}/bin - @ ${INSTALL_PROGRAM} ${WRKSRC}/launch/xnlaunch ${PREFIX}/bin - @ ${INSTALL_MAN} ${WRKSRC}/xnc.1 ${MAN1PREFIX}/man/cat1 - @ ${GZIP_CMD} ${MAN1PREFIX}/man/cat1/xnc.1 - @ ${INSTALL_MAN} ${WRKSRC}/ives/ives.1 ${MAN1PREFIX}/man/cat1 - @ ${GZIP_CMD} ${MAN1PREFIX}/man/cat1/ives.1 - @ ${INSTALL_MAN} ${WRKSRC}/xjroot/xjpegroot.1 ${MAN1PREFIX}/man/cat1 - @ ${GZIP_CMD} ${MAN1PREFIX}/man/cat1/xjpegroot.1 - @ ${INSTALL_MAN} ${WRKSRC}/launch/xnlaunch.1 ${MAN1PREFIX}/man/cat1 - @ ${GZIP_CMD} ${MAN1PREFIX}/man/cat1/xnlaunch.1 +MAN1= es.1 ives.1 vs.1 xjpegroot.1 xnc.1 xnlaunch.1 post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/xnc ${INSTALL_DATA} ${WRKSRC}/Docs/* ${PREFIX}/share/doc/xnc .endif + @${CAT} ${PKGDIR}/MESSAGE .include <bsd.port.mk> diff -Nur xnc.old/files/md5 xnc/files/md5 --- xnc.old/files/md5 Fri Apr 30 13:44:33 1999 +++ xnc/files/md5 Wed Feb 16 15:37:29 2000 @@ -1 +1 @@ -MD5 (xnc-4.0.8.src.tar.gz) = fbadf952e02e486c02800001421d5d8e +MD5 (xnc-4.2.1.src.tar.gz) = 0455bf1aacc2403beb2404a420312b8c diff -Nur xnc.old/patches/patch-ab xnc/patches/patch-ab --- xnc.old/patches/patch-ab Fri Apr 30 13:44:34 1999 +++ xnc/patches/patch-ab Thu Jan 1 03:00:00 1970 @@ -1,10 +0,0 @@ ---- image/image.h.bak Wed Apr 28 02:20:16 1999 -+++ image/image.h Wed Apr 28 02:20:16 1999 -@@ -24,7 +24,6 @@ - int LoadXBM(char* fname,PICINFO* pinfo); - int LoadXPM(char* fname,PICINFO* pinfo); - int LoadTarga(char* fname,PICINFO* pinfo); --extern "C" int LoadTIFF(char* ,PICINFO*); - int autodetect(char*); - void im_reset_coding(); - void im_set_coding(); diff -Nur xnc.old/patches/patch-ac xnc/patches/patch-ac --- xnc.old/patches/patch-ac Thu Jan 1 03:00:00 1970 +++ xnc/patches/patch-ac Wed Feb 16 15:40:23 2000 @@ -0,0 +1,11 @@ +--- filedir/makefile.in.orig Wed Feb 16 15:38:53 2000 ++++ filedir/makefile.in Wed Feb 16 15:39:08 2000 +@@ -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 -Nur xnc.old/patches/patch-ad xnc/patches/patch-ad --- xnc.old/patches/patch-ad Thu Jan 1 03:00:00 1970 +++ xnc/patches/patch-ad Wed Feb 16 16:19:01 2000 @@ -0,0 +1,37 @@ +--- Makefile.in.orig Wed Feb 16 16:16:31 2000 ++++ Makefile.in Wed Feb 16 16:18:27 2000 +@@ -170,22 +170,22 @@ + + install: + #Installing X Northern Captain... +- $(INS) ./findslave.xnc $(INSTDIR) +- $(INS) ./users.xnc $(INSTDIR) +- $(INS) ./groups.xnc $(INSTDIR) ++ $(INSTALL_PROGRAM) ./findslave.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 + $(INSM) ./yo-man/*.1 $(INSTMAN)/man1 +- $(INS) ./ives/ives $(INSTDIR) +- $(INS) ./ives/es $(INSTDIR) +- $(INS) ./ives/vs $(INSTDIR) +- $(INS) ./xsetup/xncsetup $(INSTDIR) +- $(INS) ./xjroot/xjpegroot $(INSTDIR) +- $(INS) ./launch/xnlaunch $(INSTDIR) +- /bin/sh ./replace.script ++ $(INSTALL_PROGRAM) ./ives/ives $(INSTDIR) ++ $(INSTALL_PROGRAM) ./ives/es $(INSTDIR) ++ $(INSTALL_PROGRAM) ./ives/vs $(INSTDIR) ++ $(INSTALL_PROGRAM) ./xsetup/xncsetup $(INSTDIR) ++ $(INSTALL_PROGRAM) ./xjroot/xjpegroot $(INSTDIR) ++ $(INSTALL_PROGRAM) ./launch/xnlaunch $(INSTDIR) ++# /bin/sh ./replace.script + echo "Don't foget run 'xncsetup' before starting XNC" + + install-rpm: diff -Nur xnc.old/pkg/MESSAGE xnc/pkg/MESSAGE --- xnc.old/pkg/MESSAGE Fri Apr 30 13:44:34 1999 +++ xnc/pkg/MESSAGE Wed Feb 16 16:25:17 2000 @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- -Attention! EVERY user who wants to use xnc should first execute 'xncsetup' -from X-Window to configure his/her own profile. +| Attention! EVERY user who wants to use xnc should first execute 'xncsetup' | +| from X-Window to configure his/her own profile. | ------------------------------------------------------------------------------- diff -Nur xnc.old/pkg/PLIST xnc/pkg/PLIST --- xnc.old/pkg/PLIST Fri Apr 30 13:44:33 1999 +++ xnc/pkg/PLIST Wed Feb 16 16:02:41 2000 @@ -22,7 +22,3 @@ share/doc/xnc/doc7.html share/doc/xnc/doc8.html @dirrm share/doc/xnc -man/cat1/xnc.1.gz -man/cat1/ives.1.gz -man/cat1/xjpegroot.1.gz -man/cat1/xnlaunch.1.gz >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?200002161345.QAA37639>