aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-fm/xnc/Makefile19
-rw-r--r--x11-fm/xnc/distinfo2
-rw-r--r--x11-fm/xnc/files/patch-ad19
-rw-r--r--x11-fm/xnc/pkg-plist5
4 files changed, 24 insertions, 21 deletions
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index 1280c3b2e272..e9cdbe35f2eb 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xnc
-PORTVERSION= 4.4.5
+PORTVERSION= 4.4.7
CATEGORIES= x11-fm
MASTER_SITES= http://www.xnc.dubna.su/src/
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
@@ -24,11 +24,13 @@ MAINTAINER= demon@FreeBSD.org
#RUN_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
#.endif
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.5:${PORTSDIR}/graphics/png
+ png.5:${PORTSDIR}/graphics/png \
+ tiff.4:${PORTSDIR}/graphics/tiff
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-pty=BSD
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
@@ -36,16 +38,13 @@ INSTALLS_SHLIB= yes
MAN1= es.1 ives.1 vs.1 xjpegroot.1 xnc.1 xnlaunch.1
pre-patch:
- @${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
- ${WRKSRC}/image/picinfo.h ${WRKSRC}/jpeg/jmemdos.c \
- ${WRKSRC}/libpng/ansi2knr.c ${WRKSRC}/libpng/pngconf.h \
- ${WRKSRC}/zlib/zutil.h
+ @${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/image2/picinfo.h
post-install:
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/Docs/* ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/Docs/* ${DOCSDIR}
.endif
- @${CAT} ${PKGMESSAGE}
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/x11-fm/xnc/distinfo b/x11-fm/xnc/distinfo
index 9425ee0df778..15bccda426a9 100644
--- a/x11-fm/xnc/distinfo
+++ b/x11-fm/xnc/distinfo
@@ -1 +1 @@
-MD5 (xnc-4.4.5.src.tar.gz) = 197f09edac8c600819f3a7d5804fb59e
+MD5 (xnc-4.4.7.src.tar.gz) = 5f6a6a95aa83c35268c2d339bbd3ef83
diff --git a/x11-fm/xnc/files/patch-ad b/x11-fm/xnc/files/patch-ad
index ee40b87a3617..bca25f17e58c 100644
--- a/x11-fm/xnc/files/patch-ad
+++ b/x11-fm/xnc/files/patch-ad
@@ -1,9 +1,9 @@
---- Makefile.in.orig Sun Jul 29 08:18:38 2001
-+++ Makefile.in Sun Jul 29 08:20:43 2001
-@@ -190,21 +190,21 @@
-
+--- 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)
@@ -15,20 +15,23 @@
$(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/es $(INSTDIR)
-- $(INS) ./ives/vs $(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/es $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./ives/vs $(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 --git a/x11-fm/xnc/pkg-plist b/x11-fm/xnc/pkg-plist
index fd3d1b875c7d..6709f9a37afa 100644
--- a/x11-fm/xnc/pkg-plist
+++ b/x11-fm/xnc/pkg-plist
@@ -1,13 +1,14 @@
bin/bzip.xnc
-bin/es
bin/groups.xnc
bin/gzip.xnc
bin/ives
+bin/iedit
+bin/iview
bin/rpm.xnc
bin/users.xnc
-bin/vs
bin/xjpegroot
bin/xnc
+bin/xncloader
bin/xncsetup
bin/xnlaunch
bin/zips.xnc