From f6cfae1ed53bc40320347241a241f395b790b9c6 Mon Sep 17 00:00:00 2001 From: marcm Date: Sun, 15 Sep 2002 15:57:41 +0000 Subject: [PATCH] * Updates 0.35 -> 0.36. * Moves the dynamic fontmap directory to /var/db/gnome/gnome-print (from /etc/gnome/gnome-print). * Updates the system fontmap on pkg install, not during build. * Addes a fix for Alpha ok nino@ --- x11/gnome/print/Makefile | 17 ++-- x11/gnome/print/distinfo | 6 +- x11/gnome/print/patches/patch-configure | 96 +++++++++++-------- .../print/patches/patch-installer_Makefile_in | 18 +++- .../patches/patch-libgnomeprint_Makefile_in | 12 +++ x11/gnome/print/patches/patch-ltmain_sh | 10 +- .../patches/patch-run-gnome-font-install | 13 --- .../patches/sup-alpha-installer_Makefile_in | 12 +++ x11/gnome/print/pkg/DEINSTALL | 20 ++-- x11/gnome/print/pkg/INSTALL | 87 ----------------- x11/gnome/print/pkg/PLIST | 8 +- 11 files changed, 116 insertions(+), 183 deletions(-) create mode 100644 x11/gnome/print/patches/patch-libgnomeprint_Makefile_in delete mode 100644 x11/gnome/print/patches/patch-run-gnome-font-install create mode 100644 x11/gnome/print/patches/sup-alpha-installer_Makefile_in delete mode 100644 x11/gnome/print/pkg/INSTALL diff --git a/x11/gnome/print/Makefile b/x11/gnome/print/Makefile index 1b2a22d8d8d..b0da31d02c5 100644 --- a/x11/gnome/print/Makefile +++ b/x11/gnome/print/Makefile @@ -1,22 +1,25 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2002/05/21 19:17:54 nino Exp $ +# $OpenBSD: Makefile,v 1.2 2002/09/15 15:57:41 marcm Exp $ COMMENT= "printing framework for GNOME" -DISTNAME= gnome-print-0.35 +DISTNAME= gnome-print-0.36 CATEGORIES= x11/gnome print -NEED_VERSION= 1.530 HOMEPAGE= http://www.gnome.org/projects/gnome-print/ -MAINTAINER= Marc Matteo +MAINTAINER= Marc Matteo MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-print/} +# fix for Alpha +.if (${MACHINE_ARCH} == "alpha") +PATCH_LIST= patch-* sup-alpha-* +.endif + LIB_DEPENDS= gdk_pixbuf.2::graphics/gdk-pixbuf \ gnome.36,art_lgpl.4,gnomesupport.0,gnomeui.46::x11/gnome/libs \ gnomecanvaspixbuf.1::graphics/gdk-pixbuf,-gnome \ xml.9::textproc/libxml1 -BUILD_DEPENDS= :ghostscript-*:print/ghostscript/gnu RUN_DEPENDS= :ghostscript-*:print/ghostscript/gnu # LGPL @@ -30,8 +33,4 @@ USE_X11= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -post-install: - @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnome-print; \ - cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gnome-print/ - .include diff --git a/x11/gnome/print/distinfo b/x11/gnome/print/distinfo index d051eb82be2..7e58a7fbc52 100644 --- a/x11/gnome/print/distinfo +++ b/x11/gnome/print/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-print-0.35.tar.gz) = 65e0e91bfa43f01debfa12d25c5dc70b -RMD160 (gnome-print-0.35.tar.gz) = f2ab4dd03282ac3c6b411c405096c592ae9b3a2c -SHA1 (gnome-print-0.35.tar.gz) = 287f008c99925c662526f644a17cdb05c7533507 +MD5 (gnome-print-0.36.tar.gz) = 43e9f5f29c9f02bf7cf235b8d2b624da +RMD160 (gnome-print-0.36.tar.gz) = 78d2a7b7b407f20f437657dd67492814d20da75f +SHA1 (gnome-print-0.36.tar.gz) = a1b2ada6b8ce432731233607ac2e3567ccae675e diff --git a/x11/gnome/print/patches/patch-configure b/x11/gnome/print/patches/patch-configure index 0dac0edb10f..f5485dc170a 100644 --- a/x11/gnome/print/patches/patch-configure +++ b/x11/gnome/print/patches/patch-configure @@ -1,42 +1,10 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2002/05/21 19:17:54 nino Exp $ ---- configure.orig Mon Jan 28 11:58:57 2002 -+++ configure Mon May 13 17:00:37 2002 -@@ -3594,8 +3594,8 @@ else - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case "$host_os" in -@@ -3604,8 +3604,8 @@ else - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' - ;; - esac - fi -@@ -3791,6 +3791,7 @@ EOF - ld_shlibs=no - ;; - esac -+ PATH_SEPARATOR=$lt_cv_sys_path_separator - fi - echo "$ac_t""$ld_shlibs" 1>&6 - test "$ld_shlibs" = no && can_build_shared=no -@@ -4140,6 +4141,16 @@ os2*) - library_names_spec='$libname.dll $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH -+ ;; -+ +$OpenBSD: patch-configure,v 1.2 2002/09/15 15:57:41 marcm Exp $ +--- configure.orig Sun Jun 2 09:44:20 2002 ++++ configure Wed Sep 4 23:54:01 2002 +@@ -1861,6 +1861,16 @@ newos6*) + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` @@ -45,6 +13,52 @@ $OpenBSD: patch-configure,v 1.1.1.1 2002/05/21 19:17:54 nino Exp $ + else + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + fi - ;; - ++ ;; ++ osf3* | osf4* | osf5*) + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' +@@ -3123,7 +3133,9 @@ cygwin* | mingw* | pw32* ) + with_gnu_ld=no + fi + ;; +- ++openbsd*) ++ with_gnu_ld=no ++ ;; + esac + + ld_shlibs=yes +@@ -3527,8 +3539,8 @@ else + ;; + + openbsd*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-R$libdir' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; +@@ -3684,6 +3696,7 @@ else + ld_shlibs=no + ;; + esac ++ PATH_SEPARATOR=$lt_cv_sys_path_separator + fi + echo "$ac_t""$ld_shlibs" 1>&6 + test "$ld_shlibs" = no && can_build_shared=no +@@ -4007,10 +4020,9 @@ newsos6) + + openbsd*) + version_type=sunos +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- need_version=no +- fi ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=yes + library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH diff --git a/x11/gnome/print/patches/patch-installer_Makefile_in b/x11/gnome/print/patches/patch-installer_Makefile_in index 4f61b7873d4..5d4a2fb7a81 100644 --- a/x11/gnome/print/patches/patch-installer_Makefile_in +++ b/x11/gnome/print/patches/patch-installer_Makefile_in @@ -1,12 +1,20 @@ -$OpenBSD: patch-installer_Makefile_in,v 1.1.1.1 2002/05/21 19:17:54 nino Exp $ ---- installer/Makefile.in.orig Sun Mar 17 13:27:51 2002 -+++ installer/Makefile.in Sun Mar 17 13:29:02 2002 -@@ -436,7 +436,7 @@ maintainer-clean-generic clean mostlycle +$OpenBSD: patch-installer_Makefile_in,v 1.2 2002/09/15 15:57:41 marcm Exp $ +--- installer/Makefile.in.orig Sun Jun 2 09:44:58 2002 ++++ installer/Makefile.in Wed Sep 4 21:32:00 2002 +@@ -164,7 +164,7 @@ CPPFLAGS = @CPPFLAGS@ \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DLIBDIR=\""$(libdir)"\" \ + -DFONTMAPDIR_STATIC=\""$(datadir)/gnome/fonts"\" \ +- -DFONTMAPDIR_DYNAMIC=\""$(sysconfdir)/gnome/fonts"\" \ ++ -DFONTMAPDIR_DYNAMIC=\""/var/db/gnome/gnome-print/fonts"\" \ + -DVERSION=\""$(VERSION)"\" + + +@@ -448,7 +448,6 @@ maintainer-clean-generic clean mostlycle install-data-local: gnome-font-install - $(PERL) $(top_srcdir)/run-gnome-font-install ./gnome-font-install $(datadir) $(top_srcdir) $(sysconfdir) -+ $(PERL) $(top_srcdir)/run-gnome-font-install ./gnome-font-install $(datadir) $(top_srcdir) $(DESTDIR)$(sysconfdir) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/x11/gnome/print/patches/patch-libgnomeprint_Makefile_in b/x11/gnome/print/patches/patch-libgnomeprint_Makefile_in new file mode 100644 index 00000000000..48cdbf3bebe --- /dev/null +++ b/x11/gnome/print/patches/patch-libgnomeprint_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-libgnomeprint_Makefile_in,v 1.1 2002/09/15 15:57:41 marcm Exp $ +--- libgnomeprint/Makefile.in.orig Wed Sep 4 21:19:01 2002 ++++ libgnomeprint/Makefile.in Wed Sep 4 21:30:20 2002 +@@ -187,7 +187,7 @@ CPPFLAGS = @CPPFLAGS@ \ + -DBINDIR=\""$(bindir)"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DFONTMAPDIR_STATIC=\""$(datadir)/gnome/fonts"\" \ +- -DFONTMAPDIR_DYNAMIC=\""$(sysconfdir)/gnome/fonts"\" ++ -DFONTMAPDIR_DYNAMIC=\""/var/db/gnome/gnome-print/fonts"\" + + + INCLUDES = \ diff --git a/x11/gnome/print/patches/patch-ltmain_sh b/x11/gnome/print/patches/patch-ltmain_sh index a91feb5e7f0..42000b6cf59 100644 --- a/x11/gnome/print/patches/patch-ltmain_sh +++ b/x11/gnome/print/patches/patch-ltmain_sh @@ -1,7 +1,7 @@ -$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/05/21 19:17:54 nino Exp $ ---- ltmain.sh.orig Mon Jan 28 20:58:50 2002 -+++ ltmain.sh Sun Mar 17 21:44:09 2002 -@@ -1071,6 +1071,17 @@ compiler." +$OpenBSD: patch-ltmain_sh,v 1.2 2002/09/15 15:57:41 marcm Exp $ +--- ltmain.sh.orig Sun Jun 2 09:44:16 2002 ++++ ltmain.sh Wed Sep 4 20:14:09 2002 +@@ -1037,6 +1037,17 @@ compiler." continue ;; @@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/05/21 19:17:54 nino Exp $ -module) module=yes continue -@@ -4492,40 +4503,6 @@ relink_command=\"$relink_command\"" +@@ -4412,40 +4423,6 @@ relink_command=\"$relink_command\"" # Exit here if they wanted silent mode. test "$show" = ":" && exit 0 diff --git a/x11/gnome/print/patches/patch-run-gnome-font-install b/x11/gnome/print/patches/patch-run-gnome-font-install deleted file mode 100644 index 0205b4a9148..00000000000 --- a/x11/gnome/print/patches/patch-run-gnome-font-install +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-run-gnome-font-install,v 1.1.1.1 2002/05/21 19:17:54 nino Exp $ ---- run-gnome-font-install.orig Sun Mar 17 13:47:21 2002 -+++ run-gnome-font-install Sun Mar 17 14:05:00 2002 -@@ -156,7 +156,8 @@ system ($installer, @options); - # Whatever remains - my @options = ( - '--debug', -- '--smart', -+ '--dynamic', -+ "--target=$sysconfdir/gnome/fonts/gnome-print.fontmap", - "--aliases=$srcdir/fonts/adobe-urw.font", - "--aliases=$datadir/fonts/adobe-urw.font", - "--aliases=$datadir/gnome/fonts/adobe-urw.font", diff --git a/x11/gnome/print/patches/sup-alpha-installer_Makefile_in b/x11/gnome/print/patches/sup-alpha-installer_Makefile_in new file mode 100644 index 00000000000..2bbf2dd82e5 --- /dev/null +++ b/x11/gnome/print/patches/sup-alpha-installer_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: sup-alpha-installer_Makefile_in,v 1.1 2002/09/15 15:57:41 marcm Exp $ +--- installer/Makefile.in.orig Wed Sep 4 22:54:14 2002 ++++ installer/Makefile.in Wed Sep 4 22:54:44 2002 +@@ -305,7 +305,7 @@ maintainer-clean-libtool: + + gnome-font-install$(EXEEXT): $(gnome_font_install_OBJECTS) $(gnome_font_install_DEPENDENCIES) + @rm -f gnome-font-install$(EXEEXT) +- $(LINK) $(gnome_font_install_LDFLAGS) $(gnome_font_install_OBJECTS) $(gnome_font_install_LDADD) $(LIBS) ++ $(LINK) $(gnome_font_install_LDFLAGS) $(gnome_font_install_OBJECTS) $(gnome_font_install_LDADD) $(LIBS) -static + + install-readmeDATA: $(readme_DATA) + @$(NORMAL_INSTALL) diff --git a/x11/gnome/print/pkg/DEINSTALL b/x11/gnome/print/pkg/DEINSTALL index 51b32b90c58..2729a223dfb 100644 --- a/x11/gnome/print/pkg/DEINSTALL +++ b/x11/gnome/print/pkg/DEINSTALL @@ -1,28 +1,20 @@ #!/bin/sh # -# $OpenBSD: DEINSTALL,v 1.1.1.1 2002/05/21 19:17:54 nino Exp $ +# $OpenBSD: DEINSTALL,v 1.2 2002/09/15 15:57:41 marcm Exp $ # set -e PATH=/bin:/usr/bin:/sbin:/usr/sbin -FILES=' -gnome/fonts/gnome-print-ghostscript.fontmap -gnome/fonts/gnome-print-x11.fontmap -' - echo echo "+--------------- $1" -echo "| To really remove $1 from your system you should also" -echo "| remove the configuration files from the ${SYSCONFDIR} directory." +echo "| To completly remove $1 from your system you should also" +echo "| remove the configuration directory:" +echo "|" +echo "| /var/db/gnome/gnome-print" +echo "|" echo "| If you are planning on installing $1 again in the future" echo "| you can leave it as it is." -echo "|" -echo "| FYI, the following configuration files belongs to this package:" -echo "|" -for f in ${FILES}; do - echo "| ${SYSCONFDIR}/$f" -done echo "+--------------- $1" echo diff --git a/x11/gnome/print/pkg/INSTALL b/x11/gnome/print/pkg/INSTALL deleted file mode 100644 index c19246a07e9..00000000000 --- a/x11/gnome/print/pkg/INSTALL +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: INSTALL,v 1.1.1.1 2002/05/21 19:17:54 nino Exp $ - -set -e -P_NAME=gnome-print -PATH=/bin:/usr/bin:/sbin:/usr/sbin -PREFIX=${PKG_PREFIX:-/usr/local} -DEST_PFX=${SYSCONFDIR} -SOURCE_PFX=${PREFIX}/share/examples/${P_NAME} - -FILES=' -gnome/fonts/gnome-print-ghostscript.fontmap -gnome/fonts/gnome-print-x11.fontmap -' - -do_post() { - - echo - echo "+--------------- ${P_NAME}" - - # install dirs if neccesary - install -d ${DEST_PFX}/gnome/fonts - - # install or take note of existing config files - for f in ${FILES}; do - if [ -f "${DEST_PFX}/$f" ]; then - OLD_CONFS="${OLD_CONFS} $f" - else - if ! install -m 644 ${SOURCE_PFX}/$f ${DEST_PFX}/$f; then - echo "| ERROR: The following file could not be installed, exiting: ${DEST_PFX}/$f" - exit 1 - fi - NEW_CONFS="${NEW_CONFS} $f" - fi - done - - # print status report - if [ -n "${NEW_CONFS}" ]; then - echo "| The following NEW configuration files have been installed:" - echo "|" - for f in ${NEW_CONFS}; do - echo "| ${DEST_PFX}/$f" - done - fi - - if [ -n "${OLD_CONFS}" ]; then - if [ -n "${NEW_CONFS}" ]; then - echo "|" - fi - echo "| The following OLD configuration files was found and have NOT been overwritten:" - echo "| You should however manually compare them to their equivalents in " - echo "|" - echo "| ${SOURCE_PFX}" - echo "|" - echo "| and update your configuration if needed." - echo "|" - for f in ${OLD_CONFS}; do - echo "| ${DEST_PFX}/$f" - done - fi - echo "+--------------- ${P_NAME}" - echo -} - -# verify proper execution -# -if [ $# -ne 2 ]; then - echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 - exit 1 -fi - -# Verify/process the command -# -case $2 in - PRE-INSTALL) - ;; - POST-INSTALL) - do_post - ;; - *) - echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/x11/gnome/print/pkg/PLIST b/x11/gnome/print/pkg/PLIST index 5bb0b372806..21ab898a4dd 100644 --- a/x11/gnome/print/pkg/PLIST +++ b/x11/gnome/print/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2002/05/21 19:17:54 nino Exp $ +@comment $OpenBSD: PLIST,v 1.2 2002/09/15 15:57:41 marcm Exp $ bin/gnome-font-install include/gnome-1.0/libgnomeprint/gnome-font-dialog.h include/gnome-1.0/libgnomeprint/gnome-font-face-private.h @@ -26,8 +26,6 @@ include/gnome-1.0/libgnomeprint/gnome-text.h lib/libgnomeprint.a lib/libgnomeprint.la lib/printConf.sh -share/examples/gnome-print/gnome/fonts/gnome-print-ghostscript.fontmap -share/examples/gnome-print/gnome/fonts/gnome-print-x11.fontmap @comment share/fonts/README.binaries @comment share/fonts/README.installer share/fonts/afms/adobe/pagd8a.afm @@ -84,7 +82,5 @@ share/gnome/fonts/defaults.fontmap @comment @dirrm share/fonts/afms/adobe @comment @dirrm share/fonts/afms @comment @dirrm share/fonts -@dirrm share/examples/gnome-print/gnome/fonts -@dirrm share/examples/gnome-print/gnome -@dirrm share/examples/gnome-print @dirrm include/gnome-1.0/libgnomeprint +@exec %D/bin/gnome-font-install --smart