ports/61427: Update port: net/linphone

[KATO Tsuguru]

>Number:         61427
>Category:       ports
>Synopsis:       Update port: net/linphone
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 16 05:40:16 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Reaarange USE_GNOME
- Suppprt CONFIGURE_ARGS properly
- Replace WITHOUT_GNOME with WITHOUT_X11

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/net/linphone/Makefile net/linphone/Makefile
--- /usr/ports/net/linphone/Makefile	Tue Jan 13 14:00:42 2004
+++ net/linphone/Makefile	Fri Jan 16 19:17:42 2004
@@ -19,28 +19,28 @@
 		speex.2:${PORTSDIR}/audio/speex \
 		osip.9:${PORTSDIR}/net/libosip
 
+USE_GNOME=	gnomehack gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-ipv6
-.ifdef WITHOUT_GNOME
-CONFIGURE_ARGS+=--enable-gnome-ui=no \
-		--with-html-dir=${DOCSDIR}
+INSTALLS_SHLIB=	yes
+
+MAN1=		linphone.1 linphonec.1 sipomatic.1
+
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--enable-gnome_ui=no --with-html-dir=${DOCSDIR}
 PLIST_SUB+=	GNOME="@comment " \
 		GNOME_PATH="" \
 		HTMLDOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}"
 .else
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomepanel
+USE_GNOME+=	gnomepanel gnomeprefix
 DOCSDIR=	${GNOME_HTML_DIR}
-CONFIGURE_ARGS=	--enable-gnome-ui=yes
 PLIST_SUB+=	GNOME="" \
 		GNOME_PATH="gnome/" \
 		HTMLDOCSDIR="${GNOME_HTML_DIR:S,^${PREFIX}/,,}"
 .endif
-INSTALLS_SHLIB=	yes
-
-MAN1=		linphone.1 linphonec.1 sipomatic.1
 
 .include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted: