get rid of libgnugetopt dependency for -CURRENT,

use USE_GETOPT_LONG instead.
respect CC, CFLAGS.
use getopt_long() instead of getopt_long_only().

3 files changed, 49 insertions, 8 deletions

diff --git a/x11/cnslock/Makefile b/x11/cnslock/Makefile
index 9e485a1..8646e68 100644
--- a/x11/cnslock/Makefile
+++ b/x11/cnslock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cnslock
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://www.dockapps.com/download.php/id/181/ \
 		http://freebsd.nsu.ru/distfiles/
@@ -14,12 +15,13 @@ MASTER_SITES=	http://www.dockapps.com/download.php/id/181/ \
 MAINTAINER=	danfe@regency.nsu.ru
 COMMENT=	A visual indicator of the states of the three "lock" buttons
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 
+MAKE_ENV=	LDFLAGS="${LDFLAGS}"
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 
diff --git a/x11/cnslock/files/patch-Makefile b/x11/cnslock/files/patch-Makefile
index 5b107b3..7d00a28 100644
--- a/x11/cnslock/files/patch-Makefile
+++ b/x11/cnslock/files/patch-Makefile
@@ -1,16 +1,16 @@
---- Makefile.orig	Thu Apr 10 19:48:41 2003
-+++ Makefile	Thu Apr 10 20:03:05 2003
-@@ -2,11 +2,11 @@
+--- Makefile.orig	Sun Oct 27 09:34:22 2002
++++ Makefile	Sun Jul  6 20:33:58 2003
+@@ -2,11 +2,10 @@
  PREFIX = /usr/local
  
  VERSION = 1.02
 -CFLAGS = -O3 -Wall `gtk-config --cflags` -DVERSION=$(VERSION) ${EXTRA}
-+CFLAGS += `gtk12-config --cflags` -DVERSION=$(VERSION) ${EXTRA}
- CC = gcc
+-CC = gcc
++CFLAGS += ${CPPFLAGS} `${GTK_CONFIG} --cflags` -DVERSION=$(VERSION) ${EXTRA}
  OBJS = cnslock.o kleds.o applet.o
  
 -LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
-+LIBS = `gtk12-config --libs | sed "s/-lgtk12//g"` -lgnugetopt
++LIBS = `${GTK_CONFIG} --libs | sed "s/-lgtk12//g"` ${LDFLAGS}
  
  all: cnslock
  
diff --git a/x11/cnslock/files/patch-cnslock.c b/x11/cnslock/files/patch-cnslock.c
new file mode 100644
index 0000000..c1c46c6
--- /dev/null
+++ b/x11/cnslock/files/patch-cnslock.c
@@ -0,0 +1,39 @@
+--- cnslock.c.orig	Sun Oct 27 09:32:56 2002
++++ cnslock.c	Mon Jul  7 04:47:44 2003
+@@ -212,29 +212,26 @@
+     int c = 0;
+ 
+     struct option long_options[] = {
+-      {"help",         no_argument,       NULL,          1},
+-      {"h",            no_argument,       NULL,          1},
+-      {"version",      no_argument,       NULL,          2},
+-      {"v",            no_argument,       NULL,          2},
+-	  {"window",       no_argument,       NULL,          3},
+-	  {"w",            no_argument,       NULL,          3},
++      {"help",         no_argument,       NULL,        'h'},
++      {"version",      no_argument,       NULL,        'v'},
++	  {"window",       no_argument,       NULL,        'w'},
+ 
+       {0,              0,                 0,             0}
+     };
+ 
+-    while ((c = getopt_long_only(argc, argv, "", long_options, NULL)) != -1)
++    while ((c = getopt_long(argc, argv, "", long_options, NULL)) != -1)
+ 	{
+ 		switch(c)
+ 	  	{
+-      		case 1:
++      		case 'h':
+ 				do_help();
+ 				exit(0);
+ 				break;
+-			case 2:
++			case 'v':
+ 				do_version();
+ 				exit(0);
+ 				break;
+-			case 3:
++			case 'w':
+ 				manager_style = 1;
+ 				break;
+ 		}