Attachment #124903 for bug #168424

View | Details | Raw Unified | Return to bug 168424
Collapse All | Expand All

Lines 6-12 Link Here

(-)./Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= amsn	8	PORTNAME= amsn
9	PORTVERSION= 0.98.4	9	PORTVERSION= 0.98.9
10	CATEGORIES= net-im	10	CATEGORIES= net-im
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	12	DISTNAME= ${PORTNAME}-${PORTVERSION}-src

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (amsn-0.98.4-src.tar.bz2) = 7aa11a7199b4cda5e814493dd160915ab4c4f96c04de2c1fe7c2fe23eeaba871	1	SHA256 (amsn-0.98.9-src.tar.bz2) = 1fd2620489cc3627a841773a79cf28a7c9c438979c76d37f231a773a79e7f23e
2	SIZE (amsn-0.98.4-src.tar.bz2) = 13513233	2	SIZE (amsn-0.98.9-src.tar.bz2) = 13520050




--- Makefile.in.orig	2012-05-28 18:20:27.000000000 -0300
+++ Makefile.in	2012-05-28 18:22:05.000000000 -0300
@@ -74,7 +74,7 @@
 TCL_STUB_LIB_SPEC := @TCL_STUB_LIB_SPEC@
 
 # Directories in which the Tk core can be found

+TK_INC_SPEC 	:= @TK_INC_SPEC@/generic
 TK_STUB_LIB_SPEC := @TK_STUB_LIB_SPEC@
 
 # stuff configure has found
@@ -95,6 +95,7 @@
 endif
 ADDITIONAL_FLAGS   += -DPACKAGE='"$(PACKAGE)"'
 ADDITIONAL_FLAGS   += -DVERSION='"$(VERSION)"'
+ADDITIONAL_FLAGS   += -I${LOCALBASE}/include
 
 # shared objects need -fPIC
 ADDITIONAL_FLAGS   += -fPIC




%%DATADIR%%/abook.tcl
%%DATADIR%%/addressbook.tcl
%%DATADIR%%/alarm.tcl
%%DATADIR%%/amsn-e
%%DATADIR%%/amsn
%%DATADIR%%/amsn-remote
%%DATADIR%%/amsn-remote-CLI

%%DATADIR%%/hotmail.tcl
%%DATADIR%%/hotmlog.htm
%%DATADIR%%/lang.tcl
%%DATADIR%%/msnp2p/constants.tcl
%%DATADIR%%/msnp2p/filetransfer.tcl
%%DATADIR%%/msnp2p/message.tcl
%%DATADIR%%/msnp2p/msnobject.tcl
%%DATADIR%%/msnp2p/p2p.tcl
%%DATADIR%%/msnp2p/session.tcl
%%DATADIR%%/msnp2p/session_manager.tcl
%%DATADIR%%/msnp2p/slp.tcl
%%DATADIR%%/msnp2p/sourcefiles.tcl
%%DATADIR%%/msnp2p/webcam.tcl
%%DATADIR%%/msnp2p/transport/TLP.tcl
%%DATADIR%%/msnp2p/transport/TLPv1.tcl
%%DATADIR%%/msnp2p/transport/TLPv2.tcl
%%DATADIR%%/msnp2p/transport/base.tcl
%%DATADIR%%/msnp2p/transport/constants.tcl
%%DATADIR%%/msnp2p/transport/direct.tcl
%%DATADIR%%/msnp2p/transport/switchboard.tcl
%%DATADIR%%/msnp2p/transport/transport_manager.tcl
%%DATADIR%%/lang/LANG-HOWTO
%%DATADIR%%/lang/convert.tcl
%%DATADIR%%/lang/langal

%%DATADIR%%/utils/BWidget-1.9.0/widget.tcl
%%DATADIR%%/utils/BWidget-1.9.0/wizard.tcl
%%DATADIR%%/utils/BWidget-1.9.0/xpm2image.tcl
%%DATADIR%%/utils/TkCximage/TkCximage.so
%%DATADIR%%/utils/TkCximage/pkgIndex.tcl
%%DATADIR%%/utils/asyncresolver/asyncresolver.tcl
%%DATADIR%%/utils/asyncresolver/libasyncresolver.so
%%DATADIR%%/utils/asyncresolver/pkgIndex.tcl
%%DATADIR%%/utils/base64/base64.tcl
%%DATADIR%%/utils/base64/license.terms
%%DATADIR%%/utils/base64/pkgIndex.tcl

