[Midnightbsd-cvs] mports [18394] fix scrollkeeper build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Mar 27 19:52:04 EDT 2015 

Revision: 18394
          http://svnweb.midnightbsd.org/mports/?rev=18394
Author:   laffer1
Date:     2015-03-27 19:52:04 -0400 (Fri, 27 Mar 2015)
Log Message:
-----------
fix scrollkeeper build

Modified Paths:
--------------
    trunk/textproc/scrollkeeper/Makefile
    trunk/textproc/scrollkeeper/files/patch-libs_database.c
    trunk/textproc/scrollkeeper/pkg-install
    trunk/textproc/scrollkeeper/pkg-plist

Property Changed:
----------------
    trunk/textproc/scrollkeeper/files/patch-Makefile.in
    trunk/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in
    trunk/textproc/scrollkeeper/files/patch-libs_database.c
    trunk/textproc/scrollkeeper/files/patch-libs_i18n.c
    trunk/textproc/scrollkeeper/files/patch-libs_install.c
    trunk/textproc/scrollkeeper/pkg-descr
    trunk/textproc/scrollkeeper/pkg-install

Modified: trunk/textproc/scrollkeeper/Makefile
===================================================================
--- trunk/textproc/scrollkeeper/Makefile	2015-03-27 23:50:04 UTC (rev 18393)
+++ trunk/textproc/scrollkeeper/Makefile	2015-03-27 23:52:04 UTC (rev 18394)
@@ -1,14 +1,8 @@
-# New ports collection makefile for:	scrollkeeper
-# Date created:				6 April 2001
-# Whom:					Rene Hexel <rh at netbsd.org>
-#
 # $MidnightBSD$
-# $FreeBSD: ports/textproc/scrollkeeper/Makefile,v 1.54 2007/03/19 05:13:47 marcus Exp $
-#    $MCom: ports/textproc/scrollkeeper/Makefile,v 1.7 2007/02/20 20:26:47 marcus Exp $
 
 PORTNAME=	scrollkeeper
 PORTVERSION=	0.3.14
-PORTREVISION=	11
+PORTREVISION=	12
 PORTEPOCH=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	GNOME
