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

(-)gaim/Makefile (+10 lines)
Lines 44-49 Link Here
44 
CONFIGURE_ARGS+=	--disable-gnutls
 44 
CONFIGURE_ARGS+=	--disable-gnutls
45 
.endif
 45 
.endif
46 

          46
          

        

            

              
              
              47
              
.if defined(WITH_SILC)

            

            

              48
              
LIB_DEPENDS+=		silcclient-1.0.3:${PORTSDIR}/devel/silc-toolkit

            

            

              49
              
CONFIGURE_ARGS+=	--with-silc-includes=${LOCALBASE}/include/silc

            

            

              50
              
PLIST_SUB+=		SILC=""

            

            

              51
              
.else

            

            

              52
              
PLIST_SUB+=		SILC="@comment "

            

            

              53
              
.endif

            

            

              54
              

            

        

          47
          
.if !defined(WITHOUT_NSS)

          55
          
.if !defined(WITHOUT_NSS)

        

        

          48
          
LIB_DEPENDS+=		nss3:${PORTSDIR}/security/nss

          56
          
LIB_DEPENDS+=		nss3:${PORTSDIR}/security/nss

        

        

          49
          
CONFIGURE_ARGS+=	--with-nspr-includes=${LOCALBASE}/include/nspr \

          57
          
CONFIGURE_ARGS+=	--with-nspr-includes=${LOCALBASE}/include/nspr \

        

  

    
      
            Lines 93-98
          
      
      
        Link Here
      
    
  

        

          93
          
pre-everything::

          101
          
pre-everything::

        

        

          94
          
	@${ECHO_MSG} ""

          102
          
	@${ECHO_MSG} ""

        

        

          95
          
	@${ECHO_MSG} "Gaim has the following tunable option(s):"

          103
          
	@${ECHO_MSG} "Gaim has the following tunable option(s):"

        

            

              
              
              104
              
	@${ECHO_MSG} "	WITH_SILC		Build with Secure Internet Live Conferencing (SILC)"

            

        

          96
          
	@${ECHO_MSG} "	WITHOUT_GTKSPELL	Turns off spell checking"

          105
          
	@${ECHO_MSG} "	WITHOUT_GTKSPELL	Turns off spell checking"

        

        

          97
          
	@${ECHO_MSG} "	WITHOUT_AUDIO		Disable audio support"

          106
          
	@${ECHO_MSG} "	WITHOUT_AUDIO		Disable audio support"

        

        

          98
          
	@${ECHO_MSG} "	WITH_GNUTLS		Enable GNUTLS encryption support"

          107
          
	@${ECHO_MSG} "	WITH_GNUTLS		Enable GNUTLS encryption support"

        

  

    
      
            Lines 109-114
          
      
      
        Link Here
      
    
  

        

          109
          
	@${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' \

          118
          
	@${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' \

        

        

          110
          
		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \

          119
          
		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \

        

        

          111
          
		-e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \

          120
          
		-e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \

        

            

              
              
              121
              
		-e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} -ldl|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \

            

        

          112
          
		-e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${_TCL_VER} required|g' \

          122
          
		-e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${_TCL_VER} required|g' \

        

        

          113
          
		-e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${_TCL_VER:E}|' \

          123
          
		-e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${_TCL_VER:E}|' \

        

        

          114
          
			${WRKSRC}/configure

          124
          
			${WRKSRC}/configure

        



(-)gaim/files/patch-src_protocols_silc_chat.c
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- src/protocols/silc/chat.c.orig	Wed Jun  2 14:36:55 2004

            

            

              2
              
+++ src/protocols/silc/chat.c	Wed Jun  2 14:37:03 2004

            

            

              3
              
@@ -1081,7 +1081,7 @@

            

            

              4
              
 	   do both 1 and 2 with default keys. */

            

            

              5
              
 

            

            

              6
              
 	/* Call JOIN */

            

            

              7
              
-	if (passphrase)

            

            

              8
              
+	if (strlen(passphrase))

            

            

              9
              
 		silc_client_command_call(client, conn, NULL, "JOIN",

            

            

              10
              
 					 channel, passphrase, "-auth", "-founder", NULL);

            

            

              11
              
 	else

            



(-)gaim/pkg-plist
      (+1 lines)




  

    
      
            Lines 16-21
          
      
      
        Link Here
      
    
  

        

          16
          
lib/gaim/libnapster.so

          16
          
lib/gaim/libnapster.so

        

        

          17
          
lib/gaim/libnovell.so

          17
          
lib/gaim/libnovell.so

        

        

          18
          
lib/gaim/liboscar.so

          18
          
lib/gaim/liboscar.so

        

            

              
              
              19
              
%%SILC%%lib/gaim/libsilcgaim.so

            

        

          19
          
lib/gaim/libyahoo.so

          20
          
lib/gaim/libyahoo.so

        

        

          20
          
lib/gaim/libzephyr.so

          21
          
lib/gaim/libzephyr.so

        

        

          21
          
lib/gaim/notify.so

          22
          
lib/gaim/notify.so

        






  

  Return to bug 67483