%%DATADIR%%/utils/drawboard/drawboard.tcl
%%DATADIR%%/utils/drawboard/grid.png
%%DATADIR%%/utils/drawboard/pkgIndex.tcl
%%DATADIR%%/utils/farsight/pkgIndex.tcl
%%DATADIR%%/utils/farsight/tcl_farsight.so
%%DATADIR%%/utils/framec/framec.tcl
%%DATADIR%%/utils/framec/pkgIndex.tcl
%%DATADIR%%/utils/http/http.tcl
%%DATADIR%%/utils/http/license.terms
%%DATADIR%%/utils/http/pkgIndex.tcl
%%DATADIR%%/utils/linux/linflash/flash.so
%%DATADIR%%/utils/linux/linflash/pkgIndex.tcl
%%DATADIR%%/utils/linux/traydock/libtray.so
%%DATADIR%%/utils/linux/traydock/pkgIndex.tcl
%%DATADIR%%/utils/log/license.terms
%%DATADIR%%/utils/log/log.tcl
%%DATADIR%%/utils/log/logger.tcl

%%DATADIR%%/utils/snit/snit83.tcl
%%DATADIR%%/utils/snit/snit_tcl83_utils.tcl
%%DATADIR%%/utils/snit/validate.tcl
%%DATADIR%%/utils/tclISF/pkgIndex.tcl
%%DATADIR%%/utils/tclISF/tclISF.so
%%DATADIR%%/utils/tcl_siren/pkgIndex.tcl
%%DATADIR%%/utils/tcl_siren/tcl_siren.so
%%DATADIR%%/utils/uri/pkgIndex.tcl
%%DATADIR%%/utils/uri/uri.tcl
%%DATADIR%%/utils/uri/urn-scheme.tcl
%%DATADIR%%/utils/voipcontrols/pkgIndex.tcl
%%DATADIR%%/utils/voipcontrols/test.tcl
%%DATADIR%%/utils/voipcontrols/voipcontrols.tcl
%%DATADIR%%/utils/webcamsn/pkgIndex.tcl
%%DATADIR%%/utils/webcamsn/webcamsn.so
@dirrm share/applications
@dirrm %%DATADIR%%/utils/webcamsn
@dirrm %%DATADIR%%/utils/voipcontrols
@dirrm %%DATADIR%%/utils/uri
@dirrm %%DATADIR%%/utils/tcl_siren
@dirrm %%DATADIR%%/utils/tclISF
@dirrm %%DATADIR%%/utils/snit
@dirrm %%DATADIR%%/utils/sha1
@dirrm %%DATADIR%%/utils/sexytile

@dirrm %%DATADIR%%/utils/md4
@dirrm %%DATADIR%%/utils/log/msgs
@dirrm %%DATADIR%%/utils/log
@dirrm %%DATADIR%%/utils/linux/traydock
@dirrm %%DATADIR%%/utils/linux/linflash
@dirrm %%DATADIR%%/utils/linux
@dirrm %%DATADIR%%/utils/http
@dirrm %%DATADIR%%/utils/framec
@dirrm %%DATADIR%%/utils/farsight
@dirrm %%DATADIR%%/utils/drawboard
@dirrm %%DATADIR%%/utils/dpbrowser
@dirrm %%DATADIR%%/utils/des
@dirrm %%DATADIR%%/utils/contentmanager
@dirrm %%DATADIR%%/utils/combobox
@dirrm %%DATADIR%%/utils/base64
@dirrm %%DATADIR%%/utils/asyncresolver
@dirrm %%DATADIR%%/utils/TkCximage
@dirrm %%DATADIR%%/utils/BWidget-1.9.0/lang
@dirrm %%DATADIR%%/utils/BWidget-1.9.0/images
@dirrm %%DATADIR%%/utils/BWidget-1.9.0

@dirrm %%DATADIR%%/desktop-icons/128x128
@dirrm %%DATADIR%%/desktop-icons
@dirrm %%DATADIR%%/ca-certs
@dirrm %%DATADIR%%/msnp2p/transport
@dirrm %%DATADIR%%/msnp2p
@dirrm %%DATADIR%%

Return to bug 168424

Lines 1-6 Link Here

