[Midnightbsd-cvs] mports: textproc/scrollkeeper: This needs some work.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Mar 18 22:12:11 EDT 2008 

Log Message:
-----------
This needs some work.

Update paths to avoid /usr/local/share/gnome crap.

Add conflicts for rarian.

Modified Files:
--------------
    mports/textproc/scrollkeeper:
        Makefile (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)

Removed Files:
-------------
    mports/textproc/scrollkeeper/files:
        patch-libs_scrollkeeper.h.in
        patch-scripts_scrollkeeper-config.in

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/textproc/scrollkeeper/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L textproc/scrollkeeper/pkg-plist -L textproc/scrollkeeper/pkg-plist -u -r1.1 -r1.2
--- textproc/scrollkeeper/pkg-plist
+++ textproc/scrollkeeper/pkg-plist
@@ -17,46 +17,46 @@
 lib/libscrollkeeper.la
 lib/libscrollkeeper.so
 lib/libscrollkeeper.so.0
-share/gnome/omf/scrollkeeper/writing_scrollkeeper_omf_files-C.omf
-share/gnome/scrollkeeper/Templates/C/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/am/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/az/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/be/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ca/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/cs/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/da/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/de/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/el/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/es/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/fr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/hu/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/it/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ja/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/kn/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ko/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/nl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/no/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/pl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/pt_BR/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ro/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ru/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sk/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sr at Latn/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sv/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/tr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/uk/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/vi/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/zh_CN/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/zh_TW/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/legal.xml
-share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml
-share/gnome/scrollkeeper/stylesheets/categories.xsl
-share/gnome/scrollkeeper/stylesheets/index.xsl
-share/gnome/scrollkeeper/stylesheets/toc.xsl
-share/gnome/xml/scrollkeeper/dtds/scrollkeeper-cl.dtd
-share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
+share/omf/scrollkeeper/writing_scrollkeeper_omf_files-C.omf
+share/scrollkeeper/Templates/C/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/am/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/az/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/be/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ca/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/cs/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/da/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/de/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/el/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/es/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/fr/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/hu/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/it/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ja/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/kn/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ko/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/nl/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/no/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/pl/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/pt_BR/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ro/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ru/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sl/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sk/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sr/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sr at Latn/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sv/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/tr/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/uk/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/vi/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/zh_CN/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/zh_TW/scrollkeeper_cl.xml
+share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/legal.xml
+share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml
+share/scrollkeeper/stylesheets/categories.xsl
+share/scrollkeeper/stylesheets/index.xsl
+share/scrollkeeper/stylesheets/toc.xsl
+share/xml/scrollkeeper/dtds/scrollkeeper-cl.dtd
+share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
 share/locale/am/LC_MESSAGES/scrollkeeper.mo
 share/locale/az/LC_MESSAGES/scrollkeeper.mo
 share/locale/be/LC_MESSAGES/scrollkeeper.mo
@@ -88,78 +88,50 @@
 share/locale/vi/LC_MESSAGES/scrollkeeper.mo
 share/locale/zh_CN/LC_MESSAGES/scrollkeeper.mo
 share/locale/zh_TW/LC_MESSAGES/scrollkeeper.mo
