diff options
Diffstat (limited to 'print')
-rw-r--r-- | print/gnome-print/Makefile | 11 | ||||
-rw-r--r-- | print/gnome-print/files/md5 | 4 | ||||
-rw-r--r-- | print/gnome-print/files/patch-sum | 6 | ||||
-rw-r--r-- | print/gnome-print/patches/patch-aa | 51 | ||||
-rw-r--r-- | print/gnome-print/patches/patch-ab | 22 | ||||
-rw-r--r-- | print/gnome-print/pkg/PLIST | 21 |
6 files changed, 73 insertions, 42 deletions
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index b56551037d2..c497e46bbe4 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2000/06/21 06:57:42 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2000/10/15 17:35:28 rh Exp $ # -DISTNAME= gnome-print-0.20 +DISTNAME= gnome-print-0.23 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-print/} @@ -10,13 +10,14 @@ HOMEPAGE= http://www.levien.com/gnome/print-arch.html DEPENDS+= gnome-libs>=1.0.56:../../x11/gnome-libs DEPENDS+= libxml>=1.8.5:../../textproc/libxml +DEPENDS+= libunicode>=0.4:../../textproc/libunicode DEPENDS+= ghostscript{,-nox11}-[6-9]*:../../print/ghostscript -USE_X11BASE= # defined -USE_LIBTOOL= # defined +USE_X11BASE= yes +USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -GNU_CONFIGURE= # defined +GNU_CONFIGURE= yes CONFIGURE_ENV+= GHOSTSCRIPT=${LOCALBASE}/bin/gs CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" #override HOME to avoid trying to install ${HOME}/.gnome diff --git a/print/gnome-print/files/md5 b/print/gnome-print/files/md5 index ca0ca2c3b42..d4448a3bcb5 100644 --- a/print/gnome-print/files/md5 +++ b/print/gnome-print/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.9 2000/05/31 09:15:19 rh Exp $ +$NetBSD: md5,v 1.10 2000/10/15 17:35:30 rh Exp $ -MD5 (gnome-print-0.20.tar.gz) = 1cb286ed2bd600ab16e996717904f425 +MD5 (gnome-print-0.23.tar.gz) = 58251d638026c45ace36c5843ec0b2f8 diff --git a/print/gnome-print/files/patch-sum b/print/gnome-print/files/patch-sum index 287cea995fe..cf8534d8c55 100644 --- a/print/gnome-print/files/patch-sum +++ b/print/gnome-print/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.10 2000/05/19 16:19:46 rh Exp $ +$NetBSD: patch-sum,v 1.11 2000/10/15 17:35:30 rh Exp $ -MD5 (patch-aa) = d00b58c3f782beb9106d2de4af55e404 -MD5 (patch-ab) = f9a4bccd8d151997db67845244471dd2 +MD5 (patch-aa) = c31b2a84716a887fdf9575493baf94df +MD5 (patch-ab) = 795bf30253779d0898d49fcd069dbb0d MD5 (patch-ac) = 65698ae5f9ed8d34846c2f2f154b35a1 diff --git a/print/gnome-print/patches/patch-aa b/print/gnome-print/patches/patch-aa index d71817ed6d1..dea76214298 100644 --- a/print/gnome-print/patches/patch-aa +++ b/print/gnome-print/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.7 2000/05/19 16:19:46 rh Exp $ +$NetBSD: patch-aa,v 1.8 2000/10/15 17:35:30 rh Exp $ ---- configure.orig Fri May 5 07:48:41 2000 -+++ configure Fri May 19 18:02:30 2000 -@@ -2903,7 +2903,7 @@ +--- configure.orig Wed Sep 20 00:32:19 2000 ++++ configure +@@ -2906,7 +2906,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lxml `$GNOME_CONFIG --libs xml` $LIBS" +LIBS="`xml-config --libs` ${LIBS}" cat > conftest.$ac_ext <<EOF - #line 2909 "configure" + #line 2912 "configure" #include "confdefs.h" -@@ -2933,7 +2933,8 @@ +@@ -2936,7 +2936,8 @@ echo "$ac_t""yes" 1>&6 @@ -21,3 +21,42 @@ $NetBSD: patch-aa,v 1.7 2000/05/19 16:19:46 rh Exp $ else echo "$ac_t""no" 1>&6 +@@ -4906,8 +4907,7 @@ + + echo $ac_n "checking for libunicode >= 0.4""... $ac_c" 1>&6 + echo "configure:4909: checking for libunicode >= 0.4" >&5 +-vers=`gnome-config --modversion unicode | sed -e "s/unicode-//" | \ +- awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'` ++vers=4 + if test "$vers" -ge 4; then + echo "$ac_t""found" 1>&6 + else +@@ -5041,23 +5041,23 @@ + PRINT_INCLUDEDIR='-I${includedir}' + PRINT_INCLUDEDIR="$PRINT_INCLUDEDIR `gnome-config --cflags gnomeui`" + PRINT_INCLUDEDIR="$PRINT_INCLUDEDIR `xml-config --cflags`" +-PRINT_LIBS="-lgnomeprint `gnome-config --libs gnomeui gdk_pixbuf unicode`" ++PRINT_LIBS="-lgnomeprint `gnome-config --libs gnomeui gdk_pixbuf` -lunicode" + PRINT_LIBS="$PRINT_LIBS `xml-config --libs`" + + + + +-PRINT_TEST_CFLAGS=`$GNOME_CONFIG --cflags gnomeui gdk_pixbuf unicode` ++PRINT_TEST_CFLAGS="`$GNOME_CONFIG --cflags gnomeui gdk_pixbuf`" + PRINT_TEST_CFLAGS="$PRINT_TEST_CFLAGS `xml-config --cflags`" +-PRINT_TEST_LIBS=`$GNOME_CONFIG --libs gnomeui gdk_pixbuf unicode` ++PRINT_TEST_LIBS="`$GNOME_CONFIG --libs gnomeui gdk_pixbuf` -lunicode" + PRINT_TEST_LIBS="$PRINT_TEST_LIBS `xml-config --libs`" + + + + +-PRINT_TEST_CFLAGS=`$GNOME_CONFIG --cflags gnomeui gdk_pixbuf unicode` ++PRINT_TEST_CFLAGS=`$GNOME_CONFIG --cflags gnomeui gdk_pixbuf` + PRINT_TEST_CFLAGS="$PRINT_TEST_CFLAGS `xml-config --cflags`" +-PRINT_TEST_LIBS=`$GNOME_CONFIG --libs gnomeui gdk_pixbuf unicode` ++PRINT_TEST_LIBS="`$GNOME_CONFIG --libs gnomeui gdk_pixbuf` -lunicode" + PRINT_TEST_LIBS="$PRINT_TEST_LIBS `xml-config --libs`" + + diff --git a/print/gnome-print/patches/patch-ab b/print/gnome-print/patches/patch-ab index 7307b8cfdde..891f8fa2fdd 100644 --- a/print/gnome-print/patches/patch-ab +++ b/print/gnome-print/patches/patch-ab @@ -1,23 +1,13 @@ -$NetBSD: patch-ab,v 1.2 1999/11/12 15:17:16 rh Exp $ +$NetBSD: patch-ab,v 1.3 2000/10/15 17:35:30 rh Exp $ ---- Makefile.in.orig Fri Nov 12 16:12:48 1999 -+++ Makefile.in Fri Nov 12 16:12:48 1999 -@@ -335,15 +335,15 @@ +--- Makefile.in.orig Wed Sep 20 00:33:04 2000 ++++ Makefile.in +@@ -302,7 +302,7 @@ gnome-font-install: $(gnome_font_install_OBJECTS) $(gnome_font_install_DEPENDENCIES) @rm -f gnome-font-install - $(LINK) $(gnome_font_install_LDFLAGS) $(gnome_font_install_OBJECTS) $(gnome_font_install_LDADD) $(LIBS) + $(LINK) $(gnome_font_install_OBJECTS) $(gnome_font_install_LDFLAGS) $(gnome_font_install_LDADD) $(LIBS) - testprint: $(testprint_OBJECTS) $(testprint_DEPENDENCIES) - @rm -f testprint -- $(LINK) $(testprint_LDFLAGS) $(testprint_OBJECTS) $(testprint_LDADD) $(LIBS) -+ $(LINK) $(testprint_OBJECTS) $(testprint_LDFLAGS) $(testprint_LDADD) $(LIBS) - - testtext: $(testtext_OBJECTS) $(testtext_DEPENDENCIES) - @rm -f testtext -- $(LINK) $(testtext_LDFLAGS) $(testtext_OBJECTS) $(testtext_LDADD) $(LIBS) -+ $(LINK) $(testtext_OBJECTS) $(testtext_LDFLAGS) $(testtext_LDADD) $(LIBS) - - testprint2: $(testprint2_OBJECTS) $(testprint2_DEPENDENCIES) - @rm -f testprint2 + install-confexecDATA: $(confexec_DATA) + @$(NORMAL_INSTALL) diff --git a/print/gnome-print/pkg/PLIST b/print/gnome-print/pkg/PLIST index 651692c84d0..ca777f21109 100644 --- a/print/gnome-print/pkg/PLIST +++ b/print/gnome-print/pkg/PLIST @@ -1,30 +1,30 @@ -@comment $NetBSD: PLIST,v 1.11 2000/06/21 06:57:45 jlam Exp $ +@comment $NetBSD: PLIST,v 1.12 2000/10/15 17:35:30 rh Exp $ bin/gnome-font-install include/libgnomeprint/gnome-font-dialog.h +include/libgnomeprint/gnome-font-face.h include/libgnomeprint/gnome-font.h +include/libgnomeprint/gnome-glyphlist.h +include/libgnomeprint/gnome-pgl.h include/libgnomeprint/gnome-print-copies.h -include/libgnomeprint/gnome-print-compress.h include/libgnomeprint/gnome-print-dialog.h -include/libgnomeprint/gnome-print-i18n.h +include/libgnomeprint/gnome-print-encode.h +include/libgnomeprint/gnome-print-frgba.h include/libgnomeprint/gnome-print-master-preview.h include/libgnomeprint/gnome-print-master.h include/libgnomeprint/gnome-print-meta.h include/libgnomeprint/gnome-print-multipage.h +include/libgnomeprint/gnome-print-pdf.h include/libgnomeprint/gnome-print-pixbuf.h include/libgnomeprint/gnome-print-preview.h -include/libgnomeprint/gnome-print-rgbp.h +include/libgnomeprint/gnome-print-rbuf.h include/libgnomeprint/gnome-print.h include/libgnomeprint/gnome-printer-dialog.h -include/libgnomeprint/gnome-printer-profile.h include/libgnomeprint/gnome-printer.h +include/libgnomeprint/gnome-rfont.h include/libgnomeprint/gnome-text.h -include/libgnomeprint/gnome-canvas-hacktext.h -include/libgnomeprint/gnome-canvas-bpath.h -include/libgnomeprint/gnome-canvas-bpath-util.h -include/libgnomeprint/gnome-print-pclr.h lib/libgnomeprint.a lib/libgnomeprint.la -lib/libgnomeprint.so.9.1 +lib/libgnomeprint.so.12.0 lib/printConf.sh share/fonts/afms/adobe/pagd8a.afm share/fonts/afms/adobe/pagdo8a.afm @@ -88,6 +88,7 @@ share/locale/no/LC_MESSAGES/gnome-print.mo share/locale/pl/LC_MESSAGES/gnome-print.mo share/locale/pt_BR/LC_MESSAGES/gnome-print.mo share/locale/ru/LC_MESSAGES/gnome-print.mo +share/locale/sl/LC_MESSAGES/gnome-print.mo share/locale/sv/LC_MESSAGES/gnome-print.mo share/locale/uk/LC_MESSAGES/gnome-print.mo share/locale/ca/LC_MESSAGES/gnome-print.mo |