From e2bc0d7216c13968b9cfcb79e34536da95aca245 Mon Sep 17 00:00:00 2001 From: Matthew Hunt Date: Wed, 7 Oct 1998 21:17:42 +0000 Subject: Eliminate warnings on systems not equipped for Japanese characters. The Japanese or multilingual functionality will be in japanese/xv and graphics/xv-m17n when those are committed. PR: 8185 Submitted by: Shigeyuki FUKUSHIMA --- graphics/xv/Makefile | 36 +++++++++++++++++++----------------- graphics/xv/distinfo | 2 +- graphics/xv/files/patch-ac | 13 +++++++++++-- graphics/xv/files/patch-ad | 11 ++++++++--- 4 files changed, 39 insertions(+), 23 deletions(-) (limited to 'graphics/xv') diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index 17dbb8e85581..3d8faadc7928 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -3,7 +3,7 @@ # Date created: 30 October 1994 # Whom: smace # -# $Id: Makefile,v 1.25 1998/09/17 00:50:49 asami Exp $ +# $Id: Makefile,v 1.26 1998/10/05 03:13:41 steve Exp $ # DISTNAME= xv-3.10a @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/ \ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ xv310a-jp-extension-rev5.3.3.tar.gz \ croppad.patch grabpatch jp-ext-bzip2.patch longname.patch \ - mp-tiff-patch pdf.patch png-1.2d-fix.patch png-1.2d.patch + mp-tiff-patch pdf.patch png-1.2d-fix.patch xv-png-1.2d.patch DIST_SUBDIR= xv EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ xv310a-jp-extension-rev5.3.3.tar.gz @@ -29,7 +29,9 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.2:${PORTSDIR}/graphics/png USE_IMAKE= yes +.if !defined(NOMAN) MAN1= bggen.1 vdcomp.1 xcmap.1 xv.1 xvpictoppm.1 +.endif XVDIST= ${DISTDIR}/${DIST_SUBDIR} @@ -42,26 +44,26 @@ post-patch: @${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/longname.patch @${PATCH} ${PATCH_ARGS} -p0 < ${XVDIST}/mp-tiff-patch @${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/pdf.patch - @${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/png-1.2d.patch + @${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/xv-png-1.2d.patch @${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/png-1.2d-fix.patch @${PATCH} ${PATCH_ARGS} -p1 < ${XVDIST}/jp-ext-bzip2.patch post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/xv - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv - ${INSTALL_DATA} ${WRKSRC}/README.PNG ${PREFIX}/share/doc/xv - ${INSTALL_DATA} ${WRKSRC}/docs/epsf.ps ${PREFIX}/share/doc/xv - ${INSTALL_DATA} ${WRKSRC}/docs/xpm.ps ${PREFIX}/share/doc/xv - ${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv - ${INSTALL_DATA} ${WRKSRC}/docs/xvtitle.ps ${PREFIX}/share/doc/xv - ${INSTALL_DATA} ${WRKSRC}/docs/help ${PREFIX}/share/doc/xv - ${INSTALL_DATA} ${WRKSRC}/docs/bmp.doc ${PREFIX}/share/doc/xv - ${INSTALL_DATA} ${WRKSRC}/docs/gif* ${PREFIX}/share/doc/xv - ${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/CHANGELOG.* ${PREFIX}/share/doc/xv - ${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/README.PhotoCD ${PREFIX}/share/doc/xv - ${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/README.xv310a-ext-5.3.3 ${PREFIX}/share/doc/xv/README.xv310a-ext-5.3.3.ja - ${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/magic.add ${PREFIX}/share/doc/xv + @${MKDIR} ${PREFIX}/share/doc/xv + @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv + @${INSTALL_DATA} ${WRKSRC}/README.PNG ${PREFIX}/share/doc/xv + @${INSTALL_DATA} ${WRKSRC}/docs/epsf.ps ${PREFIX}/share/doc/xv + @${INSTALL_DATA} ${WRKSRC}/docs/xpm.ps ${PREFIX}/share/doc/xv + @${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv + @${INSTALL_DATA} ${WRKSRC}/docs/xvtitle.ps ${PREFIX}/share/doc/xv + @${INSTALL_DATA} ${WRKSRC}/docs/help ${PREFIX}/share/doc/xv + @${INSTALL_DATA} ${WRKSRC}/docs/bmp.doc ${PREFIX}/share/doc/xv + @${INSTALL_DATA} ${WRKSRC}/docs/gif* ${PREFIX}/share/doc/xv + @${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/CHANGELOG.* ${PREFIX}/share/doc/xv + @${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/README.PhotoCD ${PREFIX}/share/doc/xv + @${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/README.xv310a-ext-5.3.3 ${PREFIX}/share/doc/xv/README.xv310a-ext-5.3.3.ja + @${INSTALL_DATA} ${WRKSRC}/../xv-jp-extension/magic.add ${PREFIX}/share/doc/xv .endif .include diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo index 8bfba94466e3..5e98c6051bab 100644 --- a/graphics/xv/distinfo +++ b/graphics/xv/distinfo @@ -7,6 +7,6 @@ MD5 (xv/longname.patch) = 04f2f162a2f66c8eca6bd6e2e1e9777d MD5 (xv/mp-tiff-patch) = 012a8562ed300db3174cfee95b13d18c MD5 (xv/pdf.patch) = 3c8806b4ce221f268f1cc257201ca0b7 MD5 (xv/png-1.2d-fix.patch) = 672f2f82c94828d91b6929ed87139937 -MD5 (xv/png-1.2d.patch) = 8c2126618f1f9925fbb60499581d58c5 +MD5 (xv/xv-png-1.2d.patch) = 37a80e90ee07c94010af8a128f98788d MD5 (xv/xv-3.10a.JPEG-patch) = bd3ac79fa805319f583ccd382bdc825d MD5 (xv/xv-3.10a.TIFF-patch) = 305f2f0273368bb6e029c3f212a14249 diff --git a/graphics/xv/files/patch-ac b/graphics/xv/files/patch-ac index 8222f54f6a6b..e9764e62e719 100644 --- a/graphics/xv/files/patch-ac +++ b/graphics/xv/files/patch-ac @@ -51,6 +51,15 @@ /*************************************************************************** +@@ -216,7 +216,7 @@ + * 'undef' to 'define' in the following line. + */ + +-#undef TV_L10N ++/* #undef TV_L10N */ + + #ifdef TV_L10N + /* @@ -259,7 +259,7 @@ * magic number or suffix in "~/.xv_mgcsfx" . * To enable this feature, change 'undef' to 'define' in the following line. @@ -77,12 +86,12 @@ /* # define MGCSFX_PREPROCESSOR "cc -E" */ # endif /* USE_MGCSFX_PREPROCESSOR */ -@@ -320,7 +320,7 @@ +@@ -325,7 +325,7 @@ * 'undef' to 'define' in the following line. */ -#undef TV_MULTILINGUAL -+#define TV_MULTILINGUAL ++/* #undef TV_MULTILINGUAL */ #define TV_DEFAULT_CODESET TV_EUC_JAPAN diff --git a/graphics/xv/files/patch-ad b/graphics/xv/files/patch-ad index 72fb0c1bf26b..72deb1629eb2 100644 --- a/graphics/xv/files/patch-ad +++ b/graphics/xv/files/patch-ad @@ -1,5 +1,5 @@ ---- Imakefile.orig Thu Aug 27 04:53:33 1998 -+++ Imakefile Thu Aug 27 04:54:22 1998 +--- Imakefile.orig Wed Oct 7 22:24:59 1998 ++++ Imakefile Wed Oct 7 22:27:00 1998 @@ -6,13 +6,15 @@ /* if, for whatever reason, you're unable to get the JPEG library to compile * on your machine, *COMMENT OUT* the following line @@ -49,7 +49,7 @@ #ifdef HavePDS PDS = -DDOPDS #endif -@@ -149,8 +165,8 @@ +@@ -149,12 +165,12 @@ #endif @@ -60,6 +60,11 @@ DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \ $(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \ +- $(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX) ++ $(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX) $(LOCALE_EXTENSION) + + INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE) + @@ -254,10 +270,10 @@ #endif -- cgit v1.2.3