From 006b931300723b014d3494f00990d6d063454579 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Fri, 12 Jul 2002 12:05:25 +0000 Subject: [PATCH] - Use USE_GNOMENG; - fix on -current by renaming isspecial() inline into dia_isspecial(); - enable freetype support. --- graphics/dia/Makefile | 36 +++++----------- graphics/dia/files/patch-ab | 36 ---------------- graphics/dia/files/patch-ad | 42 ++----------------- .../patch-objects::GRAFCET::boolequation.c | 23 ++++++++++ graphics/dia/files/patch-po::Makefile.in.in | 7 ---- graphics/dia/pkg-plist | 23 +++++----- 6 files changed, 49 insertions(+), 118 deletions(-) delete mode 100644 graphics/dia/files/patch-ab create mode 100644 graphics/dia/files/patch-objects::GRAFCET::boolequation.c delete mode 100644 graphics/dia/files/patch-po::Makefile.in.in diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 3dfffcac7516..dd49ee07d11f 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -13,45 +13,29 @@ MASTER_SITE_SUBDIR= stable/sources/dia MAINTAINER?= gnome@FreeBSD.org +BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf + freetype.9:${PORTSDIR}/print/freetype2 \ + unicode.0:${PORTSDIR}/devel/libunicode USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOMELIBS= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf gnomeprint USE_LIBTOOL= yes +CONFIGURE_ARGS= --enable-gnome --enable-gnome-print --enable-bonobo \ + --enable-freetype CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" MAN1= dia.1 -.include - -.if exists(${X11BASE}/bin/panel) || defined(WITH_GNOME) || defined(PACKAGE_BUILDING) -.undef WITHOUT_GNOME -USE_GNOME= yes -PKGNAMESUFFIX= -gnome -CONFIGURE_ARGS= --enable-gnome \ - --enable-gnome-print -PLIST_SUB+= DIAHELP="help/dia" \ - GNOME:="" -MAKE_ENV= HAVE_GNOME="yes" -.else -CONFIGURE_ARGS= --disable-gnome -LIB_DEPENDS+= unicode.0:${PORTSDIR}/devel/libunicode -PLIST_SUB+= DIAHELP="dia/help" \ - GNOME:="@comment " -.endif - -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' post-install: ${SED} "s|%%PREFIX%%|${PREFIX}|g" ${FILESDIR}/dia.sh > ${WRKDIR}/dia.sh ${INSTALL_SCRIPT} ${WRKDIR}/dia.sh ${PREFIX}/bin/dia -.include +.include diff --git a/graphics/dia/files/patch-ab b/graphics/dia/files/patch-ab deleted file mode 100644 index 7f3e78cb3539..000000000000 --- a/graphics/dia/files/patch-ab +++ /dev/null @@ -1,36 +0,0 @@ - -$FreeBSD$ - ---- Makefile.in.orig Tue May 14 02:45:54 2002 -+++ Makefile.in Tue May 14 02:47:55 2002 -@@ -159,7 +159,8 @@ - pixmapdir = $(gnomedatadir)/pixmaps - pixmap_DATA = dia_gnome_icon.png dia-diagram.png - --Applicationsdir = $(gnomedatadir)/gnome/apps/Applications -+ifdef HAVE_GNOME -+Applicationsdir = $(gnomedatadir)/apps/Applications - applications_in_files = dia.desktop.in - Applications_DATA = $(applications_in_files:.desktop.in=.desktop) - -@@ -167,6 +168,7 @@ - - mimedir = $(gnomedatadir)/mime-info - mime_DATA = dia.mime dia.keys -+endif - - EXTRA_DIST = dia.xpm dia_gnome_icon.png dia_gnome_menu_icon.png dia.desktop.in dia.spec KNOWN_BUGS $(pkgdata_DATA) $(man_MANS) dia-diagram.png dia.mime dia.keys.in core-translation-report po-checktrans.py po-checktrans intltool-extract.in intltool-merge.in intltool-update.in RELEASE-PROCESS - -@@ -511,8 +513,12 @@ - install-exec-am: - install-exec: install-exec-recursive - -+ifdef HAVE_GNOME - install-data-am: install-man install-ApplicationsDATA install-mimeDATA \ - install-pixmapDATA install-pkgdataDATA -+else -+install-data-am: install-man install-pkgdataDATA -+endif - install-data: install-data-recursive - - install-am: all-am diff --git a/graphics/dia/files/patch-ad b/graphics/dia/files/patch-ad index b7161d4b6567..d6c279a24ab4 100644 --- a/graphics/dia/files/patch-ad +++ b/graphics/dia/files/patch-ad @@ -1,34 +1,9 @@ $FreeBSD$ ---- configure.orig Mon Jun 3 00:34:03 2002 -+++ configure Mon Jun 3 00:34:24 2002 -@@ -3651,8 +3651,23 @@ - done - - -+# Actually configure libtool. ac_aux_dir is where install-sh is found. -+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ -+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ -+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -+$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \ -+|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - -- -+# Reload cache, that may have been modified by ltconfig -+if test -r "$cache_file"; then -+ echo "loading cache $cache_file" -+ . $cache_file -+else -+ echo "creating cache $cache_file" -+ > $cache_file -+fi - - # Only perform the check for file, if the check method requires it - case $deplibs_check_method in -@@ -7118,12 +7133,14 @@ +--- configure.orig Sat Jun 1 10:40:13 2002 ++++ configure Fri Jul 12 13:52:26 2002 +@@ -7118,6 +7118,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -36,16 +11,7 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' - --# Prevent multiple expansion -- -+# Redirect the config.log output again, so that the ltconfig log is not -+# clobbered by the next message. -+exec 5>>./config.log - - - echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -@@ -7911,7 +7928,7 @@ +@@ -7911,7 +7912,7 @@ OLDCPPFLAGS=$CPPFLAGS diff --git a/graphics/dia/files/patch-objects::GRAFCET::boolequation.c b/graphics/dia/files/patch-objects::GRAFCET::boolequation.c new file mode 100644 index 000000000000..6cccd75ed6d9 --- /dev/null +++ b/graphics/dia/files/patch-objects::GRAFCET::boolequation.c @@ -0,0 +1,23 @@ + +$FreeBSD$ + +--- objects/GRAFCET/boolequation.c 2002/07/12 11:18:01 1.1 ++++ objects/GRAFCET/boolequation.c 2002/07/12 11:24:38 +@@ -64,7 +64,7 @@ + + + /* utility */ +-inline static gboolean isspecial(unichar c) ++inline static gboolean dia_isspecial(unichar c) + { + switch (c) { + case '!': +@@ -141,7 +141,7 @@ + c = g_utf8_get_char(*str); + p1 = g_utf8_next_char(*str); + #endif +- if (isspecial(c)) break; ++ if (dia_isspecial(c)) break; + *str = p1; + } + diff --git a/graphics/dia/files/patch-po::Makefile.in.in b/graphics/dia/files/patch-po::Makefile.in.in deleted file mode 100644 index e803022425f7..000000000000 --- a/graphics/dia/files/patch-po::Makefile.in.in +++ /dev/null @@ -1,7 +0,0 @@ ---- po/Makefile.in.in.orig Fri May 18 21:28:07 2001 -+++ po/Makefile.in.in Sun May 20 17:35:29 2001 -@@ -22,3 +22,3 @@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gettextsrcdir = $(datadir)/gettext/po diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist index 29626ad9e27b..76190fdee8b1 100644 --- a/graphics/dia/pkg-plist +++ b/graphics/dia/pkg-plist @@ -1,5 +1,6 @@ bin/dia bin/dia-bin +bin/dia-embedd lib/dia/libcgm_filter.so lib/dia/libchronogram_objects.so lib/dia/libcustom_objects.so @@ -19,7 +20,7 @@ lib/dia/libsvg_filter.so lib/dia/libuml_objects.so lib/dia/libwpg_filter.so lib/dia/libxfig_filter.so -%%GNOME:%%share/gnome/apps/Applications/dia.desktop +share/gnome/apps/Applications/dia.desktop share/gnome/dia/dia_logo.png share/gnome/dia/shapes/Circuit/ground.shape share/gnome/dia/shapes/Circuit/ground.xpm @@ -467,13 +468,13 @@ share/gnome/dia/sheets/civil.sheet share/gnome/dia/sheets/jigsaw.sheet share/gnome/dia/sheets/network.sheet share/gnome/dia/sheets/sybase.sheet -share/gnome/%%DIAHELP%%/C -share/gnome/%%DIAHELP%%/en/topic.dat -share/gnome/%%DIAHELP%%/pl/topic.dat -%%GNOME:%%share/gnome/mime-info/dia.keys -%%GNOME:%%share/gnome/mime-info/dia.mime -%%GNOME:%%share/gnome/pixmaps/dia-diagram.png -%%GNOME:%%share/gnome/pixmaps/dia_gnome_icon.png +share/gnome/help/dia/C +share/gnome/help/dia/en/topic.dat +share/gnome/help/dia/pl/topic.dat +share/gnome/mime-info/dia.keys +share/gnome/mime-info/dia.mime +share/gnome/pixmaps/dia-diagram.png +share/gnome/pixmaps/dia_gnome_icon.png share/locale/az/LC_MESSAGES/dia.mo share/locale/ca/LC_MESSAGES/dia.mo share/locale/da/LC_MESSAGES/dia.mo @@ -503,9 +504,9 @@ share/locale/uk/LC_MESSAGES/dia.mo share/locale/vi/LC_MESSAGES/dia.mo share/locale/zh_CN/LC_MESSAGES/dia.mo share/locale/zh_TW/LC_MESSAGES/dia.mo -@dirrm share/gnome/%%DIAHELP%%/pl -@dirrm share/gnome/%%DIAHELP%%/en -@dirrm share/gnome/%%DIAHELP%% +@dirrm share/gnome/help/dia/pl +@dirrm share/gnome/help/dia/en +@dirrm share/gnome/help/dia @dirrm share/gnome/dia/sheets/UML @dirrm share/gnome/dia/sheets/GRAFCET @dirrm share/gnome/dia/sheets/ER