Attachment 2807 Details for Bug 8185 – file.diff

[patch] file.diff

file.diff (text/plain), 5.56 KB, created by shige on 1998-10-07 16:30:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: shige

Created: 1998-10-07 16:30:04 UTC

Size: 5.56 KB

patch

obsolete

>diff -urN /usr/ports/graphics/xv/Makefile xv/Makefile
>--- /usr/ports/graphics/xv/Makefile	Wed Oct  7 07:02:41 1998
>+++ xv/Makefile	Thu Oct  8 00:01:42 1998
>@@ -14,7 +14,7 @@
> 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 @@
> 		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 @@
> 	@${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 <bsd.port.mk>
>diff -urN /usr/ports/graphics/xv/files/md5 xv/files/md5
>--- /usr/ports/graphics/xv/files/md5	Fri Aug 28 07:02:04 1998
>+++ xv/files/md5	Thu Oct  8 00:00:22 1998
>@@ -7,6 +7,6 @@
> 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 -urN /usr/ports/graphics/xv/patches/patch-ac xv/patches/patch-ac
>--- /usr/ports/graphics/xv/patches/patch-ac	Fri Aug 28 07:02:05 1998
>+++ xv/patches/patch-ac	Wed Oct  7 22:23:49 1998
>@@ -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 -urN /usr/ports/graphics/xv/patches/patch-ad xv/patches/patch-ad
>--- /usr/ports/graphics/xv/patches/patch-ad	Fri Aug 28 07:02:05 1998
>+++ xv/patches/patch-ad	Wed Oct  7 22:35:51 1998
>@@ -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

Actions: View | Diff

Attachments on bug 8185: 2807