(-)./files/patch-Makefile.in (-11 / +11 lines)
1	--- Makefile.in.orig 2009-10-06 15:51:12.000000000 -0300	1	--- Makefile.in.orig 2012-05-28 18:20:27.000000000 -0300
2	+++ Makefile.in 2009-10-09 20:46:42.000000000 -0300	2	+++ Makefile.in 2012-05-28 18:22:05.000000000 -0300
3	@@ -67,7 +67,7 @@	3	@@ -74,7 +74,7 @@
4	TCL_STUB_LIB_SPEC := @TCL_STUB_LIB_SPEC@	4	TCL_STUB_LIB_SPEC := @TCL_STUB_LIB_SPEC@
5		5
6	# Directories in which the Tk core can be found	6	# Directories in which the Tk core can be found
Lines 8-19 Link Here
8	+TK_INC_SPEC := @TK_INC_SPEC@/generic	8	+TK_INC_SPEC := @TK_INC_SPEC@/generic
9	TK_STUB_LIB_SPEC := @TK_STUB_LIB_SPEC@	9	TK_STUB_LIB_SPEC := @TK_STUB_LIB_SPEC@
10		10
11	# C Flags for X	11	# stuff configure has found
12	@@ -118,6 +118,7 @@	12	@@ -95,6 +95,7 @@
13	CXXFLAGS += -DPACKAGE='"$(PACKAGE)"'	13	endif
14	CXXFLAGS += -DVERSION='"$(VERSION)"'	14	ADDITIONAL_FLAGS += -DPACKAGE='"$(PACKAGE)"'
15	CXXFLAGS += -DLIBDIR='"$(LIBDIR)"'	15	ADDITIONAL_FLAGS += -DVERSION='"$(VERSION)"'
16	+CXXFLAGS += -I${LOCALBASE}/include	16	+ADDITIONAL_FLAGS += -I${LOCALBASE}/include
17		17
18	ifeq ($(STATIC),yes)	18	# shared objects need -fPIC
19	CXXFLAGS += -static-libgcc -L.	19	ADDITIONAL_FLAGS += -fPIC

Lines 15-20 Link Here

(-)./pkg-plist (-26 / +21 lines)
15	%%DATADIR%%/abook.tcl	15	%%DATADIR%%/abook.tcl
16	%%DATADIR%%/addressbook.tcl	16	%%DATADIR%%/addressbook.tcl
17	%%DATADIR%%/alarm.tcl	17	%%DATADIR%%/alarm.tcl
		18	%%DATADIR%%/amsn-e
18	%%DATADIR%%/amsn	19	%%DATADIR%%/amsn
19	%%DATADIR%%/amsn-remote	20	%%DATADIR%%/amsn-remote
20	%%DATADIR%%/amsn-remote-CLI	21	%%DATADIR%%/amsn-remote-CLI
Lines 127-132 Link Here
127	%%DATADIR%%/hotmail.tcl	128	%%DATADIR%%/hotmail.tcl
128	%%DATADIR%%/hotmlog.htm	129	%%DATADIR%%/hotmlog.htm
129	%%DATADIR%%/lang.tcl	130	%%DATADIR%%/lang.tcl
		131	%%DATADIR%%/msnp2p/constants.tcl
		132	%%DATADIR%%/msnp2p/filetransfer.tcl
		133	%%DATADIR%%/msnp2p/message.tcl
		134	%%DATADIR%%/msnp2p/msnobject.tcl
		135	%%DATADIR%%/msnp2p/p2p.tcl
		136	%%DATADIR%%/msnp2p/session.tcl
		137	%%DATADIR%%/msnp2p/session_manager.tcl
		138	%%DATADIR%%/msnp2p/slp.tcl
		139	%%DATADIR%%/msnp2p/sourcefiles.tcl
		140	%%DATADIR%%/msnp2p/webcam.tcl
		141	%%DATADIR%%/msnp2p/transport/TLP.tcl
		142	%%DATADIR%%/msnp2p/transport/TLPv1.tcl
		143	%%DATADIR%%/msnp2p/transport/TLPv2.tcl
		144	%%DATADIR%%/msnp2p/transport/base.tcl
		145	%%DATADIR%%/msnp2p/transport/constants.tcl
		146	%%DATADIR%%/msnp2p/transport/direct.tcl
		147	%%DATADIR%%/msnp2p/transport/switchboard.tcl
		148	%%DATADIR%%/msnp2p/transport/transport_manager.tcl
