Attachment 60734 Details for Bug 91120 – amsn.patch

[patch] amsn.patch

amsn.patch (text/plain), 6.92 KB, created by Ying-Chieh Chen on 2005-12-31 07:00:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ying-Chieh Chen

Created: 2005-12-31 07:00:17 UTC

Size: 6.92 KB

patch

obsolete

>diff -ruN /usr/ports/net-im/amsn/Makefile amsn/Makefile
>--- /usr/ports/net-im/amsn/Makefile	Sat Dec 31 10:28:53 2005
>+++ amsn/Makefile	Sat Dec 31 11:55:45 2005
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	amsn
> PORTVERSION=	0.95
>+PORTREVISION=	1
> CATEGORIES=	net-im
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -16,7 +17,6 @@
> 
> LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib
> BUILD_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
>-		convert:${PORTSDIR}/graphics/ImageMagick \
> 		${LOCALBASE}/lib/tls/tls.tcl:${PORTSDIR}/devel/tcltls \
> 		${LOCALBASE}/lib/tcllib1.7/base64/base64.tcl:${PORTSDIR}/devel/tcllib
> RUN_DEPENDS=	${BUILD_DEPENDS}
>@@ -34,10 +34,5 @@
> post-patch:
> 	@${FIND} ${WRKSRC} -name '*.c' -or -name '*.h' | ${XARGS} ${REINPLACE_CMD} -e 's|
||'
> 	@${FIND} ${WRKSRC} -name '*.bak' -delete
>-
>-post-install:
>-	@${MKDIR} ${DATADIR}/utils/TkCximage
>-	@${INSTALL_DATA} ${WRKSRC}/utils/TkCximage/TkCximage.so ${DATADIR}/utils/TkCximage
>-	@${INSTALL_DATA} ${WRKSRC}/utils/TkCximage/pkgIndex.tcl ${DATADIR}/utils/TkCximage
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/net-im/amsn/files/patch-Makefile.in amsn/files/patch-Makefile.in
>--- /usr/ports/net-im/amsn/files/patch-Makefile.in	Sat Dec 31 04:06:39 2005
>+++ amsn/files/patch-Makefile.in	Sat Dec 31 12:18:33 2005
>@@ -1,6 +1,18 @@
> --- Makefile.in.orig	Thu Dec 22 04:19:50 2005
>-+++ Makefile.in	Fri Dec 30 19:43:14 2005
>-@@ -138,10 +138,10 @@
>++++ Makefile.in	Sat Dec 31 12:18:14 2005
>+@@ -110,6 +110,11 @@
>+ FILES_TO_EXCLUDE += AppMain.tcl utils/linux/capture/test.tcl
>+ endif
>+ 
>++ifeq ($(FOUND_OS),bsd)
>++FILES_TO_INSTALL += utils/TkCximage/TkCximage.so utils/TkCximage/pkgIndex.tcl utils/linux/traydock/libtray.so utils/linux/traydock/pkgIndex.tcl
>++FILES_TO_EXCLUDE += AppMain.tcl utils/linux/capture/test.tcl
>++endif
>++
>+ CONFIGURE_ARGS := @CONFIGURE_ARGS@
>+ 
>+ #########################################################
>+@@ -138,10 +143,11 @@
>  
>  install:: $(FILES_TO_INSTALL)
>  	rm -Rf $(dstdir)/$(PACKAGE)
>@@ -9,7 +21,21 @@
>  	mkdir -p $(slnkdir)
>  	@for p in $?; do \
> -			cp -Rf --parents $(srcdir)/$$p $(dstdir)/$(PACKAGE); \
>++			mkdir -p $(dstdir)/$(PACKAGE)/`dirname $$p`; \
> +			cp -Rf $(srcdir)/$$p $(dstdir)/$(PACKAGE)/`dirname $$p`; \
>  		done
>  	find $(dstdir)/$(PACKAGE) -name CVS -print | xargs rm -Rf
>  	@for p in $(FILES_TO_EXCLUDE); do \
>+@@ -235,6 +241,12 @@
>+   endif
>+ endif
>+ 
>++ifeq ($(FOUND_OS),bsd)
>++  ifeq ($(FOUND_X11),yes)
>++      ADDLIBS    += ${X_LIBS}
>++      include $(tray_dir)/Rules.mk
>++  endif
>++endif
>+ 
>+ #########################################################
>+ # some rules ...
>diff -ruN /usr/ports/net-im/amsn/pkg-plist amsn/pkg-plist
>--- /usr/ports/net-im/amsn/pkg-plist	Sat Dec 31 10:28:54 2005
>+++ amsn/pkg-plist	Sat Dec 31 14:44:19 2005
>@@ -2,7 +2,6 @@
> bin/amsn-remote
> bin/amsn-remote-CLI
> share/amsn/AGREEMENT
>-share/amsn/AppMain.tcl
> share/amsn/CREDITS
> share/amsn/FAQ
> share/amsn/GNUGPL
>@@ -178,21 +177,21 @@
> share/amsn/plugins/WebcamShooter/lang/langen
> share/amsn/plugins/WebcamShooter/lang/langnl
> share/amsn/plugins/WebcamShooter/plugininfo.xml
>-share/amsn/plugins/inkdraw.tcl
>-share/amsn/plugins/pencils/pencil1.png
>-share/amsn/plugins/pencils/pencil2.png
>-share/amsn/plugins/pixmaps/butdraw.png
>-share/amsn/plugins/pixmaps/butdraw_hover.png
>-share/amsn/plugins/pixmaps/butgridoff.png
>-share/amsn/plugins/pixmaps/butgridoff_hover.png
>-share/amsn/plugins/pixmaps/butgridon.png
>-share/amsn/plugins/pixmaps/butgridon_hover.png
>-share/amsn/plugins/pixmaps/buttext.png
>-share/amsn/plugins/pixmaps/buttext_hover.png
>-share/amsn/plugins/pixmaps/butwipe.png
>-share/amsn/plugins/pixmaps/butwipe_hover.png
>-share/amsn/plugins/pixmaps/grid.png
>-share/amsn/plugins/plugininfo.xml
>+share/amsn/plugins/inkdraw/inkdraw.tcl
>+share/amsn/plugins/inkdraw/pencils/pencil1.png
>+share/amsn/plugins/inkdraw/pencils/pencil2.png
>+share/amsn/plugins/inkdraw/pixmaps/grid.png
>+share/amsn/plugins/inkdraw/pixmaps/butdraw_hover.png
>+share/amsn/plugins/inkdraw/pixmaps/butgridoff.png
>+share/amsn/plugins/inkdraw/pixmaps/butgridoff_hover.png
>+share/amsn/plugins/inkdraw/pixmaps/butgridon.png
>+share/amsn/plugins/inkdraw/pixmaps/butgridon_hover.png
>+share/amsn/plugins/inkdraw/pixmaps/buttext.png
>+share/amsn/plugins/inkdraw/pixmaps/buttext_hover.png
>+share/amsn/plugins/inkdraw/pixmaps/butwipe.png
>+share/amsn/plugins/inkdraw/pixmaps/butwipe_hover.png
>+share/amsn/plugins/inkdraw/pixmaps/butdraw.png
>+share/amsn/plugins/inkdraw/plugininfo.xml
> share/amsn/pluginslog.tcl
> share/amsn/preferences.tcl
> share/amsn/progressbar.tcl
>@@ -530,7 +529,10 @@
> share/amsn/utils/BWidget-1.7.0/xpm2image.tcl
> share/amsn/utils/TkCximage/TkCximage.so
> share/amsn/utils/TkCximage/pkgIndex.tcl
>-share/amsn/utils/base64.tcl
>+share/amsn/utils/base64/base64.tcl
>+share/amsn/utils/base64/pkgIndex.tcl
>+share/amsn/utils/base64/uuencode.tcl
>+share/amsn/utils/base64/yencode.tcl
> share/amsn/utils/drawboard/drawboard.tcl
> share/amsn/utils/drawboard/grid.png
> share/amsn/utils/drawboard/pkgIndex.tcl
>@@ -538,6 +540,8 @@
> share/amsn/utils/framec/pkgIndex.tcl
> share/amsn/utils/http2.4/http.tcl
> share/amsn/utils/http2.4/pkgIndex.tcl
>+share/amsn/utils/linux/traydock/libtray.so
>+share/amsn/utils/linux/traydock/pkgIndex.tcl
> share/amsn/utils/pixmapscroll/horizontal/arrow1.gif
> share/amsn/utils/pixmapscroll/horizontal/arrow1_disabled.gif
> share/amsn/utils/pixmapscroll/horizontal/arrow1_hover.gif
>@@ -591,7 +595,6 @@
> share/amsn/utils/pixmapscroll/vertical/slidertop_hover.gif
> share/amsn/utils/pixmapscroll/vertical/slidertop_pressed.gif
> share/amsn/utils/pixmapscroll/vertical/trough.gif
>-share/amsn/utils/pkgIndex.tcl
> share/amsn/utils/scalable-bg/pkgIndex.tcl
> share/amsn/utils/scalable-bg/scalable-bg.tcl
> share/amsn/utils/scalable-bg/test.tcl
>@@ -601,8 +604,6 @@
> share/amsn/utils/snit0.97/pkgIndex.tcl
> share/amsn/utils/snit0.97/snit-83.tcl
> share/amsn/utils/snit0.97/snit.tcl
>-share/amsn/utils/uuencode.tcl
>-share/amsn/utils/yencode.tcl
> share/applications/amsn.desktop
> share/icons/hicolor/128x128/aMSN_128.png
> share/icons/hicolor/128x128/tux-128x128.png
>@@ -636,12 +637,13 @@
> @dirrm share/amsn/icons/96x96
> @dirrm share/amsn/icons
> @dirrm share/amsn/lang
>-@dirrm share/amsn/plugins/pencils
>-@dirrm share/amsn/plugins/pixmaps
> @dirrm share/amsn/plugins/Nudge/lang
> @dirrm share/amsn/plugins/Nudge
> @dirrm share/amsn/plugins/WebcamShooter/lang
> @dirrm share/amsn/plugins/WebcamShooter
>+@dirrm share/amsn/plugins/inkdraw/pencils
>+@dirrm share/amsn/plugins/inkdraw/pixmaps
>+@dirrm share/amsn/plugins/inkdraw
> @dirrm share/amsn/plugins
> @dirrm share/amsn/skins/default/displaypic
> @dirrm share/amsn/skins/default/winicons
>@@ -654,9 +656,12 @@
> @dirrm share/amsn/utils/BWidget-1.7.0/lang
> @dirrm share/amsn/utils/BWidget-1.7.0
> @dirrm share/amsn/utils/TkCximage
>+@dirrm share/amsn/utils/base64
> @dirrm share/amsn/utils/drawboard
> @dirrm share/amsn/utils/framec
> @dirrm share/amsn/utils/http2.4
>+@dirrm share/amsn/utils/linux/traydock
>+@dirrm share/amsn/utils/linux
> @dirrm share/amsn/utils/pixmapscroll/horizontal
> @dirrm share/amsn/utils/pixmapscroll/vertical
> @dirrm share/amsn/utils/pixmapscroll

Actions: View | Diff

Attachments on bug 91120: 60734