diff options
author | Ade Lovett <ade@FreeBSD.org> | 2000-08-04 01:34:38 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2000-08-04 01:34:38 +0000 |
commit | 9594f3f8939f5178057c6a588135f0bab6d52511 (patch) | |
tree | 923d26a5ec2be934317cf261a38183917c93fe7a /palm/gnomepilot2 | |
parent | gaspell needs textproc/aspell to build, as well as run (diff) |
Extensive patchfile cleanups using sobomax's wonderful
post-extract rule
Notes
Notes:
svn path=/head/; revision=31296
Diffstat (limited to 'palm/gnomepilot2')
-rw-r--r-- | palm/gnomepilot2/Makefile | 7 | ||||
-rw-r--r-- | palm/gnomepilot2/files/patch-aa | 18 | ||||
-rw-r--r-- | palm/gnomepilot2/files/patch-ai | 45 |
3 files changed, 7 insertions, 63 deletions
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile index 15d84b4cd5ab..7ab9f2b77cfa 100644 --- a/palm/gnomepilot2/Makefile +++ b/palm/gnomepilot2/Makefile @@ -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> diff --git a/palm/gnomepilot2/files/patch-aa b/palm/gnomepilot2/files/patch-aa index ac2b97677a29..4f02722e0dea 100644 --- a/palm/gnomepilot2/files/patch-aa +++ b/palm/gnomepilot2/files/patch-aa @@ -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 diff --git a/palm/gnomepilot2/files/patch-ai b/palm/gnomepilot2/files/patch-ai index 542aa22a4842..541117e39c51 100644 --- a/palm/gnomepilot2/files/patch-ai +++ b/palm/gnomepilot2/files/patch-ai @@ -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../.. |