Attachment 50346 Details for Bug 76731 – file.diff

[patch] file.diff

file.diff (text/plain), 4.10 KB, created by Jose M Rodriguez on 2005-01-26 22:20:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jose M Rodriguez

Created: 2005-01-26 22:20:16 UTC

Size: 4.10 KB

patch

obsolete

>diff -Nru /usr/HEAD/ports/print/cups-pstoraster/Makefile print/cups-pstoraster/Makefile
>--- /usr/HEAD/ports/print/cups-pstoraster/Makefile	Thu Dec 16 20:18:02 2004
>+++ print/cups-pstoraster/Makefile	Wed Jan 26 22:39:25 2005
>@@ -6,25 +6,24 @@
> #
> 
> PORTNAME=	cups-pstoraster
>-PORTVERSION=	7.07
>-PORTREVISION=	3
>+PORTVERSION=	${CUPS_PORTVER}
>+PORTREVISION=	${CUPS_PORTREV}
>+PORTEPOCH=	1
> CATEGORIES=	print
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
>-		ftp://ftp.easysw.com/pub/ghostscript/
>-MASTER_SITE_SUBDIR=	ghostscript espgs
>-DISTFILES=	ghostscript-${PORTVERSION}${EXTRACT_SUFX} \
>-		espgs-${ESPGS_VER}-source${EXTRACT_SUFX}
>-DIST_SUBDIR=	ghostscript
>+MASTER_SITES=	${CUPS_MASTER_SITES}
>+DISTFILES=	${DISTNAME}.tar.bz2
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	GNU Postscript interpreter for CUPS printing to non-PS printers
> 
>+PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/${GHOSTSCRIPT_PORT}:patch
> LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-base
>-RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/${PORTVERSION}/lib/gs_init.ps:${PORTSDIR}/print/ghostscript-gnu
>+USE_GHOSTSCRIPT_RUN=	true
> 
>-ESPGS_VER=	7.07.1
>-ESPGS_WRKSRC=	${WRKDIR}/espgs-${ESPGS_VER}/pstoraster
>-WRKSRC=		${WRKDIR}/ghostscript-${PORTVERSION}
>+ESPGS_WRKSRC=	${WRKDIR}/cups-${CUPS_VERSION}/pstoraster
>+MD5_FILE=	${.CURDIR}/../../print/cups/distinfo
>+EXTRACT_AFTER_ARGS=	| ${TAR} -xf - cups-${CUPS_VERSION}/pstoraster
>+WRKSRC=		${WRKDIRPREFIX}${PORTSDIR}/${GHOSTSCRIPT_PORT}/work/ghostscript
> 
> USE_BZIP2=	yes
> USE_REINPLACE=	yes
>@@ -37,7 +36,6 @@
> 		--with-gs=espgs
> MAKE_ARGS=	CFLAGS_STANDARD="${CFLAGS} -DUPD_SIGNAL=0" \
> 		DEVICE_DEVS="\$$(DD)cups.dev \$$(DD)pxlcolor.dev \$$(DD)pxlmono.dev"
>-
> PLIST_FILES=	bin/espgs etc/cups/pstoraster.convs \
> 		libexec/cups/filter/pstopxl libexec/cups/filter/pstoraster \
> 		share/cups/model/pxlcolor.ppd share/cups/model/pxlmono.ppd
>@@ -71,5 +69,10 @@
> .endfor
> 
> .include "${.CURDIR}/../../print/cups/Makefile.common"
>+.if ${CUPS_REVISION} < 1
>+DISTNAME=	cups-${CUPS_VERSION}-source
>+.else
>+DISTNAME=	cups-${CUPS_VERSION}-${CUPS_REVISION}-source
>+.endif
> .include <bsd.port.pre.mk>
> .include <bsd.port.post.mk>
>diff -Nru /usr/HEAD/ports/print/cups-pstoraster/files/patch-src:genarch.c print/cups-pstoraster/files/patch-src:genarch.c
>--- /usr/HEAD/ports/print/cups-pstoraster/files/patch-src:genarch.c	Thu Jul 25 05:00:17 2002
>+++ print/cups-pstoraster/files/patch-src:genarch.c	Tue Jan 25 21:13:39 2005
>@@ -1,34 +0,0 @@
>---- src/genarch.c.orig	Tue Jun  5 15:38:57 2001
>-+++ src/genarch.c	Wed Jun 20 04:17:42 2001
>-@@ -41,6 +41,7 @@
>-     fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n", str);
>- }
>- 
>-+#ifndef __FreeBSD__
>- private clock_t
>- time_clear(char *buf, int bsize, int nreps)
>- {
>-@@ -51,6 +52,7 @@
>- 	memset(buf, 0, bsize);
>-     return clock() - t;
>- }
>-+#endif /* __FreeBSD__ */
>- 
>- private void
>- define(FILE *f, const char *str)
>-@@ -181,6 +183,7 @@
>-     fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n");
>- #undef PRINT_MAX
>- 
>-+#ifndef __FreeBSD__
>-     section(f, "Cache sizes");
>- 
>-     /*
>-@@ -241,6 +244,7 @@
>- 	}
>- 	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
>-     }
>-+#endif /* __FreeBSD__ */
>- 
>-     section(f, "Miscellaneous");
>- 
>diff -Nru /usr/HEAD/ports/print/cups-pstoraster/files/patch-src:gxobj.h print/cups-pstoraster/files/patch-src:gxobj.h
>--- /usr/HEAD/ports/print/cups-pstoraster/files/patch-src:gxobj.h	Fri Nov 26 22:05:46 2004
>+++ print/cups-pstoraster/files/patch-src:gxobj.h	Tue Jan 25 21:13:39 2005
>@@ -1,17 +0,0 @@
>---- src/gxobj.h.orig	Fri Feb 22 19:45:59 2002
>-+++ src/gxobj.h	Thu Dec 19 00:16:57 2002
>-@@ -99,10 +99,14 @@
>-  * The final | is because back pointer values are divided by obj_back_scale,
>-  * so objects must be aligned at least 0 mod obj_back_scale.
>-  */
>-+#if !defined(__ia64__) && !defined(__amd64__)
>- #define obj_align_mod\
>-   (((arch_align_long_mod - 1) | (arch_align_ptr_mod - 1) |\
>-     (arch_align_double_mod - 1) | (align_bitmap_mod - 1) |\
>-     (obj_back_scale - 1)) + 1)
>-+#else
>-+#define obj_align_mod	16
>-+#endif
>- /* The only possible values for obj_align_mod are 4, 8, or 16.... */
>- #if obj_align_mod == 4
>- #  define log2_obj_align_mod 2
>--- patch-cups-pstoraster ends here ---

Actions: View | Diff

Attachments on bug 76731: 50344 | 50345 | 50346