130	%%DATADIR%%/lang/LANG-HOWTO	149	%%DATADIR%%/lang/LANG-HOWTO
131	%%DATADIR%%/lang/convert.tcl	150	%%DATADIR%%/lang/convert.tcl
132	%%DATADIR%%/lang/langal	151	%%DATADIR%%/lang/langal
Lines 2309-2319 Link Here
2309	%%DATADIR%%/utils/BWidget-1.9.0/widget.tcl	2328	%%DATADIR%%/utils/BWidget-1.9.0/widget.tcl
2310	%%DATADIR%%/utils/BWidget-1.9.0/wizard.tcl	2329	%%DATADIR%%/utils/BWidget-1.9.0/wizard.tcl
2311	%%DATADIR%%/utils/BWidget-1.9.0/xpm2image.tcl	2330	%%DATADIR%%/utils/BWidget-1.9.0/xpm2image.tcl
2312	%%DATADIR%%/utils/TkCximage/TkCximage.so
2313	%%DATADIR%%/utils/TkCximage/pkgIndex.tcl
2314	%%DATADIR%%/utils/asyncresolver/asyncresolver.tcl
2315	%%DATADIR%%/utils/asyncresolver/libasyncresolver.so
2316	%%DATADIR%%/utils/asyncresolver/pkgIndex.tcl
2317	%%DATADIR%%/utils/base64/base64.tcl	2331	%%DATADIR%%/utils/base64/base64.tcl
2318	%%DATADIR%%/utils/base64/license.terms	2332	%%DATADIR%%/utils/base64/license.terms
2319	%%DATADIR%%/utils/base64/pkgIndex.tcl	2333	%%DATADIR%%/utils/base64/pkgIndex.tcl
Lines 2332-2348 Link Here
2332	%%DATADIR%%/utils/drawboard/drawboard.tcl	2346	%%DATADIR%%/utils/drawboard/drawboard.tcl
2333	%%DATADIR%%/utils/drawboard/grid.png	2347	%%DATADIR%%/utils/drawboard/grid.png
2334	%%DATADIR%%/utils/drawboard/pkgIndex.tcl	2348	%%DATADIR%%/utils/drawboard/pkgIndex.tcl
2335	%%DATADIR%%/utils/farsight/pkgIndex.tcl
2336	%%DATADIR%%/utils/farsight/tcl_farsight.so
2337	%%DATADIR%%/utils/framec/framec.tcl	2349	%%DATADIR%%/utils/framec/framec.tcl
2338	%%DATADIR%%/utils/framec/pkgIndex.tcl	2350	%%DATADIR%%/utils/framec/pkgIndex.tcl
2339	%%DATADIR%%/utils/http/http.tcl	2351	%%DATADIR%%/utils/http/http.tcl
2340	%%DATADIR%%/utils/http/license.terms	2352	%%DATADIR%%/utils/http/license.terms
2341	%%DATADIR%%/utils/http/pkgIndex.tcl	2353	%%DATADIR%%/utils/http/pkgIndex.tcl
2342	%%DATADIR%%/utils/linux/linflash/flash.so
2343	%%DATADIR%%/utils/linux/linflash/pkgIndex.tcl
2344	%%DATADIR%%/utils/linux/traydock/libtray.so
2345	%%DATADIR%%/utils/linux/traydock/pkgIndex.tcl
2346	%%DATADIR%%/utils/log/license.terms	2354	%%DATADIR%%/utils/log/license.terms
2347	%%DATADIR%%/utils/log/log.tcl	2355	%%DATADIR%%/utils/log/log.tcl
2348	%%DATADIR%%/utils/log/logger.tcl	2356	%%DATADIR%%/utils/log/logger.tcl
Lines 2434-2457 Link Here
2434	%%DATADIR%%/utils/snit/snit83.tcl	2442	%%DATADIR%%/utils/snit/snit83.tcl
2435	%%DATADIR%%/utils/snit/snit_tcl83_utils.tcl	2443	%%DATADIR%%/utils/snit/snit_tcl83_utils.tcl
2436	%%DATADIR%%/utils/snit/validate.tcl	2444	%%DATADIR%%/utils/snit/validate.tcl
2437	%%DATADIR%%/utils/tclISF/pkgIndex.tcl
2438	%%DATADIR%%/utils/tclISF/tclISF.so
2439	%%DATADIR%%/utils/tcl_siren/pkgIndex.tcl
2440	%%DATADIR%%/utils/tcl_siren/tcl_siren.so
2441	%%DATADIR%%/utils/uri/pkgIndex.tcl	2445	%%DATADIR%%/utils/uri/pkgIndex.tcl
2442	%%DATADIR%%/utils/uri/uri.tcl	2446	%%DATADIR%%/utils/uri/uri.tcl
2443	%%DATADIR%%/utils/uri/urn-scheme.tcl	2447	%%DATADIR%%/utils/uri/urn-scheme.tcl
2444	%%DATADIR%%/utils/voipcontrols/pkgIndex.tcl	2448	%%DATADIR%%/utils/voipcontrols/pkgIndex.tcl
2445	%%DATADIR%%/utils/voipcontrols/test.tcl	2449	%%DATADIR%%/utils/voipcontrols/test.tcl
2446	%%DATADIR%%/utils/voipcontrols/voipcontrols.tcl	2450	%%DATADIR%%/utils/voipcontrols/voipcontrols.tcl
2447	%%DATADIR%%/utils/webcamsn/pkgIndex.tcl
2448	%%DATADIR%%/utils/webcamsn/webcamsn.so
2449	@dirrm share/applications	2451	@dirrm share/applications
2450	@dirrm %%DATADIR%%/utils/webcamsn
2451	@dirrm %%DATADIR%%/utils/voipcontrols	2452	@dirrm %%DATADIR%%/utils/voipcontrols
2452	@dirrm %%DATADIR%%/utils/uri	2453	@dirrm %%DATADIR%%/utils/uri
2453	@dirrm %%DATADIR%%/utils/tcl_siren
2454	@dirrm %%DATADIR%%/utils/tclISF
2455	@dirrm %%DATADIR%%/utils/snit	2454	@dirrm %%DATADIR%%/utils/snit
2456	@dirrm %%DATADIR%%/utils/sha1	2455	@dirrm %%DATADIR%%/utils/sha1
2457	@dirrm %%DATADIR%%/utils/sexytile	2456	@dirrm %%DATADIR%%/utils/sexytile
Lines 2464-2483 Link Here
2464	@dirrm %%DATADIR%%/utils/md4	2463	@dirrm %%DATADIR%%/utils/md4
2465	@dirrm %%DATADIR%%/utils/log/msgs	2464	@dirrm %%DATADIR%%/utils/log/msgs
2466	@dirrm %%DATADIR%%/utils/log	2465	@dirrm %%DATADIR%%/utils/log
2467	@dirrm %%DATADIR%%/utils/linux/traydock
2468	@dirrm %%DATADIR%%/utils/linux/linflash
2469	@dirrm %%DATADIR%%/utils/linux
2470	@dirrm %%DATADIR%%/utils/http	2466	@dirrm %%DATADIR%%/utils/http
2471	@dirrm %%DATADIR%%/utils/framec	2467	@dirrm %%DATADIR%%/utils/framec
2472	@dirrm %%DATADIR%%/utils/farsight
2473	@dirrm %%DATADIR%%/utils/drawboard	2468	@dirrm %%DATADIR%%/utils/drawboard
2474	@dirrm %%DATADIR%%/utils/dpbrowser	2469	@dirrm %%DATADIR%%/utils/dpbrowser
2475	@dirrm %%DATADIR%%/utils/des	2470	@dirrm %%DATADIR%%/utils/des
2476	@dirrm %%DATADIR%%/utils/contentmanager	2471	@dirrm %%DATADIR%%/utils/contentmanager
2477	@dirrm %%DATADIR%%/utils/combobox	2472	@dirrm %%DATADIR%%/utils/combobox
2478	@dirrm %%DATADIR%%/utils/base64	2473	@dirrm %%DATADIR%%/utils/base64
2479	@dirrm %%DATADIR%%/utils/asyncresolver
2480	@dirrm %%DATADIR%%/utils/TkCximage
2481	@dirrm %%DATADIR%%/utils/BWidget-1.9.0/lang	2474	@dirrm %%DATADIR%%/utils/BWidget-1.9.0/lang
2482	@dirrm %%DATADIR%%/utils/BWidget-1.9.0/images	2475	@dirrm %%DATADIR%%/utils/BWidget-1.9.0/images
2483	@dirrm %%DATADIR%%/utils/BWidget-1.9.0	2476	@dirrm %%DATADIR%%/utils/BWidget-1.9.0
Lines 2652-2655 Link Here
2652	@dirrm %%DATADIR%%/desktop-icons/128x128	2645	@dirrm %%DATADIR%%/desktop-icons/128x128
2653	@dirrm %%DATADIR%%/desktop-icons	2646	@dirrm %%DATADIR%%/desktop-icons
2654	@dirrm %%DATADIR%%/ca-certs	2647	@dirrm %%DATADIR%%/ca-certs
		2648	@dirrm %%DATADIR%%/msnp2p/transport
		2649	@dirrm %%DATADIR%%/msnp2p
2655	@dirrm %%DATADIR%%	2650	@dirrm %%DATADIR%%