kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Update to 2.0.7

Browse source 
* Do not install GNOME files into the wrong location
* Protect more files behind GNOME_ENABLED that rely on the GNOME
  heirarchy
This commit is contained in:
Joe Marcus Clarke 2004-05-20 05:53:54 +00:00
parent e3b4db20e0
commit 2ebbc9b6d9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=109545
12 changed files with 78 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editors/AbiWord2/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= AbiWord2
PORTVERSION= 2.0.6
PORTVERSION= 2.0.7
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@ -97,11 +97,11 @@ pre-configure:
s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
post-install:
.if defined(GNOME_ENABLED)
@${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \
${PREFIX}/share/gnome/apps/Applications/abiword.desktop
@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/icons/abiword_48.png \
${PREFIX}/share/gnome/pixmaps/abiword_48.png
.if defined(GNOME_ENABLED)
@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/GNOME_AbiWord_Control_2_0.server\
${PREFIX}/libdata/bonobo/servers/GNOME_AbiWord_Control_2_0.server
@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/abi-nautilus-view-file.xml \

4
editors/AbiWord2/distinfo
View file

@ -1,2 +1,2 @@
MD5 (AbiWord/abiword-2.0.6.tar.bz2) = 80379d6a61ec0faad0665e9b83f47e62
SIZE (AbiWord/abiword-2.0.6.tar.bz2) = 21994261
MD5 (AbiWord/abiword-2.0.7.tar.bz2) = bb1de0c969f1b93280ff7e661efb1025
SIZE (AbiWord/abiword-2.0.7.tar.bz2) = 22012687

24
editors/AbiWord2/files/patch-GNUmakefile.am
View file

@ -1,6 +1,22 @@
--- GNUmakefile.am.orig Mon Aug 18 09:45:27 2003
+++ GNUmakefile.am Mon Aug 25 04:25:53 2003
@@ -76,7 +76,6 @@
--- GNUmakefile.am.orig Fri Sep 12 09:18:10 2003
+++ GNUmakefile.am Thu May 20 01:35:58 2004
@@ -7,11 +7,11 @@
libpng_peerdir=@LIBPNG_PEERDIR@
libpopt_peerdir=$(top_builddir)/../popt
-desktop_DATA = abiword.desktop
-desktopdir = $(datadir)/applications
+#desktop_DATA = abiword.desktop
+#desktopdir = $(datadir)/applications
-icon_DATA = abiword_48.png
-icondir= $(datadir)/icons
+#icon_DATA = abiword_48.png
+#icondir= $(datadir)/icons
# Hack: make sure that the PEERS stuff is build first
# We can not use the all target, because on parallel builds there is no
@@ -82,7 +82,6 @@
# Install the datafiles. This is quick-and-dirty.
install-data-local:
@ -8,7 +24,7 @@
if test -d $(top_srcdir)/../abidistfiles ; then \
for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
@@ -89,11 +88,7 @@
@@ -95,11 +94,7 @@
for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \
if test -f $$file ; then \
sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \

6
editors/AbiWord2/pkg-plist
View file

@ -253,11 +253,9 @@ share/AbiSuite-2.0/templates/normal.awt-ur_PK
share/AbiSuite-2.0/templates/normal.awt-yi
share/AbiSuite-2.0/templates/normal.awt-zh_CN
share/AbiSuite-2.0/templates/normal.awt-zh_TW
share/applications/abiword.desktop
share/icons/abiword_48.png
share/gnome/apps/Applications/abiword.desktop
%%GNOME:%%share/gnome/apps/Applications/abiword.desktop
%%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
share/gnome/pixmaps/abiword_48.png
%%GNOME:%%share/gnome/pixmaps/abiword_48.png
@dirrm share/AbiSuite-2.0/templates
@dirrm share/AbiSuite-2.0/icons
@dirrm share/AbiSuite-2.0/dictionary

4
editors/abiword-devel/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= AbiWord2
PORTVERSION= 2.0.6
PORTVERSION= 2.0.7
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@ -97,11 +97,11 @@ pre-configure:
s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
post-install:
.if defined(GNOME_ENABLED)
@${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \
${PREFIX}/share/gnome/apps/Applications/abiword.desktop
@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/icons/abiword_48.png \
${PREFIX}/share/gnome/pixmaps/abiword_48.png
.if defined(GNOME_ENABLED)
@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/GNOME_AbiWord_Control_2_0.server\
${PREFIX}/libdata/bonobo/servers/GNOME_AbiWord_Control_2_0.server
@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/abi-nautilus-view-file.xml \

4
editors/abiword-devel/distinfo
View file

@ -1,2 +1,2 @@
MD5 (AbiWord/abiword-2.0.6.tar.bz2) = 80379d6a61ec0faad0665e9b83f47e62
SIZE (AbiWord/abiword-2.0.6.tar.bz2) = 21994261
MD5 (AbiWord/abiword-2.0.7.tar.bz2) = bb1de0c969f1b93280ff7e661efb1025
SIZE (AbiWord/abiword-2.0.7.tar.bz2) = 22012687

24
editors/abiword-devel/files/patch-GNUmakefile.am
View file

@ -1,6 +1,22 @@
--- GNUmakefile.am.orig Mon Aug 18 09:45:27 2003
+++ GNUmakefile.am Mon Aug 25 04:25:53 2003
@@ -76,7 +76,6 @@
--- GNUmakefile.am.orig Fri Sep 12 09:18:10 2003
+++ GNUmakefile.am Thu May 20 01:35:58 2004
@@ -7,11 +7,11 @@
libpng_peerdir=@LIBPNG_PEERDIR@
libpopt_peerdir=$(top_builddir)/../popt
-desktop_DATA = abiword.desktop
-desktopdir = $(datadir)/applications
+#desktop_DATA = abiword.desktop
+#desktopdir = $(datadir)/applications
-icon_DATA = abiword_48.png
-icondir= $(datadir)/icons
+#icon_DATA = abiword_48.png
+#icondir= $(datadir)/icons
# Hack: make sure that the PEERS stuff is build first
# We can not use the all target, because on parallel builds there is no
@@ -82,7 +82,6 @@
# Install the datafiles. This is quick-and-dirty.
install-data-local:
@ -8,7 +24,7 @@
if test -d $(top_srcdir)/../abidistfiles ; then \
for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
@@ -89,11 +88,7 @@
@@ -95,11 +94,7 @@
for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \
if test -f $$file ; then \
sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \

6
editors/abiword-devel/pkg-plist
View file

@ -253,11 +253,9 @@ share/AbiSuite-2.0/templates/normal.awt-ur_PK
share/AbiSuite-2.0/templates/normal.awt-yi
share/AbiSuite-2.0/templates/normal.awt-zh_CN
share/AbiSuite-2.0/templates/normal.awt-zh_TW
share/applications/abiword.desktop
share/icons/abiword_48.png
share/gnome/apps/Applications/abiword.desktop
%%GNOME:%%share/gnome/apps/Applications/abiword.desktop
%%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
share/gnome/pixmaps/abiword_48.png
%%GNOME:%%share/gnome/pixmaps/abiword_48.png
@dirrm share/AbiSuite-2.0/templates
@dirrm share/AbiSuite-2.0/icons
@dirrm share/AbiSuite-2.0/dictionary

4
editors/abiword/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= AbiWord2
PORTVERSION= 2.0.6
PORTVERSION= 2.0.7
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@ -97,11 +97,11 @@ pre-configure:
s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
post-install:
.if defined(GNOME_ENABLED)
@${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \
${PREFIX}/share/gnome/apps/Applications/abiword.desktop
@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/icons/abiword_48.png \
${PREFIX}/share/gnome/pixmaps/abiword_48.png
.if defined(GNOME_ENABLED)
@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/GNOME_AbiWord_Control_2_0.server\
${PREFIX}/libdata/bonobo/servers/GNOME_AbiWord_Control_2_0.server
@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/abi-nautilus-view-file.xml \

4
editors/abiword/distinfo
View file

@ -1,2 +1,2 @@
MD5 (AbiWord/abiword-2.0.6.tar.bz2) = 80379d6a61ec0faad0665e9b83f47e62
SIZE (AbiWord/abiword-2.0.6.tar.bz2) = 21994261
MD5 (AbiWord/abiword-2.0.7.tar.bz2) = bb1de0c969f1b93280ff7e661efb1025
SIZE (AbiWord/abiword-2.0.7.tar.bz2) = 22012687

24
editors/abiword/files/patch-GNUmakefile.am
View file

@ -1,6 +1,22 @@
--- GNUmakefile.am.orig Mon Aug 18 09:45:27 2003
+++ GNUmakefile.am Mon Aug 25 04:25:53 2003
@@ -76,7 +76,6 @@
--- GNUmakefile.am.orig Fri Sep 12 09:18:10 2003
+++ GNUmakefile.am Thu May 20 01:35:58 2004
@@ -7,11 +7,11 @@
libpng_peerdir=@LIBPNG_PEERDIR@
libpopt_peerdir=$(top_builddir)/../popt
-desktop_DATA = abiword.desktop
-desktopdir = $(datadir)/applications
+#desktop_DATA = abiword.desktop
+#desktopdir = $(datadir)/applications
-icon_DATA = abiword_48.png
-icondir= $(datadir)/icons
+#icon_DATA = abiword_48.png
+#icondir= $(datadir)/icons
# Hack: make sure that the PEERS stuff is build first
# We can not use the all target, because on parallel builds there is no
@@ -82,7 +82,6 @@
# Install the datafiles. This is quick-and-dirty.
install-data-local:
@ -8,7 +24,7 @@
if test -d $(top_srcdir)/../abidistfiles ; then \
for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
@@ -89,11 +88,7 @@
@@ -95,11 +94,7 @@
for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \
if test -f $$file ; then \
sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \

6
editors/abiword/pkg-plist
View file

@ -253,11 +253,9 @@ share/AbiSuite-2.0/templates/normal.awt-ur_PK
share/AbiSuite-2.0/templates/normal.awt-yi
share/AbiSuite-2.0/templates/normal.awt-zh_CN
share/AbiSuite-2.0/templates/normal.awt-zh_TW
share/applications/abiword.desktop
share/icons/abiword_48.png
share/gnome/apps/Applications/abiword.desktop
%%GNOME:%%share/gnome/apps/Applications/abiword.desktop
%%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
share/gnome/pixmaps/abiword_48.png
%%GNOME:%%share/gnome/pixmaps/abiword_48.png
@dirrm share/AbiSuite-2.0/templates
@dirrm share/AbiSuite-2.0/icons
@dirrm share/AbiSuite-2.0/dictionary