diff options
author | Ade Lovett <ade@FreeBSD.org> | 2000-08-04 01:19:21 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2000-08-04 01:19:21 +0000 |
commit | 38ae599271006aa4aa581f0b03a8a5014fcf143d (patch) | |
tree | 1a1f5120bedb0bac581913ebf46122f0c3c9a656 /print | |
parent | Update to 2.2.1 (diff) |
Extensive patchfile cleanups using sobomax's wonderful
post-extract rule
Notes
Notes:
svn path=/head/; revision=31287
Diffstat (limited to 'print')
-rw-r--r-- | print/ggv/Makefile | 7 | ||||
-rw-r--r-- | print/ggv/files/patch-aa | 9 | ||||
-rw-r--r-- | print/ggv/pkg-plist | 5 | ||||
-rw-r--r-- | print/ggv2/Makefile | 7 | ||||
-rw-r--r-- | print/ggv2/files/patch-aa | 9 | ||||
-rw-r--r-- | print/ggv2/pkg-plist | 5 | ||||
-rw-r--r-- | print/gnome-print/Makefile | 10 | ||||
-rw-r--r-- | print/gnomeprint/Makefile | 10 | ||||
-rw-r--r-- | print/libgnomeprint/Makefile | 10 |
9 files changed, 48 insertions, 24 deletions
diff --git a/print/ggv/Makefile b/print/ggv/Makefile index a220cfcd4a3b..5c42dd93149a 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -25,4 +25,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> diff --git a/print/ggv/files/patch-aa b/print/ggv/files/patch-aa index 3e3c19626d28..93e94800cdea 100644 --- a/print/ggv/files/patch-aa +++ b/print/ggv/files/patch-aa @@ -1,14 +1,5 @@ --- configure.orig Sat Apr 17 04:25:20 1999 +++ configure Sat May 22 21:58:31 1999 -@@ -2083,7 +2083,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 @@ -4165,15 +4165,15 @@ fi diff --git a/print/ggv/pkg-plist b/print/ggv/pkg-plist index 2108e0df3fd6..293f0cd6982d 100644 --- a/print/ggv/pkg-plist +++ b/print/ggv/pkg-plist @@ -1,6 +1,8 @@ bin/ggv etc/CORBA/servers/application-ps.gnorba share/gnome/apps/Graphics/ggv.desktop +share/gnome/help/ggv/C/topic.dat +share/gnome/help/ggv/it/topic.dat share/gnome/pixmaps/ggv-splash.png share/gnome/pixmaps/gnome-ghostview.png share/locale/ca/LC_MESSAGES/ggv.mo @@ -28,3 +30,6 @@ share/locale/sl/LC_MESSAGES/ggv.mo share/locale/sv/LC_MESSAGES/ggv.mo share/locale/tr/LC_MESSAGES/ggv.mo share/locale/uk/LC_MESSAGES/ggv.mo +@dirrm share/gnome/help/ggv/it +@dirrm share/gnome/help/ggv/C +@dirrm share/gnome/help/ggv diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile index a220cfcd4a3b..5c42dd93149a 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -25,4 +25,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> diff --git a/print/ggv2/files/patch-aa b/print/ggv2/files/patch-aa index 3e3c19626d28..93e94800cdea 100644 --- a/print/ggv2/files/patch-aa +++ b/print/ggv2/files/patch-aa @@ -1,14 +1,5 @@ --- configure.orig Sat Apr 17 04:25:20 1999 +++ configure Sat May 22 21:58:31 1999 -@@ -2083,7 +2083,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 @@ -4165,15 +4165,15 @@ fi diff --git a/print/ggv2/pkg-plist b/print/ggv2/pkg-plist index 2108e0df3fd6..293f0cd6982d 100644 --- a/print/ggv2/pkg-plist +++ b/print/ggv2/pkg-plist @@ -1,6 +1,8 @@ bin/ggv etc/CORBA/servers/application-ps.gnorba share/gnome/apps/Graphics/ggv.desktop +share/gnome/help/ggv/C/topic.dat +share/gnome/help/ggv/it/topic.dat share/gnome/pixmaps/ggv-splash.png share/gnome/pixmaps/gnome-ghostview.png share/locale/ca/LC_MESSAGES/ggv.mo @@ -28,3 +30,6 @@ share/locale/sl/LC_MESSAGES/ggv.mo share/locale/sv/LC_MESSAGES/ggv.mo share/locale/tr/LC_MESSAGES/ggv.mo share/locale/uk/LC_MESSAGES/ggv.mo +@dirrm share/gnome/help/ggv/it +@dirrm share/gnome/help/ggv/C +@dirrm share/gnome/help/ggv diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index 463d35f314ea..ea3eae7f3a1f 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -26,10 +26,16 @@ USE_PERL5= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome 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> diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile index 463d35f314ea..ea3eae7f3a1f 100644 --- a/print/gnomeprint/Makefile +++ b/print/gnomeprint/Makefile @@ -26,10 +26,16 @@ USE_PERL5= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome 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> diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 463d35f314ea..ea3eae7f3a1f 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -26,10 +26,16 @@ USE_PERL5= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome 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> |