Date: Sun, 17 Mar 2002 20:16:08 -0500 (EST) From: Joe Marcus Clarke <marcus@marcuscom.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/36031: [PATCH] Add GNOME2 version of print/libgnomeprint Message-ID: <200203180116.g2I1G8Q61253@shumai.marcuscom.com>
next in thread | raw e-mail | index | archive | help
>Number: 36031
>Category: ports
>Synopsis: [PATCH] Add GNOME2 version of print/libgnomeprint
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 17 17:20:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Joe Marcus Clarke
>Release: FreeBSD 4.5-STABLE i386
>Organization:
MarcusCom, Inc.
>Environment:
System: FreeBSD shumai.marcuscom.com 4.5-STABLE FreeBSD 4.5-STABLE #0: Mon Mar 4 23:37:10 EST 2002 marcus@shumai.marcuscom.com:/usr/obj/usr/src/sys/SHUMAI i386
>Description:
After the gnomeprint -> libgnomeprint repo copy, update libgnomeprint to
its GNOME2 version.
>How-To-Repeat:
>Fix:
ADDED FILE:
files/patch-libgnomeprint::gnome-print-meta.c
--- libgnomeprint.diff begins here ---
diff -ruN libgnomeprint/Makefile libgnomeprint.new/Makefile
--- libgnomeprint/Makefile Sun Mar 17 20:09:33 2002
+++ libgnomeprint.new/Makefile Wed Mar 13 01:23:29 2002
@@ -1,42 +1,39 @@
-# New ports collection makefile for: gnomeprint
-# Date created: 15 Jan 1999
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
+# New ports collection makefile for: libgnomeprint
+# Date created: 10 March 2002
+# Whom: Joe Marcus Clarke <marcus@marcuscom.com>
#
-# $FreeBSD: ports/print/libgnomeprint/Makefile,v 1.43 2002/03/11 17:25:30 sobomax Exp $
+# $FreeBSD$
#
-PORTNAME= gnomeprint
-PORTVERSION= 0.35
+PORTNAME= libgnomeprint
+PORTVERSION= 1.111.0
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-print
-DISTNAME= gnome-print-${PORTVERSION}
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta2
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
-LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
-RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu
-
-PLIST_SUB= VERSION=${PORTVERSION}
+LIB_DEPENDS= bonobo-2.0:${PORTSDIR}/devel/libbonobo \
+ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
+ gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_PERL5= yes
-USE_GNOMECTRL= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+ @find ${WRKSRC} -name '*.[ch]' | xargs \
+ ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-
-post-install:
- @${TOUCH} ${PREFIX}/etc/gnome/fonts/gnome-print-x11.fontmap
.include <bsd.port.mk>
diff -ruN libgnomeprint/distinfo libgnomeprint.new/distinfo
--- libgnomeprint/distinfo Sun Mar 17 20:09:33 2002
+++ libgnomeprint.new/distinfo Tue Mar 12 14:37:22 2002
@@ -1 +1 @@
-MD5 (gnome-print-0.35.tar.gz) = 65e0e91bfa43f01debfa12d25c5dc70b
+MD5 (gnome2/libgnomeprint-1.111.0.tar.bz2) = 054583de93ba9713d8cc247f56e5268c
diff -ruN libgnomeprint/files/patch-ab libgnomeprint.new/files/patch-ab
--- libgnomeprint/files/patch-ab Sun Mar 17 20:09:33 2002
+++ libgnomeprint.new/files/patch-ab Tue Mar 12 18:22:27 2002
@@ -1,32 +1,11 @@
-
-$FreeBSD: ports/print/libgnomeprint/files/patch-ab,v 1.4 2001/10/09 07:31:12 sobomax Exp $
-
---- Makefile.in.orig Fri Oct 5 11:37:00 2001
-+++ Makefile.in Fri Oct 5 11:40:45 2001
-@@ -157,7 +157,7 @@
- @LIBGPA_TRUE@LIBGPA_DIR = libgpa data
- @LIBGPA_FALSE@LIBGPA_DIR =
+--- Makefile.in.orig Tue Mar 12 18:16:45 2002
++++ Makefile.in Tue Mar 12 18:22:16 2002
+@@ -116,7 +116,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ cxxflags_set = @cxxflags_set@
--SUBDIRS = intl po $(LIBGPA_DIR) libgnomeprint afms profiles fonts tests $(INSTALLER_DIR)
-+SUBDIRS = intl po $(LIBGPA_DIR) libgnomeprint afms profiles fonts $(INSTALLER_DIR)
+-SUBDIRS = libgnomeprint fonts installer tests data po
++SUBDIRS = libgnomeprint fonts installer data po
- INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) @PRINT_INCLUDEDIR@ -DPROFILEDIR=\""$(profilesdir)"\"
-
-@@ -171,7 +171,7 @@
- EXTRA_DIST = printConf.sh.in gnome-print.spec.in gnome-print.spec run-gnome-font-install
-
-
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = printConf.sh
-
- CLEANFILES = printConf.sh
-@@ -192,7 +192,7 @@
- TAR = gtar
- GZIP_ENV = --best
- DIST_SUBDIRS = intl po libgpa data libgnomeprint afms profiles fonts \
--tests installer
-+installer
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ EXTRA_DIST = message-of-doom ChangeLog ChangeLog.old ChangeLog.old.2
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff -ruN libgnomeprint/files/patch-libgnomeprint::gnome-print-meta.c libgnomeprint.new/files/patch-libgnomeprint::gnome-print-meta.c
--- libgnomeprint/files/patch-libgnomeprint::gnome-print-meta.c Wed Dec 31 19:00:00 1969
+++ libgnomeprint.new/files/patch-libgnomeprint::gnome-print-meta.c Wed Mar 13 01:19:02 2002
@@ -0,0 +1,12 @@
+--- libgnomeprint/gnome-print-meta.c.orig Wed Mar 13 01:18:18 2002
++++ libgnomeprint/gnome-print-meta.c Wed Mar 13 01:18:31 2002
+@@ -28,8 +28,8 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <sys/mman.h>
+ #include <sys/types.h>
++#include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff -ruN libgnomeprint/files/patch-ltmain.sh libgnomeprint.new/files/patch-ltmain.sh
--- libgnomeprint/files/patch-ltmain.sh Sun Mar 17 20:09:33 2002
+++ libgnomeprint.new/files/patch-ltmain.sh Sun Mar 10 13:11:23 2002
@@ -1,5 +1,5 @@
-$FreeBSD: ports/print/libgnomeprint/files/patch-ltmain.sh,v 1.6 2002/02/03 07:16:38 sobomax Exp $
+$FreeBSD: ports/print/gnomeprint/files/patch-ltmain.sh,v 1.6 2002/02/03 07:16:38 sobomax Exp $
--- ltmain.sh.orig Wed Jan 23 11:38:40 2002
+++ ltmain.sh Sun Feb 3 01:44:17 2002
diff -ruN libgnomeprint/pkg-plist libgnomeprint.new/pkg-plist
--- libgnomeprint/pkg-plist Sun Mar 17 20:09:33 2002
+++ libgnomeprint.new/pkg-plist Tue Mar 12 19:45:07 2002
@@ -1,122 +1,72 @@
-bin/gnome-font-install
-etc/gnome/fonts/gnome-print-ghostscript.fontmap
-etc/gnome/fonts/gnome-print-x11.fontmap
-etc/gnome/fonts/gnome-print.fontmap
-etc/printConf.sh
-include/gnome-1.0/libgnomeprint/gnome-font-dialog.h
-include/gnome-1.0/libgnomeprint/gnome-font-face-private.h
-include/gnome-1.0/libgnomeprint/gnome-font-face.h
-include/gnome-1.0/libgnomeprint/gnome-font.h
-include/gnome-1.0/libgnomeprint/gnome-glyphlist.h
-include/gnome-1.0/libgnomeprint/gnome-pgl.h
-include/gnome-1.0/libgnomeprint/gnome-print-copies.h
-include/gnome-1.0/libgnomeprint/gnome-print-dialog.h
-include/gnome-1.0/libgnomeprint/gnome-print-encode.h
-include/gnome-1.0/libgnomeprint/gnome-print-frgba.h
-include/gnome-1.0/libgnomeprint/gnome-print-master-preview.h
-include/gnome-1.0/libgnomeprint/gnome-print-master.h
-include/gnome-1.0/libgnomeprint/gnome-print-meta.h
-include/gnome-1.0/libgnomeprint/gnome-print-multipage.h
-include/gnome-1.0/libgnomeprint/gnome-print-pdf.h
-include/gnome-1.0/libgnomeprint/gnome-print-pixbuf.h
-include/gnome-1.0/libgnomeprint/gnome-print-preview.h
-include/gnome-1.0/libgnomeprint/gnome-print-rbuf.h
-include/gnome-1.0/libgnomeprint/gnome-print.h
-include/gnome-1.0/libgnomeprint/gnome-printer-dialog.h
-include/gnome-1.0/libgnomeprint/gnome-printer.h
-include/gnome-1.0/libgnomeprint/gnome-rfont.h
-include/gnome-1.0/libgnomeprint/gnome-text.h
-lib/libgnomeprint.a
-lib/libgnomeprint.so
-lib/libgnomeprint.so.16
-share/gnome/fonts/README.binaries
-share/gnome/fonts/README.installer
-share/gnome/fonts/adobe-urw.font
-share/gnome/fonts/afms/adobe/pagd8a.afm
-share/gnome/fonts/afms/adobe/pagdo8a.afm
-share/gnome/fonts/afms/adobe/pagk8a.afm
-share/gnome/fonts/afms/adobe/pagko8a.afm
-share/gnome/fonts/afms/adobe/pbkd8a.afm
-share/gnome/fonts/afms/adobe/pbkdi8a.afm
-share/gnome/fonts/afms/adobe/pbkl8a.afm
-share/gnome/fonts/afms/adobe/pbkli8a.afm
-share/gnome/fonts/afms/adobe/pcrb8a.afm
-share/gnome/fonts/afms/adobe/pcrbo8a.afm
-share/gnome/fonts/afms/adobe/pcrr8a.afm
-share/gnome/fonts/afms/adobe/pcrro8a.afm
-share/gnome/fonts/afms/adobe/phvb8a.afm
-share/gnome/fonts/afms/adobe/phvb8an.afm
-share/gnome/fonts/afms/adobe/phvbo8a.afm
-share/gnome/fonts/afms/adobe/phvbo8an.afm
-share/gnome/fonts/afms/adobe/phvl8a.afm
-share/gnome/fonts/afms/adobe/phvlo8a.afm
-share/gnome/fonts/afms/adobe/phvr8a.afm
-share/gnome/fonts/afms/adobe/phvr8an.afm
-share/gnome/fonts/afms/adobe/phvro8a.afm
-share/gnome/fonts/afms/adobe/phvro8an.afm
-share/gnome/fonts/afms/adobe/pncb8a.afm
-share/gnome/fonts/afms/adobe/pncbi8a.afm
-share/gnome/fonts/afms/adobe/pncr8a.afm
-share/gnome/fonts/afms/adobe/pncri8a.afm
-share/gnome/fonts/afms/adobe/pplb8a.afm
-share/gnome/fonts/afms/adobe/pplbi8a.afm
-share/gnome/fonts/afms/adobe/pplr8a.afm
-share/gnome/fonts/afms/adobe/pplri8a.afm
-share/gnome/fonts/afms/adobe/psyr.afm
-share/gnome/fonts/afms/adobe/ptmb8a.afm
-share/gnome/fonts/afms/adobe/ptmbi8a.afm
-share/gnome/fonts/afms/adobe/ptmr8a.afm
-share/gnome/fonts/afms/adobe/ptmri8a.afm
-share/gnome/fonts/afms/adobe/putb8a.afm
-share/gnome/fonts/afms/adobe/putbi8a.afm
-share/gnome/fonts/afms/adobe/putr8a.afm
-share/gnome/fonts/afms/adobe/putri8a.afm
-share/gnome/fonts/afms/adobe/pzcmi8a.afm
-share/gnome/fonts/afms/adobe/pzdr.afm
-share/gnome/fonts/defaults.fontmap
-share/gnome/gnome-print/profiles/PostscriptOptimized.profile
-share/gnome/gnome-print/profiles/fax-g3.profile
-share/gnome/gnome-print/profiles/pdf.profile
-share/locale/az/LC_MESSAGES/gnome-print.mo
-share/locale/bg/LC_MESSAGES/gnome-print.mo
-share/locale/ca/LC_MESSAGES/gnome-print.mo
-share/locale/da/LC_MESSAGES/gnome-print.mo
-share/locale/de/LC_MESSAGES/gnome-print.mo
-share/locale/el/LC_MESSAGES/gnome-print.mo
-share/locale/es/LC_MESSAGES/gnome-print.mo
-share/locale/et/LC_MESSAGES/gnome-print.mo
-share/locale/eu/LC_MESSAGES/gnome-print.mo
-share/locale/fi/LC_MESSAGES/gnome-print.mo
-share/locale/fr/LC_MESSAGES/gnome-print.mo
-share/locale/gl/LC_MESSAGES/gnome-print.mo
-share/locale/hr/LC_MESSAGES/gnome-print.mo
-share/locale/hu/LC_MESSAGES/gnome-print.mo
-share/locale/it/LC_MESSAGES/gnome-print.mo
-share/locale/ja/LC_MESSAGES/gnome-print.mo
-share/locale/ko/LC_MESSAGES/gnome-print.mo
-share/locale/lt/LC_MESSAGES/gnome-print.mo
-share/locale/lv/LC_MESSAGES/gnome-print.mo
-share/locale/nl/LC_MESSAGES/gnome-print.mo
-share/locale/nn/LC_MESSAGES/gnome-print.mo
-share/locale/no/LC_MESSAGES/gnome-print.mo
-share/locale/pl/LC_MESSAGES/gnome-print.mo
-share/locale/pt/LC_MESSAGES/gnome-print.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-print.mo
-share/locale/ro/LC_MESSAGES/gnome-print.mo
-share/locale/ru/LC_MESSAGES/gnome-print.mo
-share/locale/sk/LC_MESSAGES/gnome-print.mo
-share/locale/sl/LC_MESSAGES/gnome-print.mo
-share/locale/sv/LC_MESSAGES/gnome-print.mo
-share/locale/tr/LC_MESSAGES/gnome-print.mo
-share/locale/uk/LC_MESSAGES/gnome-print.mo
-share/locale/wa/LC_MESSAGES/gnome-print.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-print.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-print.mo
-@dirrm share/gnome/gnome-print/profiles
-@dirrm share/gnome/gnome-print
-@dirrm share/gnome/fonts/afms/adobe
-@dirrm share/gnome/fonts/afms
-@dirrm share/gnome/fonts
-@dirrm include/gnome-1.0/libgnomeprint
-@dirrm etc/gnome/fonts
-@dirrm etc/gnome
+bin/libgnomeprint-2.0-font-install
+include/libgnomeprint-2.0/libgnomeprint/gnome-font-face.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-font.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-glyphlist.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-pgl.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-bonobo-client.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-bonobo.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-config.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-master.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-meta.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-multipage.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-paper.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-private.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print-unit.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-print.h
+include/libgnomeprint-2.0/libgnomeprint/gnome-rfont.h
+include/libgnomeprint-2.0/libgnomeprint/gp-gc.h
+include/libgnomeprint-2.0/libgnomeprint/gpa-private.h
+lib/gnome-print-2.0/drivers/libgnomeprint-fax.so
+lib/gnome-print-2.0/drivers/libgnomeprint-fax.so.0
+lib/gnome-print-2.0/transports/libgnomeprint-file.so
+lib/gnome-print-2.0/transports/libgnomeprint-file.so.0
+lib/gnome-print-2.0/transports/libgnomeprint-lpr.so
+lib/gnome-print-2.0/transports/libgnomeprint-lpr.so.0
+lib/libgnomeprint-2.a
+lib/libgnomeprint-2.so
+lib/libgnomeprint-2.so.0
+lib/pkgconfig/libgnomeprint-2.0.pc
+share/fonts/README.installer
+share/gnome-print-2.0/media/media.xml
+share/gnome-print-2.0/models/GNOME-GENERIC-PS.model
+share/gnome-print-2.0/models/HP-LASERJET-4ML.model
+share/gnome-print-2.0/models/STYLUS-COLOR-740.model
+share/gnome-print-2.0/printers/GENERIC.printer
+share/gnome-print-2.0/vendors/EPSON.vendor
+share/gnome-print-2.0/vendors/GNOME.vendor
+share/gnome-print-2.0/vendors/HP.vendor
+share/gnome/libgnomeprint-2.0/fonts/adobe-urw.font
+share/gnome/libgnomeprint-2.0/fonts/defaults.fontmap
+share/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
+share/locale/az/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ca/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/es/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/hu/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ms/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/nl/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/nn/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/no/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/pl/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/pt/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ru/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/sk/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/sv/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ta/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/tr/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/uk/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/wa/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo
+@dirrm share/gnome/libgnomeprint-2.0/fonts
+@dirrm share/gnome/libgnomeprint-2.0
+@dirrm share/gnome-print-2.0/vendors
+@dirrm share/gnome-print-2.0/printers
+@dirrm share/gnome-print-2.0/models
+@dirrm share/gnome-print-2.0/media
+@dirrm share/gnome-print-2.0
+@dirrm share/fonts
+@dirrm include/libgnomeprint-2.0/libgnomeprint
+@dirrm include/libgnomeprint-2.0
+@dirrm lib/gnome-print-2.0/transports
+@dirrm lib/gnome-print-2.0/drivers
+@dirrm lib/gnome-print-2.0
--- libgnomeprint.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203180116.g2I1G8Q61253>