Extensive patchfile cleanups using sobomax's wonderful

post-extract rule
This commit is contained in:
Ade Lovett 2000-08-04 01:34:38 +00:00
parent 5035c4b32a
commit 9594f3f893
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=31296
63 changed files with 336 additions and 514 deletions

View file

@ -28,4 +28,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -1,14 +1,5 @@
--- configure.orig Tue May 11 05:56:50 1999
+++ configure Sat May 22 21:23:18 1999
@@ -3354,7 +3354,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- PTHREAD_LIB="-lc_r"
+ PTHREAD_LIB=""
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
@@ -5556,15 +5556,15 @@
fi

View file

@ -30,4 +30,11 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -15,7 +15,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
glade.4:${PORTSDIR}/devel/libglade \
guile.6:${PORTSDIR}/lang/guile
guile.9:${PORTSDIR}/lang/guile
RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@ -33,6 +33,13 @@ MAN1= gide.1 gdbio.1
PLIST_SUB= VERSION=${PORTVERSION}
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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-patch:
@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c
@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/src/*.c

View file

@ -1,14 +1,5 @@
--- plugins/asciitable/Makefile.in.orig Sun May 14 10:11:31 2000
+++ plugins/asciitable/Makefile.in Tue Jun 13 17:35:48 2000
@@ -147,7 +147,7 @@
libgide_asciitable_la_SOURCES = plugin_asciitable.c
-INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
@@ -157,7 +157,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -20,15 +11,6 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- plugins/browser/Makefile.in.orig Sun May 14 10:11:35 2000
+++ plugins/browser/Makefile.in Tue Jun 13 17:35:54 2000
@@ -150,7 +150,7 @@
libgide_browser_la_SOURCES = plugin_browser.c
-INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
libgide_browser_la_LIBADD = GtkSCB/libGtkSCB.la
@@ -163,7 +163,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -40,15 +22,6 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- plugins/calculator/Makefile.in.orig Sun May 14 10:11:33 2000
+++ plugins/calculator/Makefile.in Tue Jun 13 17:36:01 2000
@@ -147,7 +147,7 @@
libgide_calculator_la_SOURCES = plugin_calculator.c
-INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
@@ -157,7 +157,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -60,15 +33,6 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- plugins/docstat/Makefile.in.orig Sun May 14 10:11:34 2000
+++ plugins/docstat/Makefile.in Tue Jun 13 17:36:08 2000
@@ -147,7 +147,7 @@
libgide_docstat_la_SOURCES = plugin_docstat.c
-INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
@@ -157,7 +157,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -80,15 +44,6 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- plugins/sample/Makefile.in.orig Sun May 14 10:11:29 2000
+++ plugins/sample/Makefile.in Tue Jun 13 17:36:15 2000
@@ -153,7 +153,7 @@
libgide_sample_la_SOURCES = plugin-sample.c
-INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
@@ -163,7 +163,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -100,15 +55,6 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- plugins/text/Makefile.in.orig Sun May 14 10:11:32 2000
+++ plugins/text/Makefile.in Tue Jun 13 17:36:23 2000
@@ -148,7 +148,7 @@
libgide_text_la_SOURCES = plugin_text.c plugin_text_insert.c plugin_text_delete.c plugin_text_replace.c plugin_text_insert.h plugin_text_delete.h plugin_text_replace.h
-INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(GIDE_SRC_DIR) -I$(GIDE_SRC_DIR)/GtkEditor -I$(GIDE_SRC_DIR)/GtkSCText -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DVERSION=\""$(VERSION)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
@@ -158,7 +158,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -118,14 +64,3 @@
libgide_text_la_LIBADD =
libgide_text_la_OBJECTS = plugin_text.lo plugin_text_insert.lo \
plugin_text_delete.lo plugin_text_replace.lo
--- src/dialogs/Makefile.in.orig Sun May 14 10:11:43 2000
+++ src/dialogs/Makefile.in Tue Jun 13 17:35:25 2000
@@ -131,7 +131,7 @@
@GTKEDITOR_COMPILE_TRUE@EDITOR_INCLUDES = -I$(srcdir)/../GtkSCText/ -I$(srcdir)/../GtkEditor/
-INCLUDES = $(GNOME_INCLUDEDIR) $(EDITOR_INCLUDES) $(EXTRA_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGIDE_GLADEDIR=\""$(gladedir)"\" -I$(srcdir)/.. -I$(includedir)
+INCLUDES = $(GNOME_INCLUDEDIR) $(EDITOR_INCLUDES) $(EXTRA_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGIDE_GLADEDIR=\""$(gladedir)"\" -I$(srcdir)/.. -I$(includedir)
noinst_LIBRARIES = libdialogs.a

View file

@ -1,14 +1,5 @@
--- src/Makefile.in.orig Sun May 14 10:11:41 2000
+++ src/Makefile.in Tue Jun 13 17:33:29 2000
@@ -137,7 +137,7 @@
# binaries
bin_PROGRAMS = gide gdbio
-CFLAGS = @CFLAGS@ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGIDE_CFGDIR=\"$(pkgdatadir)\" -DGIDE_PLUGINDIR=\"$(libdir)/gide/plugins/$(VERSION)/\"
+CFLAGS = @CFLAGS@ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGIDE_CFGDIR=\"$(pkgdatadir)\" -DGIDE_PLUGINDIR=\"$(libdir)/gide/plugins/$(VERSION)/\"
INCLUDES = $(GNOME_INCLUDEDIR) $(GUILE_INCS) $(EDITOR_INCLUDES) -I$(srcdir)/dialogs
@@ -161,7 +161,7 @@

View file

@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
gconf.8:${PORTSDIR}/devel/gconf \
gconf-1.0:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
@ -36,4 +36,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN5= gnome-vfs-mime.5
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -9,15 +9,6 @@
fi
# Check whether --enable-libefs or --disable-libefs was given.
@@ -4862,7 +4862,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -5924,7 +5924,7 @@
VFSPTHREAD_LIBDIR='-L${libdir}'
VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'

View file

@ -1,18 +1,26 @@
--- modules/Makefile.in.orig Tue Feb 22 01:45:51 2000
+++ modules/Makefile.in Wed Jun 28 16:20:34 2000
--- modules/Makefile.in.orig Wed Aug 2 13:39:35 2000
+++ modules/Makefile.in Wed Aug 2 13:48:21 2000
@@ -191,6 +191,7 @@
libftp_la_SOURCES = ftp-method.c ftp-method.h module-shared.c module-shared.h
libfile_la_SOURCES = file-method.c file-method.h
+libftp_la_LDFLAGS = $(module_flags)
### `gconf' method
libfile_la_LDFLAGS = $(module_flags)
@@ -238,7 +239,6 @@
@@ -266,14 +267,13 @@
libbzip2_la_OBJECTS = bzip2-method.lo
libgzip_la_DEPENDENCIES =
libgzip_la_OBJECTS = gzip-method.lo
-libftp_la_LDFLAGS =
libftp_la_LIBADD =
libftp_la_OBJECTS = ftp-method.lo module-shared.lo
libftp_la_OBJECTS = ftp-method.lo
libvfs_pipe_la_DEPENDENCIES =
libvfs_pipe_la_OBJECTS = pipe-method.lo
libvfs_translate_la_DEPENDENCIES =
libvfs_translate_la_OBJECTS = translate-method.lo
-libvefs_la_LDFLAGS =
+libvefs_la_LDFLAGS = $(module_flags)
@HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES =
@HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS = efs-method.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

View file

@ -82,6 +82,7 @@ lib/vfs/modules/libftp.so
lib/vfs/modules/libgconf.so
lib/vfs/modules/libgzip.so
lib/vfs/modules/libhttp.so
lib/vfs/modules/libvefs.so
lib/vfs/modules/libvfs-pipe.so
lib/vfs/modules/libvfs-translate.so
share/gnome/apps/Settings/nautilus-mime-type.desktop

View file

@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
gconf.8:${PORTSDIR}/devel/gconf \
gconf-1.0:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
@ -36,4 +36,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN5= gnome-vfs-mime.5
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -9,15 +9,6 @@
fi
# Check whether --enable-libefs or --disable-libefs was given.
@@ -4862,7 +4862,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -5924,7 +5924,7 @@
VFSPTHREAD_LIBDIR='-L${libdir}'
VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'

View file

@ -1,18 +1,26 @@
--- modules/Makefile.in.orig Tue Feb 22 01:45:51 2000
+++ modules/Makefile.in Wed Jun 28 16:20:34 2000
--- modules/Makefile.in.orig Wed Aug 2 13:39:35 2000
+++ modules/Makefile.in Wed Aug 2 13:48:21 2000
@@ -191,6 +191,7 @@
libftp_la_SOURCES = ftp-method.c ftp-method.h module-shared.c module-shared.h
libfile_la_SOURCES = file-method.c file-method.h
+libftp_la_LDFLAGS = $(module_flags)
### `gconf' method
libfile_la_LDFLAGS = $(module_flags)
@@ -238,7 +239,6 @@
@@ -266,14 +267,13 @@
libbzip2_la_OBJECTS = bzip2-method.lo
libgzip_la_DEPENDENCIES =
libgzip_la_OBJECTS = gzip-method.lo
-libftp_la_LDFLAGS =
libftp_la_LIBADD =
libftp_la_OBJECTS = ftp-method.lo module-shared.lo
libftp_la_OBJECTS = ftp-method.lo
libvfs_pipe_la_DEPENDENCIES =
libvfs_pipe_la_OBJECTS = pipe-method.lo
libvfs_translate_la_DEPENDENCIES =
libvfs_translate_la_OBJECTS = translate-method.lo
-libvefs_la_LDFLAGS =
+libvefs_la_LDFLAGS = $(module_flags)
@HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES =
@HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS = efs-method.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

View file

@ -82,6 +82,7 @@ lib/vfs/modules/libftp.so
lib/vfs/modules/libgconf.so
lib/vfs/modules/libgzip.so
lib/vfs/modules/libhttp.so
lib/vfs/modules/libvefs.so
lib/vfs/modules/libvfs-pipe.so
lib/vfs/modules/libvfs-translate.so
share/gnome/apps/Settings/nautilus-mime-type.desktop

View file

@ -29,4 +29,11 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
gconf.8:${PORTSDIR}/devel/gconf \
gconf-1.0:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
@ -36,4 +36,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN5= gnome-vfs-mime.5
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -9,15 +9,6 @@
fi
# Check whether --enable-libefs or --disable-libefs was given.
@@ -4862,7 +4862,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -5924,7 +5924,7 @@
VFSPTHREAD_LIBDIR='-L${libdir}'
VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'

View file

@ -1,18 +1,26 @@
--- modules/Makefile.in.orig Tue Feb 22 01:45:51 2000
+++ modules/Makefile.in Wed Jun 28 16:20:34 2000
--- modules/Makefile.in.orig Wed Aug 2 13:39:35 2000
+++ modules/Makefile.in Wed Aug 2 13:48:21 2000
@@ -191,6 +191,7 @@
libftp_la_SOURCES = ftp-method.c ftp-method.h module-shared.c module-shared.h
libfile_la_SOURCES = file-method.c file-method.h
+libftp_la_LDFLAGS = $(module_flags)
### `gconf' method
libfile_la_LDFLAGS = $(module_flags)
@@ -238,7 +239,6 @@
@@ -266,14 +267,13 @@
libbzip2_la_OBJECTS = bzip2-method.lo
libgzip_la_DEPENDENCIES =
libgzip_la_OBJECTS = gzip-method.lo
-libftp_la_LDFLAGS =
libftp_la_LIBADD =
libftp_la_OBJECTS = ftp-method.lo module-shared.lo
libftp_la_OBJECTS = ftp-method.lo
libvfs_pipe_la_DEPENDENCIES =
libvfs_pipe_la_OBJECTS = pipe-method.lo
libvfs_translate_la_DEPENDENCIES =
libvfs_translate_la_OBJECTS = translate-method.lo
-libvefs_la_LDFLAGS =
+libvefs_la_LDFLAGS = $(module_flags)
@HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES =
@HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS = efs-method.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

View file

@ -82,6 +82,7 @@ lib/vfs/modules/libftp.so
lib/vfs/modules/libgconf.so
lib/vfs/modules/libgzip.so
lib/vfs/modules/libhttp.so
lib/vfs/modules/libvefs.so
lib/vfs/modules/libvfs-pipe.so
lib/vfs/modules/libvfs-translate.so
share/gnome/apps/Settings/nautilus-mime-type.desktop

View file

@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
gconf.8:${PORTSDIR}/devel/gconf \
gconf-1.0:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
@ -36,4 +36,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN5= gnome-vfs-mime.5
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -9,15 +9,6 @@
fi
# Check whether --enable-libefs or --disable-libefs was given.
@@ -4862,7 +4862,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -5924,7 +5924,7 @@
VFSPTHREAD_LIBDIR='-L${libdir}'
VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'

View file

@ -1,18 +1,26 @@
--- modules/Makefile.in.orig Tue Feb 22 01:45:51 2000
+++ modules/Makefile.in Wed Jun 28 16:20:34 2000
--- modules/Makefile.in.orig Wed Aug 2 13:39:35 2000
+++ modules/Makefile.in Wed Aug 2 13:48:21 2000
@@ -191,6 +191,7 @@
libftp_la_SOURCES = ftp-method.c ftp-method.h module-shared.c module-shared.h
libfile_la_SOURCES = file-method.c file-method.h
+libftp_la_LDFLAGS = $(module_flags)
### `gconf' method
libfile_la_LDFLAGS = $(module_flags)
@@ -238,7 +239,6 @@
@@ -266,14 +267,13 @@
libbzip2_la_OBJECTS = bzip2-method.lo
libgzip_la_DEPENDENCIES =
libgzip_la_OBJECTS = gzip-method.lo
-libftp_la_LDFLAGS =
libftp_la_LIBADD =
libftp_la_OBJECTS = ftp-method.lo module-shared.lo
libftp_la_OBJECTS = ftp-method.lo
libvfs_pipe_la_DEPENDENCIES =
libvfs_pipe_la_OBJECTS = pipe-method.lo
libvfs_translate_la_DEPENDENCIES =
libvfs_translate_la_OBJECTS = translate-method.lo
-libvefs_la_LDFLAGS =
+libvefs_la_LDFLAGS = $(module_flags)
@HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES =
@HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS = efs-method.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

View file

@ -82,6 +82,7 @@ lib/vfs/modules/libftp.so
lib/vfs/modules/libgconf.so
lib/vfs/modules/libgzip.so
lib/vfs/modules/libhttp.so
lib/vfs/modules/libvefs.so
lib/vfs/modules/libvfs-pipe.so
lib/vfs/modules/libvfs-translate.so
share/gnome/apps/Settings/nautilus-mime-type.desktop

View file

@ -32,4 +32,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN1= gedit.1
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -1,10 +1,5 @@
--- plugins/browse/Makefile.in.orig Sun Jun 11 03:00:15 2000
+++ plugins/browse/Makefile.in Sun Jun 11 11:15:17 2000
@@ -128,3 +128,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -138,3 +138,3 @@
LIBS = @LIBS@
-libbrowse_la_LDFLAGS =
@ -12,11 +7,6 @@
libbrowse_la_LIBADD =
--- plugins/convert/Makefile.in.orig Sun Jun 11 03:00:17 2000
+++ plugins/convert/Makefile.in Sun Jun 11 11:15:25 2000
@@ -130,3 +130,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -147,3 +147,3 @@
LIBS = @LIBS@
-libconvert_la_LDFLAGS =
@ -24,11 +14,6 @@
libconvert_la_LIBADD =
--- plugins/diff/Makefile.in.orig Sun Jul 9 17:12:13 2000
+++ plugins/diff/Makefile.in Mon Jul 10 09:32:42 2000
@@ -128,3 +128,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -144,3 +144,3 @@
LIBS = @LIBS@
-libdiff_la_LDFLAGS =
@ -36,11 +21,6 @@
libdiff_la_LIBADD =
--- plugins/email/Makefile.in.orig Sun Jun 11 03:00:16 2000
+++ plugins/email/Makefile.in Sun Jun 11 11:15:33 2000
@@ -130,3 +130,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -147,3 +147,3 @@
LIBS = @LIBS@
-libemail_la_LDFLAGS =
@ -48,11 +28,6 @@
libemail_la_LIBADD =
--- plugins/reverse/Makefile.in.orig Sun Jun 11 03:00:18 2000
+++ plugins/reverse/Makefile.in Sun Jun 11 11:15:40 2000
@@ -130,3 +130,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -140,3 +140,3 @@
LIBS = @LIBS@
-libreverse_la_LDFLAGS =
@ -60,11 +35,6 @@
libreverse_la_LIBADD =
--- plugins/sample/Makefile.in.orig Sun Jul 9 17:12:15 2000
+++ plugins/sample/Makefile.in Mon Jul 10 09:33:18 2000
@@ -130,3 +130,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -140,3 +140,3 @@
LIBS = @LIBS@
-libsample_la_LDFLAGS =
@ -72,11 +42,6 @@
libsample_la_LIBADD =
--- plugins/shell_output/Makefile.in.orig Sun Jul 9 17:12:19 2000
+++ plugins/shell_output/Makefile.in Mon Jul 10 09:38:40 2000
@@ -130,3 +130,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -147,3 +147,3 @@
LIBS = @LIBS@
-libshell_output_la_LDFLAGS =
@ -84,11 +49,6 @@
libshell_output_la_LIBADD =
--- plugins/time/Makefile.in.orig Sun Jul 9 17:12:16 2000
+++ plugins/time/Makefile.in Mon Jul 10 09:33:38 2000
@@ -130,3 +130,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -140,3 +140,3 @@
LIBS = @LIBS@
-libtime_la_LDFLAGS =

View file

@ -32,4 +32,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN1= gedit.1
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -1,10 +1,5 @@
--- plugins/browse/Makefile.in.orig Sun Jun 11 03:00:15 2000
+++ plugins/browse/Makefile.in Sun Jun 11 11:15:17 2000
@@ -128,3 +128,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -138,3 +138,3 @@
LIBS = @LIBS@
-libbrowse_la_LDFLAGS =
@ -12,11 +7,6 @@
libbrowse_la_LIBADD =
--- plugins/convert/Makefile.in.orig Sun Jun 11 03:00:17 2000
+++ plugins/convert/Makefile.in Sun Jun 11 11:15:25 2000
@@ -130,3 +130,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -147,3 +147,3 @@
LIBS = @LIBS@
-libconvert_la_LDFLAGS =
@ -24,11 +14,6 @@
libconvert_la_LIBADD =
--- plugins/diff/Makefile.in.orig Sun Jul 9 17:12:13 2000
+++ plugins/diff/Makefile.in Mon Jul 10 09:32:42 2000
@@ -128,3 +128,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -144,3 +144,3 @@
LIBS = @LIBS@
-libdiff_la_LDFLAGS =
@ -36,11 +21,6 @@
libdiff_la_LIBADD =
--- plugins/email/Makefile.in.orig Sun Jun 11 03:00:16 2000
+++ plugins/email/Makefile.in Sun Jun 11 11:15:33 2000
@@ -130,3 +130,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -147,3 +147,3 @@
LIBS = @LIBS@
-libemail_la_LDFLAGS =
@ -48,11 +28,6 @@
libemail_la_LIBADD =
--- plugins/reverse/Makefile.in.orig Sun Jun 11 03:00:18 2000
+++ plugins/reverse/Makefile.in Sun Jun 11 11:15:40 2000
@@ -130,3 +130,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -140,3 +140,3 @@
LIBS = @LIBS@
-libreverse_la_LDFLAGS =
@ -60,11 +35,6 @@
libreverse_la_LIBADD =
--- plugins/sample/Makefile.in.orig Sun Jul 9 17:12:15 2000
+++ plugins/sample/Makefile.in Mon Jul 10 09:33:18 2000
@@ -130,3 +130,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -140,3 +140,3 @@
LIBS = @LIBS@
-libsample_la_LDFLAGS =
@ -72,11 +42,6 @@
libsample_la_LIBADD =
--- plugins/shell_output/Makefile.in.orig Sun Jul 9 17:12:19 2000
+++ plugins/shell_output/Makefile.in Mon Jul 10 09:38:40 2000
@@ -130,3 +130,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGEDIT_GLADEDIR=\""$(gladedir)"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -147,3 +147,3 @@
LIBS = @LIBS@
-libshell_output_la_LDFLAGS =
@ -84,11 +49,6 @@
libshell_output_la_LIBADD =
--- plugins/time/Makefile.in.orig Sun Jul 9 17:12:16 2000
+++ plugins/time/Makefile.in Mon Jul 10 09:33:38 2000
@@ -130,3 +130,3 @@
-INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir)/src -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
@@ -140,3 +140,3 @@
LIBS = @LIBS@
-libtime_la_LDFLAGS =

View file

@ -29,4 +29,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -29,4 +29,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -25,4 +25,11 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -26,4 +26,11 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -26,4 +26,11 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -28,4 +28,11 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -30,4 +30,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib -luu"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -1,16 +1,8 @@
--- Makefile.in.orig Thu May 18 02:27:35 2000
+++ Makefile.in Tue Jun 13 17:15:02 2000
@@ -111,11 +111,11 @@
@@ -111,4 +111,4 @@
cxxflags_set = @cxxflags_set@
l = @l@
-SUBDIRS = macros po intl uulib pan docs
+SUBDIRS = macros po intl pan docs
EXTRA_DIST = CREDITS ChangeLog pan.desktop pan.spec pan.png
-Productivitydir = $(datadir)/gnome/apps/Internet
+Productivitydir = $(datadir)/apps/Internet
Productivity_DATA = pan.desktop
icon_DATA = pan.png
+SUBDIRS = macros po pan docs

View file

@ -1,29 +1,8 @@
--- pan/Makefile.in.orig Thu May 18 02:27:48 2000
+++ pan/Makefile.in Tue Jun 13 17:07:18 2000
@@ -115,7 +115,7 @@
SUBDIRS = dialogs xpm
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/uulib -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" $(GNOME_INCLUDEDIR) $(GLIB_CFLAGS) @CPPFLAGS@
+INCLUDES = -I$(top_srcdir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DLOCALEDIR=\"$(prefix)/share/locale\" $(GNOME_INCLUDEDIR) $(GLIB_CFLAGS) @CPPFLAGS@
bin_PROGRAMS = pan
@@ -123,7 +123,7 @@
pan_SOURCES = acache.c acache.h article.c article.h article-toolbar.c article-toolbar.h article-find.c article-find.h article-db.c article-db.h article-thread.c article-thread.h articlelist.c articlelist.h date.c date.h debug.c debug.h decode.c decode.h folder.c folder.h folderlist.c folderlist.h fnmatch.c fnmatch.h globals.h group.c group.h grouplist.c grouplist.h gui.c gui.h gui-notebook.c gui-notebook.h gui-paned.c gui-paned.h log.c log.h message.c message.h message-filter.c message-filter.h message-send.c message-send.h message-window.c message-window.h msort.c nntp.c nntp.h pan.c pan.h pan-callback.c pan-callback.h pan-db.c pan-db.h pan-object.c pan-object.h prefs.c prefs.h print.c print.h queue.c queue.h task.c task.h task-bodies.c task-bodies.h task-body.c task-body.h task-decode.c task-decode.h task-grouplist.c task-grouplist.h task-headers.c task-headers.h task-send.c task-send.h task-manager.c task-manager.h rfc822.c rfc822.h save.c save.h server.c server.h smtp.c smtp.h sockets.c sockets.h status-item.c status-item.h status-item-view.c status-item-view.h text.c text.h util.c util.h
@@ -126,1 +126,1 @@
-pan_LDADD = dialogs/libdialogs.a $(INTLLIBS) $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(GLIB_LIBS) $(top_builddir)/uulib/libuu.a
+pan_LDADD = dialogs/libdialogs.a $(INTLLIBS) $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(GLIB_LIBS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
@@ -144,7 +144,7 @@
task-body.o task-decode.o task-grouplist.o task-headers.o task-send.o \
task-manager.o rfc822.o save.o server.o smtp.o sockets.o status-item.o \
status-item-view.o text.o util.o
@@ -147,1 +147,1 @@
-pan_DEPENDENCIES = dialogs/libdialogs.a $(top_builddir)/uulib/libuu.a
+pan_DEPENDENCIES = dialogs/libdialogs.a
pan_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

View file

@ -30,4 +30,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib -luu"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -1,16 +1,8 @@
--- Makefile.in.orig Thu May 18 02:27:35 2000
+++ Makefile.in Tue Jun 13 17:15:02 2000
@@ -111,11 +111,11 @@
@@ -111,4 +111,4 @@
cxxflags_set = @cxxflags_set@
l = @l@
-SUBDIRS = macros po intl uulib pan docs
+SUBDIRS = macros po intl pan docs
EXTRA_DIST = CREDITS ChangeLog pan.desktop pan.spec pan.png
-Productivitydir = $(datadir)/gnome/apps/Internet
+Productivitydir = $(datadir)/apps/Internet
Productivity_DATA = pan.desktop
icon_DATA = pan.png
+SUBDIRS = macros po pan docs

View file

@ -1,29 +1,8 @@
--- pan/Makefile.in.orig Thu May 18 02:27:48 2000
+++ pan/Makefile.in Tue Jun 13 17:07:18 2000
@@ -115,7 +115,7 @@
SUBDIRS = dialogs xpm
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/uulib -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" $(GNOME_INCLUDEDIR) $(GLIB_CFLAGS) @CPPFLAGS@
+INCLUDES = -I$(top_srcdir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DLOCALEDIR=\"$(prefix)/share/locale\" $(GNOME_INCLUDEDIR) $(GLIB_CFLAGS) @CPPFLAGS@
bin_PROGRAMS = pan
@@ -123,7 +123,7 @@
pan_SOURCES = acache.c acache.h article.c article.h article-toolbar.c article-toolbar.h article-find.c article-find.h article-db.c article-db.h article-thread.c article-thread.h articlelist.c articlelist.h date.c date.h debug.c debug.h decode.c decode.h folder.c folder.h folderlist.c folderlist.h fnmatch.c fnmatch.h globals.h group.c group.h grouplist.c grouplist.h gui.c gui.h gui-notebook.c gui-notebook.h gui-paned.c gui-paned.h log.c log.h message.c message.h message-filter.c message-filter.h message-send.c message-send.h message-window.c message-window.h msort.c nntp.c nntp.h pan.c pan.h pan-callback.c pan-callback.h pan-db.c pan-db.h pan-object.c pan-object.h prefs.c prefs.h print.c print.h queue.c queue.h task.c task.h task-bodies.c task-bodies.h task-body.c task-body.h task-decode.c task-decode.h task-grouplist.c task-grouplist.h task-headers.c task-headers.h task-send.c task-send.h task-manager.c task-manager.h rfc822.c rfc822.h save.c save.h server.c server.h smtp.c smtp.h sockets.c sockets.h status-item.c status-item.h status-item-view.c status-item-view.h text.c text.h util.c util.h
@@ -126,1 +126,1 @@
-pan_LDADD = dialogs/libdialogs.a $(INTLLIBS) $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(GLIB_LIBS) $(top_builddir)/uulib/libuu.a
+pan_LDADD = dialogs/libdialogs.a $(INTLLIBS) $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(GLIB_LIBS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
@@ -144,7 +144,7 @@
task-body.o task-decode.o task-grouplist.o task-headers.o task-send.o \
task-manager.o rfc822.o save.o server.o smtp.o sockets.o status-item.o \
status-item-view.o text.o util.o
@@ -147,1 +147,1 @@
-pan_DEPENDENCIES = dialogs/libdialogs.a $(top_builddir)/uulib/libuu.a
+pan_DEPENDENCIES = dialogs/libdialogs.a
pan_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

View file

@ -31,4 +31,11 @@ CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -1,14 +1,5 @@
--- mal-conduit/src/Makefile.in.orig Wed May 10 01:26:11 2000
+++ mal-conduit/src/Makefile.in Tue May 16 17:07:16 2000
@@ -147,7 +147,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = mal-conduit-control-applet.desktop
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
panelConduits_DATA = $(ccenterConduits_DATA)
Conduitsdir = $(datadir)/gnome-pilot/conduits/
@@ -168,7 +168,7 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@

View file

@ -35,4 +35,11 @@ CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -22,24 +22,6 @@
else
@@ -2676,7 +2676,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- PTHREAD_LIB="-lc_r"
+ PTHREAD_LIB=""
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
@@ -4591,7 +4591,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -5915,8 +5915,8 @@
fi

View file

@ -1,14 +1,5 @@
--- conduits/backup/Makefile.in.orig Wed May 10 00:03:11 2000
+++ conduits/backup/Makefile.in Tue May 16 16:47:08 2000
@@ -176,7 +176,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = backup-conduit-control-applet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -192,7 +192,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -20,15 +11,6 @@
PROGRAMS = $(bin_PROGRAMS)
--- conduits/email/Makefile.in.orig Wed May 10 00:03:11 2000
+++ conduits/email/Makefile.in Tue May 16 16:47:11 2000
@@ -176,7 +176,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = email-conduit-control-applet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -192,7 +192,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -40,15 +22,6 @@
PROGRAMS = $(bin_PROGRAMS)
--- conduits/expense/Makefile.in.orig Wed May 10 00:03:13 2000
+++ conduits/expense/Makefile.in Tue May 16 16:47:14 2000
@@ -176,7 +176,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = expense-conduit-control-applet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -192,7 +192,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -60,15 +33,6 @@
PROGRAMS = $(bin_PROGRAMS)
--- conduits/file/Makefile.in.orig Wed May 10 00:03:10 2000
+++ conduits/file/Makefile.in Tue May 16 16:47:17 2000
@@ -181,7 +181,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = file-conduit-control-applet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -202,7 +202,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -80,15 +44,6 @@
PROGRAMS = $(bin_PROGRAMS)
--- conduits/memo_file/Makefile.in.orig Wed May 10 00:03:12 2000
+++ conduits/memo_file/Makefile.in Tue May 16 16:47:20 2000
@@ -176,7 +176,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = memo_file_capplet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -192,7 +192,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..

View file

@ -31,4 +31,11 @@ CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -1,14 +1,5 @@
--- mal-conduit/src/Makefile.in.orig Wed May 10 01:26:11 2000
+++ mal-conduit/src/Makefile.in Tue May 16 17:07:16 2000
@@ -147,7 +147,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = mal-conduit-control-applet.desktop
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
panelConduits_DATA = $(ccenterConduits_DATA)
Conduitsdir = $(datadir)/gnome-pilot/conduits/
@@ -168,7 +168,7 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@

View file

@ -31,4 +31,11 @@ CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -1,14 +1,5 @@
--- mal-conduit/src/Makefile.in.orig Wed May 10 01:26:11 2000
+++ mal-conduit/src/Makefile.in Tue May 16 17:07:16 2000
@@ -147,7 +147,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = mal-conduit-control-applet.desktop
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
panelConduits_DATA = $(ccenterConduits_DATA)
Conduitsdir = $(datadir)/gnome-pilot/conduits/
@@ -168,7 +168,7 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@

View file

@ -35,4 +35,11 @@ CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -22,24 +22,6 @@
else
@@ -2676,7 +2676,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- PTHREAD_LIB="-lc_r"
+ PTHREAD_LIB=""
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
@@ -4591,7 +4591,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -5915,8 +5915,8 @@
fi

View file

@ -1,14 +1,5 @@
--- conduits/backup/Makefile.in.orig Wed May 10 00:03:11 2000
+++ conduits/backup/Makefile.in Tue May 16 16:47:08 2000
@@ -176,7 +176,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = backup-conduit-control-applet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -192,7 +192,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -20,15 +11,6 @@
PROGRAMS = $(bin_PROGRAMS)
--- conduits/email/Makefile.in.orig Wed May 10 00:03:11 2000
+++ conduits/email/Makefile.in Tue May 16 16:47:11 2000
@@ -176,7 +176,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = email-conduit-control-applet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -192,7 +192,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -40,15 +22,6 @@
PROGRAMS = $(bin_PROGRAMS)
--- conduits/expense/Makefile.in.orig Wed May 10 00:03:13 2000
+++ conduits/expense/Makefile.in Tue May 16 16:47:14 2000
@@ -176,7 +176,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = expense-conduit-control-applet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -192,7 +192,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -60,15 +33,6 @@
PROGRAMS = $(bin_PROGRAMS)
--- conduits/file/Makefile.in.orig Wed May 10 00:03:10 2000
+++ conduits/file/Makefile.in Tue May 16 16:47:17 2000
@@ -181,7 +181,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = file-conduit-control-applet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -202,7 +202,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -80,15 +44,6 @@
PROGRAMS = $(bin_PROGRAMS)
--- conduits/memo_file/Makefile.in.orig Wed May 10 00:03:12 2000
+++ conduits/memo_file/Makefile.in Tue May 16 16:47:20 2000
@@ -176,7 +176,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = memo_file_capplet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -192,7 +192,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..

View file

@ -35,4 +35,11 @@ CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -22,24 +22,6 @@
else
@@ -2676,7 +2676,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- PTHREAD_LIB="-lc_r"
+ PTHREAD_LIB=""
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
@@ -4591,7 +4591,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -5915,8 +5915,8 @@
fi

View file

@ -1,14 +1,5 @@
--- conduits/backup/Makefile.in.orig Wed May 10 00:03:11 2000
+++ conduits/backup/Makefile.in Tue May 16 16:47:08 2000
@@ -176,7 +176,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = backup-conduit-control-applet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -192,7 +192,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -20,15 +11,6 @@
PROGRAMS = $(bin_PROGRAMS)
--- conduits/email/Makefile.in.orig Wed May 10 00:03:11 2000
+++ conduits/email/Makefile.in Tue May 16 16:47:11 2000
@@ -176,7 +176,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = email-conduit-control-applet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -192,7 +192,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -40,15 +22,6 @@
PROGRAMS = $(bin_PROGRAMS)
--- conduits/expense/Makefile.in.orig Wed May 10 00:03:13 2000
+++ conduits/expense/Makefile.in Tue May 16 16:47:14 2000
@@ -176,7 +176,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = expense-conduit-control-applet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -192,7 +192,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -60,15 +33,6 @@
PROGRAMS = $(bin_PROGRAMS)
--- conduits/file/Makefile.in.orig Wed May 10 00:03:10 2000
+++ conduits/file/Makefile.in Tue May 16 16:47:17 2000
@@ -181,7 +181,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = file-conduit-control-applet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -202,7 +202,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@ -80,15 +44,6 @@
PROGRAMS = $(bin_PROGRAMS)
--- conduits/memo_file/Makefile.in.orig Wed May 10 00:03:12 2000
+++ conduits/memo_file/Makefile.in Tue May 16 16:47:20 2000
@@ -176,7 +176,7 @@
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = memo_file_capplet.desktop
-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
panel_DATA = $(ccenterConduits_DATA)
Conduitdir = $(datadir)/gnome-pilot/conduits/
@@ -192,7 +192,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..

View file

@ -15,7 +15,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
wwwzip.1:${PORTSDIR}/www/libwww \
gconf.8:${PORTSDIR}/devel/gconf
gconf-1.0:${PORTSDIR}/devel/gconf
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@ -31,4 +31,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -0,0 +1,14 @@
--- src/gtkhtml.c.orig Mon Jul 10 17:52:30 2000
+++ src/gtkhtml.c Wed Aug 2 15:38:46 2000
@@ -1130,3 +1130,3 @@
if (gconf_is_initialized ()) {
- gconf_client = gconf_client_new ();
+ gconf_client = gconf_client_get_default ();
if (!gconf_client)
--- capplet/main.c.orig Mon Jun 19 16:33:41 2000
+++ capplet/main.c Wed Aug 2 15:40:19 2000
@@ -197,3 +197,3 @@
- client = gconf_client_new ();
+ client = gconf_client_get_default ();
gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);

View file

@ -15,7 +15,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
wwwzip.1:${PORTSDIR}/www/libwww \
gconf.8:${PORTSDIR}/devel/gconf
gconf-1.0:${PORTSDIR}/devel/gconf
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@ -31,4 +31,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -0,0 +1,14 @@
--- src/gtkhtml.c.orig Mon Jul 10 17:52:30 2000
+++ src/gtkhtml.c Wed Aug 2 15:38:46 2000
@@ -1130,3 +1130,3 @@
if (gconf_is_initialized ()) {
- gconf_client = gconf_client_new ();
+ gconf_client = gconf_client_get_default ();
if (!gconf_client)
--- capplet/main.c.orig Mon Jun 19 16:33:41 2000
+++ capplet/main.c Wed Aug 2 15:40:19 2000
@@ -197,3 +197,3 @@
- client = gconf_client_new ();
+ client = gconf_client_get_default ();
gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);

View file

@ -15,7 +15,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
wwwzip.1:${PORTSDIR}/www/libwww \
gconf.8:${PORTSDIR}/devel/gconf
gconf-1.0:${PORTSDIR}/devel/gconf
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@ -31,4 +31,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -0,0 +1,14 @@
--- src/gtkhtml.c.orig Mon Jul 10 17:52:30 2000
+++ src/gtkhtml.c Wed Aug 2 15:38:46 2000
@@ -1130,3 +1130,3 @@
if (gconf_is_initialized ()) {
- gconf_client = gconf_client_new ();
+ gconf_client = gconf_client_get_default ();
if (!gconf_client)
--- capplet/main.c.orig Mon Jun 19 16:33:41 2000
+++ capplet/main.c Wed Aug 2 15:40:19 2000
@@ -197,3 +197,3 @@
- client = gconf_client_new ();
+ client = gconf_client_get_default ();
gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);

View file

@ -15,7 +15,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
wwwzip.1:${PORTSDIR}/www/libwww \
gconf.8:${PORTSDIR}/devel/gconf
gconf-1.0:${PORTSDIR}/devel/gconf
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@ -31,4 +31,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>

View file

@ -0,0 +1,14 @@
--- src/gtkhtml.c.orig Mon Jul 10 17:52:30 2000
+++ src/gtkhtml.c Wed Aug 2 15:38:46 2000
@@ -1130,3 +1130,3 @@
if (gconf_is_initialized ()) {
- gconf_client = gconf_client_new ();
+ gconf_client = gconf_client_get_default ();
if (!gconf_client)
--- capplet/main.c.orig Mon Jun 19 16:33:41 2000
+++ capplet/main.c Wed Aug 2 15:40:19 2000
@@ -197,3 +197,3 @@
- client = gconf_client_new ();
+ client = gconf_client_get_default ();
gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);

View file

@ -26,4 +26,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib" \
GTK_CONFIG="${GTK_CONFIG}"
post-extract:
@${PERL} -pi -e 's|-lpthread|-pthread|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'
.include <bsd.port.mk>