@@ -15,45 +9,32 @@
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	An Open Document Cataloging Project
+COMMENT=	Open Document Cataloging Project
 LICENSE=        lgpl
 
 BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		${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
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 RUN_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-    		${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
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 
-CONFLICTS=	rarian-[0-9]*
-
 DOCBOOK_VERSION=4.2
 
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool
-USE_BISON=	build
-USE_GNOME=	gnomehack gnomehier libxslt intlhack
+CONFLICTS_INSTALL=	rarian-[0-9]*
+
+USES=		bison pathfix gettext gmake tar:bzip2 libtool
+USE_GNOME=	libxslt intlhack
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share \
 		--with-omfdirs=${PREFIX}/share/omf \
 		--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl" \
-		LOCALBASE="${LOCALBASE}"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lintl
 PLIST_SUB=	LOCALBASE=${LOCALBASE}
+INSTALL_TARGET=	install-strip
 
-MAN1=	scrollkeeper-config.1 scrollkeeper-gen-seriesid.1
-MAN5=	scrollkeeper.conf.5
-MAN7=	scrollkeeper.7
-MAN8=	scrollkeeper-preinstall.8 scrollkeeper-rebuilddb.8 \
-	scrollkeeper-update.8
-
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e   \
 		's|[(]LN_S[)] -f -n|(LN_S) -f|g'
@@ -62,4 +43,7 @@
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/extract/dtds/Makefile.in
 
-.include <bsd.port.post.mk>
+post-install:
+	@${RM} ${STAGEDIR}/var/log/scrollkeeper.log
+
+.include <bsd.port.mk>

Index: trunk/textproc/scrollkeeper/files/patch-Makefile.in
===================================================================
--- trunk/textproc/scrollkeeper/files/patch-Makefile.in	2015-03-27 23:50:04 UTC (rev 18393)
+++ trunk/textproc/scrollkeeper/files/patch-Makefile.in	2015-03-27 23:52:04 UTC (rev 18394)

Property changes on: trunk/textproc/scrollkeeper/files/patch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in
===================================================================
--- trunk/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in	2015-03-27 23:50:04 UTC (rev 18393)
+++ trunk/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in	2015-03-27 23:52:04 UTC (rev 18394)

Property changes on: trunk/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/textproc/scrollkeeper/files/patch-libs_database.c
===================================================================
--- trunk/textproc/scrollkeeper/files/patch-libs_database.c	2015-03-27 23:50:04 UTC (rev 18393)
+++ trunk/textproc/scrollkeeper/files/patch-libs_database.c	2015-03-27 23:52:04 UTC (rev 18394)
@@ -1,12 +1,12 @@
---- libs/database.c.orig	Sat May 25 23:17:10 2002
-+++ libs/database.c	Sat May 25 23:18:01 2002
-@@ -73,7 +73,8 @@
+--- libs/database.c.orig	2002-06-02 06:03:10.000000000 +0000
++++ libs/database.c	2012-09-03 22:39:28.000000000 +0000
+@@ -131,7 +131,8 @@
      
      /* create locale directories and symlinks */
      
 -    dir = opendir(data_dir);
 +    if ((dir = opendir(data_dir)) == NULL)
-+	return;
++	return 1;
      
      while((dir_ent = readdir(dir)) != NULL)
      {


Property changes on: trunk/textproc/scrollkeeper/files/patch-libs_database.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/textproc/scrollkeeper/files/patch-libs_i18n.c
===================================================================
--- trunk/textproc/scrollkeeper/files/patch-libs_i18n.c	2015-03-27 23:50:04 UTC (rev 18393)
+++ trunk/textproc/scrollkeeper/files/patch-libs_i18n.c	2015-03-27 23:52:04 UTC (rev 18394)

Property changes on: trunk/textproc/scrollkeeper/files/patch-libs_i18n.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/textproc/scrollkeeper/files/patch-libs_install.c
===================================================================
--- trunk/textproc/scrollkeeper/files/patch-libs_install.c	2015-03-27 23:50:04 UTC (rev 18393)
+++ trunk/textproc/scrollkeeper/files/patch-libs_install.c	2015-03-27 23:52:04 UTC (rev 18394)

Property changes on: trunk/textproc/scrollkeeper/files/patch-libs_install.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/textproc/scrollkeeper/pkg-descr
===================================================================
--- trunk/textproc/scrollkeeper/pkg-descr	2015-03-27 23:50:04 UTC (rev 18393)
+++ trunk/textproc/scrollkeeper/pkg-descr	2015-03-27 23:52:04 UTC (rev 18394)

Property changes on: trunk/textproc/scrollkeeper/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/textproc/scrollkeeper/pkg-install
===================================================================
--- trunk/textproc/scrollkeeper/pkg-install	2015-03-27 23:50:04 UTC (rev 18393)
+++ trunk/textproc/scrollkeeper/pkg-install	2015-03-27 23:52:04 UTC (rev 18394)
@@ -12,7 +12,7 @@
 
     xmlcatalog --noout --add "public" \
     	"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
-	"${SKPREFIX}/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" \
+	"${SKPREFIX}/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" \
 	${ROOTCATALOG}
 
     scrollkeeper-rebuilddb -q -p /var/db/scrollkeeper || /usr/bin/true


Property changes on: trunk/textproc/scrollkeeper/pkg-install
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/textproc/scrollkeeper/pkg-plist
===================================================================
--- trunk/textproc/scrollkeeper/pkg-plist	2015-03-27 23:50:04 UTC (rev 18393)
+++ trunk/textproc/scrollkeeper/pkg-plist	2015-03-27 23:52:04 UTC (rev 18394)
@@ -14,9 +14,16 @@
 bin/scrollkeeper-update
 etc/scrollkeeper.conf
 lib/libscrollkeeper.a
-lib/libscrollkeeper.la
 lib/libscrollkeeper.so
 lib/libscrollkeeper.so.0
+lib/libscrollkeeper.so.0.0.0
+man/man1/scrollkeeper-config.1.gz
+man/man1/scrollkeeper-gen-seriesid.1.gz
+man/man5/scrollkeeper.conf.5.gz
+man/man7/scrollkeeper.7.gz
+man/man8/scrollkeeper-preinstall.8.gz
+man/man8/scrollkeeper-rebuilddb.8.gz
+man/man8/scrollkeeper-update.8.gz
 share/omf/scrollkeeper/writing_scrollkeeper_omf_files-C.omf
 share/scrollkeeper/Templates/C/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/am/scrollkeeper_cl.xml

More information about the Midnightbsd-cvs mailing list