- at dirrm share/gnome/xml/scrollkeeper/dtds
- at dirrm share/gnome/xml/scrollkeeper
- at dirrm share/gnome/xml
- at dirrm share/gnome/scrollkeeper/stylesheets
- at dirrm share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C
- at dirrm share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files
- at dirrm share/gnome/scrollkeeper/doc
- at dirrm share/gnome/scrollkeeper/Templates/zh_TW
- at dirrm share/gnome/scrollkeeper/Templates/zh_CN
- at dirrm share/gnome/scrollkeeper/Templates/vi
- at dirrm share/gnome/scrollkeeper/Templates/uk
- at dirrm share/gnome/scrollkeeper/Templates/tr
- at dirrm share/gnome/scrollkeeper/Templates/sv
- at dirrm share/gnome/scrollkeeper/Templates/sr at Latn
- at dirrm share/gnome/scrollkeeper/Templates/sr
- at dirrm share/gnome/scrollkeeper/Templates/sl
- at dirrm share/gnome/scrollkeeper/Templates/sk
- at dirrm share/gnome/scrollkeeper/Templates/ru
- at dirrm share/gnome/scrollkeeper/Templates/ro
- at dirrm share/gnome/scrollkeeper/Templates/pt_BR
- at dirrm share/gnome/scrollkeeper/Templates/pl
- at dirrm share/gnome/scrollkeeper/Templates/no
- at dirrm share/gnome/scrollkeeper/Templates/nl
- at dirrm share/gnome/scrollkeeper/Templates/ko
- at dirrm share/gnome/scrollkeeper/Templates/kn
- at dirrm share/gnome/scrollkeeper/Templates/ja
- at dirrm share/gnome/scrollkeeper/Templates/it
- at dirrm share/gnome/scrollkeeper/Templates/hu
- at dirrm share/gnome/scrollkeeper/Templates/fr
- at dirrm share/gnome/scrollkeeper/Templates/es
- at dirrm share/gnome/scrollkeeper/Templates/el
- at dirrm share/gnome/scrollkeeper/Templates/de
- at dirrm share/gnome/scrollkeeper/Templates/da
- at dirrm share/gnome/scrollkeeper/Templates/cs
- at dirrm share/gnome/scrollkeeper/Templates/ca
- at dirrm share/gnome/scrollkeeper/Templates/be
- at dirrm share/gnome/scrollkeeper/Templates/az
- at dirrm share/gnome/scrollkeeper/Templates/am
- at dirrm share/gnome/scrollkeeper/Templates/C
- at dirrm share/gnome/scrollkeeper/Templates
- at dirrm share/gnome/scrollkeeper
- at dirrm share/gnome/omf/scrollkeeper
+ at dirrm share/xml/scrollkeeper/dtds
+ at dirrm share/xml/scrollkeeper
+ at dirrmtry share/xml
+ at dirrm share/scrollkeeper/stylesheets
+ at dirrm share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C
+ at dirrm share/scrollkeeper/doc/writing_scrollkeeper_omf_files
+ at dirrm share/scrollkeeper/doc
+ at dirrm share/scrollkeeper/Templates/zh_TW
+ at dirrm share/scrollkeeper/Templates/zh_CN
+ at dirrm share/scrollkeeper/Templates/vi
+ at dirrm share/scrollkeeper/Templates/uk
+ at dirrm share/scrollkeeper/Templates/tr
+ at dirrm share/scrollkeeper/Templates/sv
+ at dirrm share/scrollkeeper/Templates/sr at Latn
+ at dirrm share/scrollkeeper/Templates/sr
+ at dirrm share/scrollkeeper/Templates/sl
+ at dirrm share/scrollkeeper/Templates/sk
+ at dirrm share/scrollkeeper/Templates/ru
+ at dirrm share/scrollkeeper/Templates/ro
+ at dirrm share/scrollkeeper/Templates/pt_BR
+ at dirrm share/scrollkeeper/Templates/pl
+ at dirrm share/scrollkeeper/Templates/no
+ at dirrm share/scrollkeeper/Templates/nl
+ at dirrm share/scrollkeeper/Templates/ko
+ at dirrm share/scrollkeeper/Templates/kn
+ at dirrm share/scrollkeeper/Templates/ja
+ at dirrm share/scrollkeeper/Templates/it
+ at dirrm share/scrollkeeper/Templates/hu
+ at dirrm share/scrollkeeper/Templates/fr
+ at dirrm share/scrollkeeper/Templates/es
+ at dirrm share/scrollkeeper/Templates/el
+ at dirrm share/scrollkeeper/Templates/de
+ at dirrm share/scrollkeeper/Templates/da
+ at dirrm share/scrollkeeper/Templates/cs
+ at dirrm share/scrollkeeper/Templates/ca
+ at dirrm share/scrollkeeper/Templates/be
+ at dirrm share/scrollkeeper/Templates/az
+ at dirrm share/scrollkeeper/Templates/am
+ at dirrm share/scrollkeeper/Templates/C
+ at dirrm share/scrollkeeper/Templates
+ at dirrm share/scrollkeeper
+ at dirrm share/omf/scrollkeeper
 @unexec rm -f /var/log/scrollkeeper.log 2>/dev/null || true
 @unexec rm -rf /var/db/scrollkeeper 2>/dev/null || true
