diff -urN /usr/ports/print/cups-pstoraster/Makefile print/cups-pstoraster/Makefile
--- /usr/ports/print/cups-pstoraster/Makefile	Tue Nov 16 00:49:35 2004
+++ print/cups-pstoraster/Makefile	Fri Nov 26 23:53:50 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	cups-pstoraster
 PORTVERSION=	7.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.easysw.com/pub/ghostscript/
@@ -31,21 +31,27 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--without-x --without-ijs --without-gimp-print \
 		--with-gs=espgs
 MAKE_ARGS=	CFLAGS_STANDARD="${CFLAGS} -DUPD_SIGNAL=0" \
-		DEVICE_DEVS="\$$(DD)cups.dev"
+		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
 
 post-patch:
 	${LN} -sf ${ESPGS_WRKSRC}/gdevcups.c ${WRKSRC}/src
 	${CAT} ${FILESDIR}/cups.contrib.mak >> ${WRKSRC}/src/contrib.mak
+.for file in pstopxl pstoraster
 	${SED} -e 's:@prefix@:${PREFIX}:g ; \
 		 s:@exec_prefix@:${PREFIX}:g ; \
 		 s:@bindir@:${PREFIX}/bin:g ; \
 		 s:@GS@:espgs:g' \
-		${ESPGS_WRKSRC}/pstoraster.in > ${ESPGS_WRKSRC}/pstoraster
+		${ESPGS_WRKSRC}/${file}.in > ${ESPGS_WRKSRC}/${file}
+.endfor
 	${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS=@CPPFLAGS@ |g ; \
 		 s|^LDFLAGS=|LDFLAGS=@LDFLAGS@ |g ; \
 		 s|^DEVICE_DEVS|#DEVICE_DEVS|g' ${WRKSRC}/Makefile.in
@@ -56,12 +62,15 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/espgs ${PREFIX}/bin
-	${INSTALL_DATA} ${ESPGS_WRKSRC}/pstoraster.convs \
-		${PREFIX}/etc/cups
-	${INSTALL_SCRIPT} ${ESPGS_WRKSRC}/pstoraster \
-		${PREFIX}/libexec/cups/filter
+	${INSTALL_DATA} ${ESPGS_WRKSRC}/pstoraster.convs ${PREFIX}/etc/cups
+.for file in pstopxl pstoraster
+	${INSTALL_SCRIPT} ${ESPGS_WRKSRC}/${file} ${PREFIX}/libexec/cups/filter
+.endfor
 	${CHOWN} -R ${CUPSOWN}:${CUPSGRP} \
 		${PREFIX}/etc/cups ${PREFIX}/libexec/cups/filter
+.for file in pxlcolor.ppd pxlmono.ppd
+	${INSTALL_DATA} ${ESPGS_WRKSRC}/${file} ${PREFIX}/share/cups/model
+.endfor
 
 .include "${.CURDIR}/../../print/cups/Makefile.common"
 .include <bsd.port.pre.mk>
diff -urN /usr/ports/print/cups-pstoraster/files/patch-src:gxobj.h print/cups-pstoraster/files/patch-src:gxobj.h
--- /usr/ports/print/cups-pstoraster/files/patch-src:gxobj.h	Mon Jul 21 23:24:12 2003
+++ print/cups-pstoraster/files/patch-src:gxobj.h	Sun Jun 20 21:21:04 2004
@@ -4,7 +4,7 @@
   * 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__)
++#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) |\
diff -urN /usr/ports/print/cups-pstoraster/pkg-plist print/cups-pstoraster/pkg-plist
--- /usr/ports/print/cups-pstoraster/pkg-plist	Thu Jul 25 12:00:14 2002
+++ print/cups-pstoraster/pkg-plist	Thu Jan  1 09:00:00 1970
@@ -1,3 +0,0 @@
-bin/espgs
-etc/cups/pstoraster.convs
-libexec/cups/filter/pstoraster