diff options
Diffstat (limited to 'www/gtkhtml')
| -rw-r--r-- | www/gtkhtml/Makefile | 3 | ||||
| -rw-r--r-- | www/gtkhtml/files/gtkhtmlConf.sh | 6 | ||||
| -rw-r--r-- | www/gtkhtml/files/patch-ad | 11 | ||||
| -rw-r--r-- | www/gtkhtml/files/patch-doc::Makefile.in | 2 | ||||
| -rw-r--r-- | www/gtkhtml/pkg-plist | 120 |
5 files changed, 65 insertions, 77 deletions
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 1561810ba991..14f2f22ad71c 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkhtml PORTVERSION= 1.1.10 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1 @@ -40,7 +40,6 @@ LIB_DEPENDS+= soup.6:${PORTSDIR}/devel/soup post-configure: @${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ - s|%%X11BASE%%|${X11BASE}|g ; \ s|%%VERSION%%|${VERSION}|g' ${FILESDIR}/gtkhtmlConf.sh \ > ${WRKSRC}/gtkhtmlConf.sh diff --git a/www/gtkhtml/files/gtkhtmlConf.sh b/www/gtkhtml/files/gtkhtmlConf.sh index 4dc806a68c1b..12cee8fa1e2d 100644 --- a/www/gtkhtml/files/gtkhtmlConf.sh +++ b/www/gtkhtml/files/gtkhtmlConf.sh @@ -1,5 +1,5 @@ GTKHTML_LIBDIR="-L%%PREFIX%%/lib" -GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm" -GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%X11BASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF" -GTKHTML_DATADIR="%%PREFIX%%/share/gnome" +GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm" +GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF" +GTKHTML_DATADIR="%%PREFIX%%/share" MODULE_VERSION="%%VERSION%%" diff --git a/www/gtkhtml/files/patch-ad b/www/gtkhtml/files/patch-ad deleted file mode 100644 index 863d79c3bdf9..000000000000 --- a/www/gtkhtml/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gtkhtml.c.orig Wed Sep 4 20:00:35 2002 -+++ src/gtkhtml.c Wed Sep 18 21:40:55 2002 -@@ -4353,7 +4353,7 @@ - { - gchar *rcfile; - -- rcfile = g_strconcat ((from_share ? PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()), -+ rcfile = g_strconcat ((from_share ? PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()), - (from_share ? "" : "/.gnome/"), name, NULL); - - if (g_file_test (rcfile, G_FILE_TEST_ISFILE)) diff --git a/www/gtkhtml/files/patch-doc::Makefile.in b/www/gtkhtml/files/patch-doc::Makefile.in index 575490af80ea..cc08c2029ff4 100644 --- a/www/gtkhtml/files/patch-doc::Makefile.in +++ b/www/gtkhtml/files/patch-doc::Makefile.in @@ -7,7 +7,7 @@ $FreeBSD$ CFLAGS = @CFLAGS@ $(EXTRA_GNOME_CFLAGS) LDFLAGS = @LDFLAGS@ $(EXTRA_GNOME_LIBS) --HTML_DIR = $(datadir)/html +-HTML_DIR = $(datadir)/gnome/html +HTML_DIR = $(prefix)/share/doc/gtkhtml TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist index 4eae08527c73..946cd317d4c3 100644 --- a/www/gtkhtml/pkg-plist +++ b/www/gtkhtml/pkg-plist @@ -97,71 +97,69 @@ lib/libgtkhtml-1.1.la lib/libgtkhtml-1.1.so lib/libgtkhtml-1.1.so.3 libdata/pkgconfig/gtkhtml-1.1.pc +share/control-center/Documents/gtkhtml-properties.desktop %%DOCSDIR%%/gtkhtml-decl.txt %%DOCSDIR%%/gtkhtml-sections.txt %%DOCSDIR%%/gtkhtml.hierarchy %%DOCSDIR%%/gtkhtml.sgml %%DOCSDIR%%/gtkhtml.types share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop -share/gnome/control-center/Documents/gtkhtml-properties.desktop -share/gnome/gtkhtml-1.1/Editor.idl -share/gnome/gtkhtml-1.1/gtkhtml-capplet.glade -share/gnome/gtkhtml-1.1/gtkhtml-editor-properties.glade -share/gnome/gtkhtml-1.1/icons/16_copy.png -share/gnome/gtkhtml-1.1/icons/16_cut.png -share/gnome/gtkhtml-1.1/icons/16_paste.png -share/gnome/gtkhtml-1.1/icons/24_copy.png -share/gnome/gtkhtml-1.1/icons/24_cut.png -share/gnome/gtkhtml-1.1/icons/24_paste.png -share/gnome/gtkhtml-1.1/icons/bulb.png -share/gnome/gtkhtml-1.1/icons/empty_image.png -share/gnome/gtkhtml-1.1/icons/flowers.png -share/gnome/gtkhtml-1.1/icons/html-viewer.png -share/gnome/gtkhtml-1.1/icons/insert-image-16.png -share/gnome/gtkhtml-1.1/icons/insert-image-24.png -share/gnome/gtkhtml-1.1/icons/insert-link-16.png -share/gnome/gtkhtml-1.1/icons/insert-link-24.png -share/gnome/gtkhtml-1.1/icons/insert-object-16.png -share/gnome/gtkhtml-1.1/icons/insert-object-24.png -share/gnome/gtkhtml-1.1/icons/insert-rule-16.png -share/gnome/gtkhtml-1.1/icons/insert-rule-24.png -share/gnome/gtkhtml-1.1/icons/insert-table-16.png -share/gnome/gtkhtml-1.1/icons/insert-table-24.png -share/gnome/gtkhtml-1.1/icons/paper.png -share/gnome/gtkhtml-1.1/icons/properties-16.png -share/gnome/gtkhtml-1.1/icons/rect.png -share/gnome/gtkhtml-1.1/icons/redo-16.png -share/gnome/gtkhtml-1.1/icons/redo-24.png -share/gnome/gtkhtml-1.1/icons/rule-blue-center.png -share/gnome/gtkhtml-1.1/icons/rule-blue-left.png -share/gnome/gtkhtml-1.1/icons/rule-blue-right.png -share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-center.png -share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-left.png -share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-right.png -share/gnome/gtkhtml-1.1/icons/search-16.png -share/gnome/gtkhtml-1.1/icons/search-24.png -share/gnome/gtkhtml-1.1/icons/search-and-replace-16.png -share/gnome/gtkhtml-1.1/icons/search-and-replace-24.png -share/gnome/gtkhtml-1.1/icons/smiley-1.png -share/gnome/gtkhtml-1.1/icons/smiley-10.png -share/gnome/gtkhtml-1.1/icons/smiley-11.png -share/gnome/gtkhtml-1.1/icons/smiley-2.png -share/gnome/gtkhtml-1.1/icons/smiley-3.png -share/gnome/gtkhtml-1.1/icons/smiley-4.png -share/gnome/gtkhtml-1.1/icons/smiley-5.png -share/gnome/gtkhtml-1.1/icons/smiley-6.png -share/gnome/gtkhtml-1.1/icons/smiley-8.png -share/gnome/gtkhtml-1.1/icons/smiley-9.png -share/gnome/gtkhtml-1.1/icons/texture.png -share/gnome/gtkhtml-1.1/icons/transparent.png -share/gnome/gtkhtml-1.1/icons/undo-16.png -share/gnome/gtkhtml-1.1/icons/undo-24.png -share/gnome/gtkhtml-1.1/keybindingsrc.emacs -share/gnome/gtkhtml-1.1/keybindingsrc.ms -share/gnome/gtkhtml-1.1/keybindingsrc.xemacs -share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf -share/gnome/oaf/GNOME_GtkHTML_Editor.oaf share/gnome/ui/GNOME_GtkHTML_Editor.xml +share/gtkhtml-1.1/Editor.idl +share/gtkhtml-1.1/gtkhtml-capplet.glade +share/gtkhtml-1.1/gtkhtml-editor-properties.glade +share/gtkhtml-1.1/icons/16_copy.png +share/gtkhtml-1.1/icons/16_cut.png +share/gtkhtml-1.1/icons/16_paste.png +share/gtkhtml-1.1/icons/24_copy.png +share/gtkhtml-1.1/icons/24_cut.png +share/gtkhtml-1.1/icons/24_paste.png +share/gtkhtml-1.1/icons/bulb.png +share/gtkhtml-1.1/icons/empty_image.png +share/gtkhtml-1.1/icons/flowers.png +share/gtkhtml-1.1/icons/html-viewer.png +share/gtkhtml-1.1/icons/insert-image-16.png +share/gtkhtml-1.1/icons/insert-image-24.png +share/gtkhtml-1.1/icons/insert-link-16.png +share/gtkhtml-1.1/icons/insert-link-24.png +share/gtkhtml-1.1/icons/insert-object-16.png +share/gtkhtml-1.1/icons/insert-object-24.png +share/gtkhtml-1.1/icons/insert-rule-16.png +share/gtkhtml-1.1/icons/insert-rule-24.png +share/gtkhtml-1.1/icons/insert-table-16.png +share/gtkhtml-1.1/icons/insert-table-24.png +share/gtkhtml-1.1/icons/paper.png +share/gtkhtml-1.1/icons/properties-16.png +share/gtkhtml-1.1/icons/rect.png +share/gtkhtml-1.1/icons/redo-16.png +share/gtkhtml-1.1/icons/redo-24.png +share/gtkhtml-1.1/icons/rule-blue-center.png +share/gtkhtml-1.1/icons/rule-blue-left.png +share/gtkhtml-1.1/icons/rule-blue-right.png +share/gtkhtml-1.1/icons/rule-yellow-flowers-center.png +share/gtkhtml-1.1/icons/rule-yellow-flowers-left.png +share/gtkhtml-1.1/icons/rule-yellow-flowers-right.png +share/gtkhtml-1.1/icons/search-16.png +share/gtkhtml-1.1/icons/search-24.png +share/gtkhtml-1.1/icons/search-and-replace-16.png +share/gtkhtml-1.1/icons/search-and-replace-24.png +share/gtkhtml-1.1/icons/smiley-1.png +share/gtkhtml-1.1/icons/smiley-10.png +share/gtkhtml-1.1/icons/smiley-11.png +share/gtkhtml-1.1/icons/smiley-2.png +share/gtkhtml-1.1/icons/smiley-3.png +share/gtkhtml-1.1/icons/smiley-4.png +share/gtkhtml-1.1/icons/smiley-5.png +share/gtkhtml-1.1/icons/smiley-6.png +share/gtkhtml-1.1/icons/smiley-8.png +share/gtkhtml-1.1/icons/smiley-9.png +share/gtkhtml-1.1/icons/texture.png +share/gtkhtml-1.1/icons/transparent.png +share/gtkhtml-1.1/icons/undo-16.png +share/gtkhtml-1.1/icons/undo-24.png +share/gtkhtml-1.1/keybindingsrc.emacs +share/gtkhtml-1.1/keybindingsrc.ms +share/gtkhtml-1.1/keybindingsrc.xemacs share/locale/az/LC_MESSAGES/gtkhtml.mo share/locale/ca/LC_MESSAGES/gtkhtml.mo share/locale/cs/LC_MESSAGES/gtkhtml.mo @@ -196,8 +194,10 @@ share/locale/uk/LC_MESSAGES/gtkhtml.mo share/locale/vi/LC_MESSAGES/gtkhtml.mo share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo -@dirrm share/gnome/gtkhtml-1.1/icons -@dirrm share/gnome/gtkhtml-1.1 +share/oaf/GNOME_GtkHTML_EBrowser.oaf +share/oaf/GNOME_GtkHTML_Editor.oaf +@dirrm share/gtkhtml-1.1/icons +@dirrm share/gtkhtml-1.1 @dirrm %%DOCSDIR%%/gtkhtml @dirrm %%DOCSDIR%% @dirrm include/gtkhtml-1.1/gtkhtml |