- at unexec %%LOCALBASE%%/bin/xmlcatalog --noout --del %D/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd %%LOCALBASE%%/share/xml/catalog.ports || true
+ at unexec %%LOCALBASE%%/bin/xmlcatalog --noout --del %D/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd %%LOCALBASE%%/share/xml/catalog.ports || true
 @exec touch -f /var/log/scrollkeeper.log
 @exec mkdir -p /var/db/scrollkeeper
- at dirrmtry share/locale/zh_TW/LC_MESSAGES
- at dirrmtry share/locale/zh_TW
- at dirrmtry share/locale/zh_CN/LC_MESSAGES
- at dirrmtry share/locale/zh_CN
- at dirrmtry share/locale/uk/LC_MESSAGES
- at dirrmtry share/locale/uk
- at dirrmtry share/locale/sr/LC_MESSAGES
- at dirrmtry share/locale/sr
- at dirrmtry share/locale/sl/LC_MESSAGES
- at dirrmtry share/locale/sl
- at dirrmtry share/locale/sk/LC_MESSAGES
- at dirrmtry share/locale/sk
- at dirrmtry share/locale/ro/LC_MESSAGES
- at dirrmtry share/locale/ro
- at dirrmtry share/locale/pl/LC_MESSAGES
- at dirrmtry share/locale/pl
- at dirrmtry share/locale/no/LC_MESSAGES
- at dirrmtry share/locale/no
- at dirrmtry share/locale/ko/LC_MESSAGES
- at dirrmtry share/locale/ko
- at dirrmtry share/locale/el/LC_MESSAGES
- at dirrmtry share/locale/el
- at dirrmtry share/locale/cs/LC_MESSAGES
- at dirrmtry share/locale/cs
- at dirrmtry share/locale/ca/LC_MESSAGES
- at dirrmtry share/locale/ca
- at dirrmtry share/locale/be/LC_MESSAGES
- at dirrmtry share/locale/be
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/textproc/scrollkeeper/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L textproc/scrollkeeper/Makefile -L textproc/scrollkeeper/Makefile -u -r1.1 -r1.2
--- textproc/scrollkeeper/Makefile
+++ textproc/scrollkeeper/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	scrollkeeper
 PORTVERSION=	0.3.14
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -27,17 +27,19 @@
     		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
     		${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk
 
+CONFLICTS=	rarian-[0-9]*
+
 DOCBOOK_VERSION=4.2
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_BISON=	yes
+USE_BISON=	build
 USE_GNOME=	gnomehack gnomehier gnometarget libxslt intlhack
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share/gnome \
-		--with-omfdirs=${PREFIX}/share/gnome/omf \
+CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share \
+		--with-omfdirs=${PREFIX}/share/omf \
 		--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl" \
--- textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/scrollkeeper.h.in.orig	Mon Jun  3 14:00:51 2002
-+++ libs/scrollkeeper.h.in	Mon Jun  3 14:01:11 2002
-@@ -32,7 +32,7 @@
- #define SCROLLKEEPERLOCALEDIR "/usr/X11R6/share/locale"
- #define SCROLLKEEPERLOGFILE "@localstatedir@/log/scrollkeeper.log"
- #define SCROLLKEEPERLOGFILE_ROT "@localstatedir@/log/scrollkeeper.log.1"
--#define SCROLLKEEPER_OMF_DTD "@prefix@/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
-+#define SCROLLKEEPER_OMF_DTD "@prefix@/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
- #define PATHLEN		256
- 
- /*
--- textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/scrollkeeper-config.in.orig	Thu Mar 21 00:08:51 2002
-+++ scripts/scrollkeeper-config.in	Sat May 25 23:59:53 2002
-@@ -4,7 +4,7 @@
- localstatedir=@localstatedir@
- partial_db_dir=@SCROLLKEEPER_PARTIAL_DB_DIR@
- pkglocalstatedir=${localstatedir}/${partial_db_dir}
--pkgdatadir=${prefix}/share/scrollkeeper
-+pkgdatadir=${prefix}/share/gnome/scrollkeeper
- datadir=@datadir@
- 
- usage()

More information about the Midnightbsd-cvs mailing list