aboutsummaryrefslogtreecommitdiffstats
path: root/deskutils/gnome-pim
diff options
context:
space:
mode:
authorade <ade@FreeBSD.org>2000-08-04 09:19:21 +0800
committerade <ade@FreeBSD.org>2000-08-04 09:19:21 +0800
commitf710791a75a1a897078bc67c9d8d237aa98f6e36 (patch)
tree9678346bea3d4ebce203fa7ff52257077ed4ac10 /deskutils/gnome-pim
parentcb57a6c30e8edc7db27081f1e42de38911b80a8c (diff)
downloadfreebsd-ports-graphics-f710791a75a1a897078bc67c9d8d237aa98f6e36.tar.gz
freebsd-ports-graphics-f710791a75a1a897078bc67c9d8d237aa98f6e36.tar.zst
freebsd-ports-graphics-f710791a75a1a897078bc67c9d8d237aa98f6e36.zip
Extensive patchfile cleanups using sobomax's wonderful
post-extract rule
Diffstat (limited to 'deskutils/gnome-pim')
-rw-r--r--deskutils/gnome-pim/Makefile7
-rw-r--r--deskutils/gnome-pim/files/patch-ab70
2 files changed, 11 insertions, 66 deletions
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 97587191e04..cafdfe23a1a 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -41,6 +41,13 @@ pre-extract:
@${ECHO} "You can add gnomepilot support by defining WITH_GNOMEPILOT"
.endif
+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'
+
.if defined(WITH_GNOMEPILOT)
post-install:
@${CAT} ${PKGDIR}/PLIST.pilot >> ${TMPPLIST}
diff --git a/deskutils/gnome-pim/files/patch-ab b/deskutils/gnome-pim/files/patch-ab
index a90fec35121..a64463dc909 100644
--- a/deskutils/gnome-pim/files/patch-ab
+++ b/deskutils/gnome-pim/files/patch-ab
@@ -1,79 +1,17 @@
--- gncal/Makefile.in.orig Sat May 20 20:52:50 2000
-+++ gncal/Makefile.in Fri Jun 2 12:41:34 2000
-@@ -141,12 +141,12 @@
- gnorbadir = $(sysconfdir)/CORBA/servers
- gnorba_DATA = gnomecal.gnorba
++++ gncal/Makefile.in Wed Aug 2 10:27:30 2000
+@@ -143,3 +143,3 @@
--help_base = $(datadir)/gnome/help/cal
+-help_base = $(datadir)/help/cal
+help_base = $(datadir)/help/gnomecal
- @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = calendar-conduit-control-applet calendar-pilot-sync
- bin_PROGRAMS = gnomecal $(extra_pilot_bins)
-
--INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(GNOME_CONDUIT_INCLUDEDIR) $(PISOCK_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(GNOME_CONDUIT_INCLUDEDIR) $(PISOCK_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
-
-
- GNOMECAL_CORBA_GENERATED = GnomeCal.h GnomeCal.c GnomeCal-common.c GnomeCal-skels.c GnomeCal-stubs.c
-@@ -172,7 +172,7 @@
- libcalendar_conduit_la_SOURCES = GnomeCal-common.c GnomeCal-stubs.c calendar-conduit.c calobj.c alarm.c calendar.c timeutil.c
-
+@@ -174,3 +174,3 @@
-libcalendar_conduit_la_LDFLAGS = -rpath $(libdir)
+libcalendar_conduit_la_LDFLAGS = -rpath $(libdir) -avoid-version
-
- libcalendar_conduit_la_LIBADD = ../libversit/libversit.la $(PISOCK_LIBDIR) $(PISOCK_LIBS) $(GNOME_LIBDIR) $(GNOME_LIBS)
-@@ -221,7 +221,7 @@
- @HAVE_GNOME_PILOT_TRUE@ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = calendar-conduit-control-applet.desktop
-
--@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
- @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
-
- @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/
-@@ -233,7 +233,7 @@
- appicondir = $(datadir)/pixmaps
- appicon_DATA = gnome-calendar-conduit.png
-
--Productivitydir = $(datadir)/gnome/apps/Applications
-+Productivitydir = $(datadir)/apps/Applications
-
- Productivity_DATA = gncal.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- gnomecard/Makefile.in.orig Sat May 20 20:52:58 2000
+++ gnomecard/Makefile.in Fri Jun 2 12:42:28 2000
-@@ -135,9 +135,9 @@
-
- nSUBDIRS = help
-
--xpmhelp_base = $(datadir)/gnome/help/cal
-+xpmhelp_base = $(datadir)/help/cal
-
--INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(PISOCK_INCLUDEDIR) -I../../gcalendar
-+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(PISOCK_INCLUDEDIR) -I../../gcalendar
-
-
- @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = address-conduit-capplet
-@@ -183,7 +183,7 @@
-
- @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = address-conduit-capplet.desktop
-
--@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
- @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
-
- @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/
-@@ -192,7 +192,7 @@
- EXTRA_DIST = addr.xpm addrtool.xpm cardedit.xpm cardnew.xpm cardfind.xpm email.xpm expl.xpm first.xpm geo.xpm ident.xpm last.xpm org.xpm sec.xpm tel.xpm teltool.xpm phone.xpm world.xpm gnome-card.xpm gnomecard.desktop address-conduit-capplet.desktop gnomecard.conduit gnome-gnomecard.png gnomecard.gnorba ChangeLog BUGS
-
-
--Productivitydir = $(datadir)/gnome/apps/Applications
-+Productivitydir = $(datadir)/apps/Applications
-
- Productivity_DATA = gnomecard.desktop
-
@@ -206,7 +206,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I..