Attachment 25684 Details for Bug 43870 – file.diff

[patch] file.diff

file.diff (text/plain), 12.68 KB, created by Alex Varju on 2002-10-09 20:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Varju

Created: 2002-10-09 20:20:03 UTC

Size: 12.68 KB

patch

obsolete

>Index: ports/palm/jpilot/Makefile
>===================================================================
>RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/Makefile,v
>retrieving revision 1.25
>diff -u -r1.25 Makefile
>--- ports/palm/jpilot/Makefile	17 Sep 2002 16:35:38 -0000	1.25
>+++ ports/palm/jpilot/Makefile	9 Oct 2002 19:10:16 -0000
>@@ -7,8 +7,7 @@
> # "?=" and "+=" are for including this Makefile from japanese/jpilot
> 
> PORTNAME=	jpilot
>-PORTVERSION=	0.99.2
>-PORTREVISION=	2
>+PORTVERSION=	0.99.3
> CATEGORIES+=	palm comms
> MASTER_SITES=	http://jpilot.org/
> 
>@@ -23,18 +22,29 @@
> INSTALLS_SHLIB=	yes
> LDCONFIG_DIRS=	%%PREFIX%%/lib/jpilot/plugins
> CONFIGURE_ARGS+=	--with-pilot-prefix=${PREFIX}
>+CFLAGS+=	-I${PREFIX}/include
>+CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
> 
> MAN1=		jpilot-sync.1 jpilot-upgrade-99.1 jpilot.1
> 
> post-install:
>+	${MKDIR} ${PREFIX}/man/man1
>+	${CP} ${WRKSRC}/docs/jpilot-sync.1 ${PREFIX}/man/man1
>+	${CP} ${WRKSRC}/docs/jpilot-upgrade-99.1 ${PREFIX}/man/man1
>+	${CP} ${WRKSRC}/docs/jpilot.1 ${PREFIX}/man/man1
>+	${MKDIR} ${PREFIX}/share/jpilot/icons
>+	${CP} ${WRKSRC}/icons/jpilot-icon1.xpm ${PREFIX}/share/jpilot/icons
>+	${CP} ${WRKSRC}/icons/jpilot-icon2.xpm ${PREFIX}/share/jpilot/icons
>+	${CP} ${WRKSRC}/icons/jpilot-icon3.xpm ${PREFIX}/share/jpilot/icons
>+	${CP} ${WRKSRC}/icons/jpilot-icon4.xpm ${PREFIX}/share/jpilot/icons
> .if !defined(NOPORTDOCS)
> 	${MKDIR} ${PREFIX}/share/doc/jpilot
> 	${CP} ${WRKSRC}/docs/manual.html ${PREFIX}/share/doc/jpilot
> 	${CP} ${WRKSRC}/docs/plugin.html ${PREFIX}/share/doc/jpilot
>+	${CP} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/jpilot
> 	${CP} ${WRKSRC}/BUGS ${PREFIX}/share/doc/jpilot
>-	${CP} ${WRKSRC}/CHANGELOG ${PREFIX}/share/doc/jpilot
> 	${CP} ${WRKSRC}/COPYING ${PREFIX}/share/doc/jpilot
>-	${CP} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/jpilot
>+	${CP} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/jpilot
> 	${CP} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/jpilot
> 	${CP} ${WRKSRC}/README ${PREFIX}/share/doc/jpilot
> 	${CP} ${WRKSRC}/TODO ${PREFIX}/share/doc/jpilot
>Index: ports/palm/jpilot/distinfo
>===================================================================
>RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/distinfo,v
>retrieving revision 1.10
>diff -u -r1.10 distinfo
>--- ports/palm/jpilot/distinfo	9 Feb 2002 08:56:56 -0000	1.10
>+++ ports/palm/jpilot/distinfo	9 Oct 2002 16:41:08 -0000
>@@ -1 +1 @@
>-MD5 (jpilot-0.99.2.tar.gz) = 57be9e7cd2b2878fd439c98d77d4bdb9
>+MD5 (jpilot-0.99.3.tar.gz) = e0ec41c291dfbee4189d232150785141
>Index: ports/palm/jpilot/pkg-plist
>===================================================================
>RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/pkg-plist,v
>retrieving revision 1.9
>diff -u -r1.9 pkg-plist
>--- ports/palm/jpilot/pkg-plist	9 Feb 2002 08:56:56 -0000	1.9
>+++ ports/palm/jpilot/pkg-plist	9 Oct 2002 19:12:58 -0000
>@@ -2,24 +2,19 @@
> bin/jpilot-dump
> bin/jpilot-sync
> bin/jpilot-upgrade-99
>-lib/jpilot/plugins/libexpense.a
> lib/jpilot/plugins/libexpense.la
> lib/jpilot/plugins/libexpense.so
>-lib/jpilot/plugins/libexpense.so.1
>-lib/jpilot/plugins/libkeyring.a
>+lib/jpilot/plugins/libexpense.so.0
> lib/jpilot/plugins/libkeyring.la
> lib/jpilot/plugins/libkeyring.so
>-lib/jpilot/plugins/libkeyring.so.1
>-lib/jpilot/plugins/libsynctime.a
>+lib/jpilot/plugins/libkeyring.so.0
> lib/jpilot/plugins/libsynctime.la
> lib/jpilot/plugins/libsynctime.so
>-lib/jpilot/plugins/libsynctime.so.1
>-%%PORTDOCS%%share/doc/jpilot/manual.html
>-%%PORTDOCS%%share/doc/jpilot/plugin.html
>+lib/jpilot/plugins/libsynctime.so.0
>+%%PORTDOCS%%share/doc/jpilot/AUTHORS
> %%PORTDOCS%%share/doc/jpilot/BUGS
>-%%PORTDOCS%%share/doc/jpilot/CHANGELOG
> %%PORTDOCS%%share/doc/jpilot/COPYING
>-%%PORTDOCS%%share/doc/jpilot/CREDITS
>+%%PORTDOCS%%share/doc/jpilot/ChangeLog
> %%PORTDOCS%%share/doc/jpilot/INSTALL
> %%PORTDOCS%%share/doc/jpilot/README
> %%PORTDOCS%%share/doc/jpilot/README.icons
>@@ -35,6 +30,8 @@
> %%PORTDOCS%%share/doc/jpilot/jpilot-search.png
> %%PORTDOCS%%share/doc/jpilot/jpilot-todo.png
> %%PORTDOCS%%share/doc/jpilot/jpilot-toplogo.jpg
>+%%PORTDOCS%%share/doc/jpilot/manual.html
>+%%PORTDOCS%%share/doc/jpilot/plugin.html
> share/jpilot/AddressDB.pdb
> share/jpilot/DatebookDB.pdb
> share/jpilot/ExpenseDB.pdb
>@@ -61,6 +58,9 @@
> share/locale/nl/LC_MESSAGES/jpilot.mo
> share/locale/no/LC_MESSAGES/jpilot.mo
> share/locale/sv/LC_MESSAGES/jpilot.mo
>+share/locale/tr/LC_MESSAGES/jpilot.mo
>+share/locale/zh_CN/LC_MESSAGES/jpilot.mo
>+share/locale/zh_TW/LC_MESSAGES/jpilot.mo
> @dirrm share/jpilot/icons
> @dirrm share/jpilot
> %%PORTDOCS%%@dirrm share/doc/jpilot
>@@ -78,6 +78,8 @@
> @unexec rmdir %D/share/locale/es 2>/dev/null || true
> @unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
> @unexec rmdir %D/share/locale/fr 2>/dev/null || true
>+@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
>+@unexec rmdir %D/share/locale/it 2>/dev/null || true
> @unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
> @unexec rmdir %D/share/locale/ja 2>/dev/null || true
> @unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
>@@ -86,4 +88,10 @@
> @unexec rmdir %D/share/locale/no 2>/dev/null || true
> @unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
> @unexec rmdir %D/share/locale/sv 2>/dev/null || true
>+@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
>+@unexec rmdir %D/share/locale/tr 2>/dev/null || true
>+@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
>+@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
>+@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
>+@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
> @unexec rmdir %D/share/locale 2>/dev/null || true
>Index: ports/palm/jpilot/files/patch-Expense_Makefile.in
>===================================================================
>RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-Expense_Makefile.in,v
>retrieving revision 1.2
>diff -u -r1.2 patch-Expense_Makefile.in
>--- ports/palm/jpilot/files/patch-Expense_Makefile.in	9 Feb 2002 08:56:58 -0000	1.2
>+++ ports/palm/jpilot/files/patch-Expense_Makefile.in	9 Oct 2002 17:00:35 -0000
>@@ -1,12 +0,0 @@
>---- Expense/Makefile.in.orig	Sun Dec 23 16:43:25 2001
>-+++ Expense/Makefile.in	Wed Jan  9 22:14:27 2002
>-@@ -31,8 +31,7 @@
>- 	$(CC) $(OPTIONS) -o libexpense.la \
>- 	expense.lo \
>- 	-rpath $(prefix)/lib/jpilot/plugins \
>--	-version-info 1:1 \
>--	-avoid-version
>-+	-version-info 1:1
>- 
>- expense.o: expense.c libplugin.h
>- 	$(LIBTOOL) --mode=compile \
>Index: ports/palm/jpilot/files/patch-KeyRing_Makefile.in
>===================================================================
>RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-KeyRing_Makefile.in,v
>retrieving revision 1.1
>diff -u -r1.1 patch-KeyRing_Makefile.in
>--- ports/palm/jpilot/files/patch-KeyRing_Makefile.in	9 Feb 2002 08:56:58 -0000	1.1
>+++ ports/palm/jpilot/files/patch-KeyRing_Makefile.in	9 Oct 2002 17:00:54 -0000
>@@ -1,10 +0,0 @@
>---- KeyRing/Makefile.in.orig	Fri Jan 25 11:00:06 2002
>-+++ KeyRing/Makefile.in	Wed Feb  6 16:02:50 2002
>-@@ -35,7 +35,6 @@
>- 	keyring.lo \
>- 	-rpath $(prefix)/lib/jpilot/plugins \
>- 	-version-info 1:1 \
>--	-avoid-version \
>- 	$(CRYPTO_LIBS)
>- 
>- keyring.o: keyring.c libplugin.h
>Index: ports/palm/jpilot/files/patch-Makefile.in
>===================================================================
>RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-Makefile.in,v
>retrieving revision 1.2
>diff -u -r1.2 patch-Makefile.in
>--- ports/palm/jpilot/files/patch-Makefile.in	9 Feb 2002 08:56:58 -0000	1.2
>+++ ports/palm/jpilot/files/patch-Makefile.in	9 Oct 2002 18:24:05 -0000
>@@ -1,51 +1,11 @@
>---- Makefile.in.orig	Tue Feb  5 22:29:18 2002
>-+++ Makefile.in	Wed Feb  6 09:33:52 2002
>-@@ -427,39 +427,18 @@
>- 	$(INSTALL) -m 644 empty/MemoDB.pdb $(prefix)/share/$(PACKAGE)/
>- 	$(INSTALL) -m 644 empty/Memo32DB.pdb $(prefix)/share/$(PACKAGE)/
>- 	$(INSTALL) -m 644 empty/ExpenseDB.pdb $(prefix)/share/$(PACKAGE)/
>--	$(INSTALL) -d -m 755 $(prefix)/doc/$(PACKAGE)-$(VERSION)
>--	$(INSTALL) -m 644 docs/manual.html $(prefix)/doc/$(PACKAGE)-$(VERSION)/manual.html
>--	$(INSTALL) -m 644 docs/plugin.html $(prefix)/doc/$(PACKAGE)-$(VERSION)
>--	$(INSTALL) -m 644 docs/jpilot-address.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
>--	$(INSTALL) -m 644 docs/jpilot-datebook.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
>--	$(INSTALL) -m 644 docs/jpilot-expense.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
>--	$(INSTALL) -m 644 docs/jpilot-install.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
>--	$(INSTALL) -m 644 docs/jpilot-memo.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
>--	$(INSTALL) -m 644 docs/jpilot-prefs.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
>--	$(INSTALL) -m 644 docs/jpilot-print.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
>--	$(INSTALL) -m 644 docs/jpilot-search.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
>--	$(INSTALL) -m 644 docs/jpilot-todo.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
>--	$(INSTALL) -m 644 docs/jpilot-toplogo.jpg $(prefix)/doc/$(PACKAGE)-$(VERSION)
>--	$(INSTALL) -d -m 644 $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons
>--	$(INSTALL) -m 644 icons/README $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/README
>--	$(INSTALL) -m 644 icons/jpilot-icon1.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
>--	$(INSTALL) -m 644 icons/jpilot-icon2.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
>--	$(INSTALL) -m 644 icons/jpilot-icon3.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
>--	$(INSTALL) -m 644 icons/jpilot-icon4.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
>--	$(INSTALL) -m 644 BUGS $(prefix)/doc/$(PACKAGE)-$(VERSION)/
>--	$(INSTALL) -m 644 CHANGELOG $(prefix)/doc/$(PACKAGE)-$(VERSION)/
>--	$(INSTALL) -m 644 COPYING $(prefix)/doc/$(PACKAGE)-$(VERSION)/
>--	$(INSTALL) -m 644 CREDITS $(prefix)/doc/$(PACKAGE)-$(VERSION)/
>--	$(INSTALL) -m 644 INSTALL $(prefix)/doc/$(PACKAGE)-$(VERSION)/
>--	$(INSTALL) -m 644 README $(prefix)/doc/$(PACKAGE)-$(VERSION)/
>--	$(INSTALL) -m 644 TODO $(prefix)/doc/$(PACKAGE)-$(VERSION)/
>--	$(INSTALL) -m 644 UPGRADING $(prefix)/doc/$(PACKAGE)-$(VERSION)/
>-+	$(INSTALL) -d -m 755 $(prefix)/share/jpilot/icons
>-+	$(INSTALL) -d -m 644 $(prefix)/share/jpilot/icons
>-+	$(INSTALL) -m 644 icons/jpilot-icon1.xpm $(prefix)/share/jpilot/icons/
>-+	$(INSTALL) -m 644 icons/jpilot-icon2.xpm $(prefix)/share/jpilot/icons/
>-+	$(INSTALL) -m 644 icons/jpilot-icon3.xpm $(prefix)/share/jpilot/icons/
>-+	$(INSTALL) -m 644 icons/jpilot-icon4.xpm $(prefix)/share/jpilot/icons/
>- 	cd intl; $(MAKE) install
>- 	cd po; $(MAKE) install
>- 	$(INSTALL) -d -m 755 $(mandir)/man1/
>--	cat docs/jpilot.1 | gzip -9c > $(mandir)/man1/jpilot.1.gz
>--	cat docs/jpilot-sync.1 | gzip -9c > $(mandir)/man1/jpilot-sync.1.gz
>--	cat docs/jpilot-upgrade-99.1 | gzip -9c > $(mandir)/man1/jpilot-upgrade-99.1.gz
>-+	$(INSTALL) -m 644 docs/jpilot.1 $(mandir)/man1/
>-+	$(INSTALL) -m 644 docs/jpilot-sync.1 $(mandir)/man1/
>-+	$(INSTALL) -m 644 docs/jpilot-upgrade-99.1 $(mandir)/man1/
>+--- Makefile.in.orig	Tue Oct  8 18:55:05 2002
>++++ Makefile.in	Wed Oct  9 11:23:49 2002
>+@@ -132,7 +132,7 @@
>+ cflags = @cflags@
>+ install_sh = @install_sh@
>  
>- install_plugins:
>- 	cd SyncTime; $(MAKE) install
>+-SUBDIRS = po Expense SyncTime KeyRing docs intl m4
>++SUBDIRS = po Expense SyncTime KeyRing intl m4
>+ 
>+ EXTRA_DIST = reconf autogen.sh ChangeLog docs empty icons \
>+ 	BUGS jpilot.spec jpilot-col.spec jpilot.kdelnk jpilot.rh7.spec \
>Index: ports/palm/jpilot/files/patch-SyncTime_Makefile.in
>===================================================================
>RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-SyncTime_Makefile.in,v
>retrieving revision 1.2
>diff -u -r1.2 patch-SyncTime_Makefile.in
>--- ports/palm/jpilot/files/patch-SyncTime_Makefile.in	9 Feb 2002 08:56:58 -0000	1.2
>+++ ports/palm/jpilot/files/patch-SyncTime_Makefile.in	9 Oct 2002 17:01:42 -0000
>@@ -1,12 +0,0 @@
>---- SyncTime/Makefile.in.orig	Fri Jan 25 10:59:50 2002
>-+++ SyncTime/Makefile.in	Wed Feb  6 09:34:19 2002
>-@@ -33,8 +33,7 @@
>- 	$(CC) $(OPTIONS) -o libsynctime.la \
>- 	synctime.lo \
>- 	-rpath $(prefix)/lib/jpilot/plugins \
>--	-version-info 1:1 \
>--	-avoid-version
>-+	-version-info 1:1
>- 
>- synctime.o: synctime.c libplugin.h
>- 	$(LIBTOOL) --mode=compile \
>Index: ports/palm/jpilot/files/patch-configure
>===================================================================
>RCS file: /webct2/Admin/cvsroot/ports/palm/jpilot/files/patch-configure,v
>retrieving revision 1.2
>diff -u -r1.2 patch-configure
>--- ports/palm/jpilot/files/patch-configure	9 Feb 2002 08:56:58 -0000	1.2
>+++ ports/palm/jpilot/files/patch-configure	9 Oct 2002 17:02:42 -0000
>@@ -1,20 +0,0 @@
>---- configure.orig	Sat Dec 22 22:44:47 2001
>-+++ configure	Sun Dec 23 14:42:24 2001
>-@@ -6677,7 +6677,7 @@
>- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>- 
>- # Always use our own libtool.
>--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
>-+LIBTOOL='libtool'
>- 
>- # Prevent multiple expansion
>- 
>-@@ -9504,7 +9504,7 @@
>-   enable_plugins=yes
>- fi;
>- 
>--PLUGIN_SUPPORT=0
>-+PLUGIN_SUPPORT=1
>- 
>- if test "x$enable_plugins" = "xyes"; then
>- #   dnl Check for shared library calls

Actions: View | Diff

Attachments on bug 43870: 25684