ports/80683: [maintainer update] comms/gnokii: fix build when WITHOUT_X11

[Guido Falsi]

>Number:         80683
>Category:       ports
>Synopsis:       [maintainer update] comms/gnokii: fix build when WITHOUT_X11
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 06 01:30:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Guido Falsi
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
none
>Environment:
System: FreeBSD wedge.madpilot.net 5.4-STABLE FreeBSD 5.4-STABLE #2: Mon May 2 20:53:47 CEST 2005 root at wedge.madpilot.net:/usr/obj/usr/src/sys/WEDGE i386

>Description:

Fix build when WITHOUT_X11 is defined.

Sorry this slipped my tests.

>How-To-Repeat:

>Fix:

diff -ruN gnokii.old/files/patch-Makefile.global.in gnokii/files/patch-Makefile.global.in
--- gnokii.old/files/patch-Makefile.global.in	Fri May  6 03:12:30 2005
+++ gnokii/files/patch-Makefile.global.in	Fri May  6 03:20:52 2005
@@ -1,5 +1,5 @@
---- Makefile.global.in.orig	Tue Jul  6 11:57:56 2004
-+++ Makefile.global.in	Tue Jul  6 11:59:17 2004
+--- Makefile.global.in.orig	Fri Apr 29 22:40:17 2005
++++ Makefile.global.in	Fri May  6 03:20:25 2005
 @@ -21,14 +21,14 @@
  
  bindir         = @bindir@
@@ -18,3 +18,12 @@
  docdir         = ${prefix}/share/doc/${PACKAGE}
  locdir         = @datadir@/locale
  
+@@ -46,7 +46,7 @@
+ CC             = @CC@
+ CFLAGS         = @CFLAGS@
+ CPPFLAGS       = @CPPFLAGS@
+-LIBS           = @LIBS@
++LIBS           = @LIBS@ -lroken -lcrypt
+ LDFLAGS        = @LDFLAGS@
+ LEX            = @LEX@
+ AR             = @AR@
diff -ruN gnokii.old/files/patch-configure gnokii/files/patch-configure
--- gnokii.old/files/patch-configure	Fri May  6 03:12:30 2005
+++ gnokii/files/patch-configure	Fri May  6 03:16:40 2005
@@ -1,23 +1,23 @@
 --- configure.orig	Fri Apr 29 22:40:40 2005
-+++ configure	Thu May  5 14:20:32 2005
++++ configure	Fri May  6 03:16:19 2005
 @@ -26347,13 +26347,15 @@
  # First of all, check if the user has set any of the PTHREAD_LIBS,
  # etcetera environment variables, and if threads linking works using
  # them:
 -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-+if test x"%%PTHREAD_LIBS%%%%PTHREAD_CFLAGS%%" != x; then
-+	PTHREAD_CFLAGS="%%PTHREAD_CFLAGS%%"
-+	PTHREAD_LIBS="%%PTHREAD_LIBS%%"
++if test x"-pthread" != x; then
++	PTHREAD_CFLAGS=""
++	PTHREAD_LIBS="-pthread"
          save_CFLAGS="$CFLAGS"
 -        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        CFLAGS="$CFLAGS %%PTHREAD_CFLAGS%%"
++        CFLAGS="$CFLAGS "
          save_LIBS="$LIBS"
 -        LIBS="$PTHREAD_LIBS $LIBS"
 -        echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
 -echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6
-+        LIBS="%%PTHREAD_LIBS%% $LIBS"
-+        echo "$as_me:$LINENO: checking for pthread_join in LIBS=%%PTHREAD_LIBS%% with CFLAGS=%%PTHREAD_CFLAGS%%" >&5
-+echo $ECHO_N "checking for pthread_join in LIBS=%%PTHREAD_LIBS%% with CFLAGS=%%PTHREAD_CFLAGS%%... $ECHO_C" >&6
++        LIBS="-pthread $LIBS"
++        echo "$as_me:$LINENO: checking for pthread_join in LIBS=-pthread with CFLAGS=" >&5
++echo $ECHO_N "checking for pthread_join in LIBS=-pthread with CFLAGS=... $ECHO_C" >&6
          cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -35,16 +35,7 @@
  OLD_LIBS="$LIBS"
  OLD_CFLAGS="$CFLAGS"
 -LIBS="$LIBS $ICAL_LIBS -lpthread -lical"
-+LIBS="$LIBS $ICAL_LIBS -L/usr/local %%PTHREAD_LIBS%% -lical"
++LIBS="$LIBS $ICAL_LIBS -L/usr/local -pthread -lical"
  CFLAGS="$CFLAGS $ICAL_CFLAGS"
  echo "$as_me:$LINENO: checking whether libical is installed" >&5
  echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6
-@@ -29111,7 +29113,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&5
- echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6
- if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then
--   XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11"
-+   XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11 -lroken -lcrypt"
-               cat >>confdefs.h <<\_ACEOF
- #define XPM 1
- _ACEOF
>Release-Note:
>Audit-Trail:
>Unformatted: