diff options
| -rw-r--r-- | devel/libgsf-gnome/Makefile | 16 | ||||
| -rw-r--r-- | devel/libgsf/Makefile | 12 | ||||
| -rw-r--r-- | devel/libgsf/distinfo | 6 | ||||
| -rw-r--r-- | devel/libgsf/files/patch-configure | 32 |
4 files changed, 15 insertions, 51 deletions
diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile index 73bd353..cce59e5 100644 --- a/devel/libgsf-gnome/Makefile +++ b/devel/libgsf-gnome/Makefile @@ -6,6 +6,7 @@ # $MCom: ports/devel/libgsf-gnome/Makefile,v 1.10 2006/03/05 21:26:56 marcus Exp $ # +PORTREVISION= 0 CATEGORIES= devel gnome PKGNAMESUFFIX= -gnome @@ -18,19 +19,18 @@ PLIST= ${.CURDIR}/pkg-plist USE_GNOME= gnomehack libgsf gnomevfs2 ltverhack intlhack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \ - --disable-gtk-doc --with-bz2 --with-gnome -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lgsf-1" + --with-bz2 --with-gnome +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lgsf-1" -GCONF_SCHEMAS= GSF_SLAVE= yes do-build: - @cd ${WRKSRC}/gsf-gnome && ${MAKE} + @cd ${WRKSRC}/gsf-gnome && ${MAKE} do-install: - cd ${WRKSRC}/gsf-gnome && ${MAKE} ${INSTALL_TARGET} - ${MKDIR} ${PREFIX}/libdata/pkgconfig - ${INSTALL_DATA} ${WRKSRC}/libgsf-gnome-1.pc ${PREFIX}/libdata/pkgconfig + cd ${WRKSRC}/gsf-gnome && ${MAKE} ${INSTALL_TARGET} + ${MKDIR} ${PREFIX}/libdata/pkgconfig + ${INSTALL_DATA} ${WRKSRC}/libgsf-gnome-1.pc ${PREFIX}/libdata/pkgconfig .include "${MASTERDIR}/Makefile" diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 975333c..fd7bc04 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -7,8 +7,8 @@ # PORTNAME= libgsf -PORTVERSION= 1.14.4 -PORTREVISION?= 1 +PORTVERSION= 1.14.5 +PORTREVISION?= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -28,17 +28,13 @@ USE_GETTEXT= yes USE_LDCONFIG= yes USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 gconf2 ltverhack intlhack USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ - --disable-gtk-doc --without-gnome --with-bz2 \ - --mandir=${PREFIX}/man \ - --with-gconf-source=${GCONF_CONFIG_SOURCE} \ - --without-python +CONFIGURE_ARGS?=--without-gnome --without-python CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" .if !defined(GSF_SLAVE) GCONF_SCHEMAS= gsf-office-thumbnailer.schemas -MAN1= gsf-office-thumbnailer.1 +MAN1= gsf.1 gsf-office-thumbnailer.1 .endif .include <bsd.port.mk> diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index c288d16..3c6cd60 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgsf-1.14.4.tar.bz2) = 2d07ad2f1336c101ce14982ba7289f80 -SHA256 (gnome2/libgsf-1.14.4.tar.bz2) = e68ee826bda241ac847420043f0335c1c84cdf7ee772d672ae392ff21815e7f0 -SIZE (gnome2/libgsf-1.14.4.tar.bz2) = 543158 +MD5 (gnome2/libgsf-1.14.5.tar.bz2) = 0c1a70ca77aef5706544c1b4082a632a +SHA256 (gnome2/libgsf-1.14.5.tar.bz2) = 54a1432c73e2df93dfe16bd6c11eb56c949da0967479be2e31e2c08ea0ee1901 +SIZE (gnome2/libgsf-1.14.5.tar.bz2) = 541647 diff --git a/devel/libgsf/files/patch-configure b/devel/libgsf/files/patch-configure deleted file mode 100644 index b73f5df..0000000 --- a/devel/libgsf/files/patch-configure +++ /dev/null @@ -1,32 +0,0 @@ ---- configure.orig Tue Jun 19 00:45:29 2007 -+++ configure Tue Jun 19 00:46:52 2007 -@@ -25107,13 +25107,6 @@ else - fi - - --if test $WITH_BONOBO = yes; then -- WITH_BONOBO_TRUE= -- WITH_BONOBO_FALSE='#' --else -- WITH_BONOBO_TRUE='#' -- WITH_BONOBO_FALSE= --fi - - - if test $WITH_BONOBO = yes; then -@@ -25215,6 +25208,15 @@ else - WITH_LIBGSF_GNOME_TRUE='#' - WITH_LIBGSF_GNOME_FALSE= - fi -+ -+if test $WITH_BONOBO = yes; then -+ WITH_BONOBO_TRUE= -+ WITH_BONOBO_FALSE='#' -+else -+ WITH_BONOBO_TRUE='#' -+ WITH_BONOBO_FALSE= -+fi -+ - - - # =================== |
