7 files changed, 26 insertions, 26 deletions

diff --git a/sysutils/npadmin/Makefile b/sysutils/npadmin/Makefile
index caef6e4b59d8..6dd1c2b113da 100644
--- a/sysutils/npadmin/Makefile
+++ b/sysutils/npadmin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	npadmin
 PORTVERSION=	0.8.7
+PORTREVISION=	1
 CATEGORIES=	sysutils print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,15 +15,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	dom@happygiraffe.net
 COMMENT=	An SNMP based command line network printer management tool
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
 MAN1=		npadmin.1
 
+USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	LIBS=-lgnugetopt LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
-
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
diff --git a/sysutils/pwgen/Makefile b/sysutils/pwgen/Makefile
index b63ce3e63dba..94a6253e4e58 100644
--- a/sysutils/pwgen/Makefile
+++ b/sysutils/pwgen/Makefile
@@ -7,15 +7,18 @@
 
 PORTNAME=	pwgen
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tricknology.org/ports/
 
 MAINTAINER=	oddbjorn@tricknology.org
 COMMENT=	A simple password generator
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 
 MAN1=		pwgen.1
 
diff --git a/sysutils/pwgen/files/patch-aa b/sysutils/pwgen/files/patch-aa
index 6c2cdcbb438c..25108e8189e2 100644
--- a/sysutils/pwgen/files/patch-aa
+++ b/sysutils/pwgen/files/patch-aa
@@ -1,6 +1,6 @@
 --- Makefile.orig	Tue Jan  4 22:54:58 2000
-+++ Makefile	Sat Aug 12 00:49:23 2000
-@@ -6,17 +6,18 @@
++++ Makefile	Sun Jul  6 20:15:32 2003
+@@ -6,17 +6,17 @@
  OPTS	= -DALLBYOPTS -DRAND48 -DDEBIAN
  
  # Standard items
@@ -8,12 +8,10 @@
 -CFLAGS	= -O3
 -LD	= cc
 -#LDFLAGS	= -g
--LIBS	= -lm
 +CC	?= gcc
-+CFLAGS	+= -I${LOCALBASE}/include
++CFLAGS	+= ${CPPFLAGS}
 +LD	= ${CC}
-+LDFLAGS	= -L${LOCALBASE}/lib
-+LIBS	= -lm -lgnugetopt
+ LIBS	= -lm
  INSTALL	= install -s
  INFLAGS	=
  
@@ -26,7 +24,7 @@
  
  # End configuration section
  
-@@ -27,10 +28,8 @@
+@@ -27,10 +27,8 @@
  	./pwgen 8 20
  
  install: all
diff --git a/sysutils/pwgen2/Makefile b/sysutils/pwgen2/Makefile
index b63ce3e63dba..94a6253e4e58 100644
--- a/sysutils/pwgen2/Makefile
+++ b/sysutils/pwgen2/Makefile
@@ -7,15 +7,18 @@
 
 PORTNAME=	pwgen
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tricknology.org/ports/
 
 MAINTAINER=	oddbjorn@tricknology.org
 COMMENT=	A simple password generator
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 
 MAN1=		pwgen.1
 
diff --git a/sysutils/pwgen2/files/patch-aa b/sysutils/pwgen2/files/patch-aa
index 6c2cdcbb438c..25108e8189e2 100644
--- a/sysutils/pwgen2/files/patch-aa
+++ b/sysutils/pwgen2/files/patch-aa
@@ -1,6 +1,6 @@
 --- Makefile.orig	Tue Jan  4 22:54:58 2000
-+++ Makefile	Sat Aug 12 00:49:23 2000
-@@ -6,17 +6,18 @@
++++ Makefile	Sun Jul  6 20:15:32 2003
+@@ -6,17 +6,17 @@
  OPTS	= -DALLBYOPTS -DRAND48 -DDEBIAN
  
  # Standard items
@@ -8,12 +8,10 @@
 -CFLAGS	= -O3
 -LD	= cc
 -#LDFLAGS	= -g
--LIBS	= -lm
 +CC	?= gcc
-+CFLAGS	+= -I${LOCALBASE}/include
++CFLAGS	+= ${CPPFLAGS}
 +LD	= ${CC}
-+LDFLAGS	= -L${LOCALBASE}/lib
-+LIBS	= -lm -lgnugetopt
+ LIBS	= -lm
  INSTALL	= install -s
  INFLAGS	=
  
@@ -26,7 +24,7 @@
  
  # End configuration section
  
-@@ -27,10 +28,8 @@
+@@ -27,10 +27,8 @@
  	./pwgen 8 20
  
  install: all
diff --git a/sysutils/tmpwatch/Makefile b/sysutils/tmpwatch/Makefile
index 167e32c4dfb2..c6d94450d669 100644
--- a/sysutils/tmpwatch/Makefile
+++ b/sysutils/tmpwatch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tmpwatch
 PORTVERSION=	2.8.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_REDHAT_LINUX}
 MASTER_SITE_SUBDIR=	updates/7.2/en/os/SRPMS
@@ -16,11 +17,11 @@ MAINTAINER=	markp@FreeBSD.org
 COMMENT=	A utility for removing files based on when they were last accessed
 
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+
+USE_GETOPT_LONG=yes
 
 CPIO?=		/usr/bin/cpio
-CFLAGS+=	-I${LOCALBASE}/include -DVERSION=\"${PORTVERSION}\"
-LDFLAGS+=	-L${LOCALBASE}/lib -lgnugetopt
+CFLAGS+=	${CPPFLAGS} -DVERSION=\"${PORTVERSION}\"
 MAN8=		tmpwatch.8
 
 do-extract:
diff --git a/sysutils/xin/Makefile b/sysutils/xin/Makefile
index 69a707a5a6b5..17dc41ee2b6b 100644
--- a/sysutils/xin/Makefile
+++ b/sysutils/xin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xin
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	utils/file
@@ -14,10 +15,8 @@ MASTER_SITE_SUBDIR=	utils/file
 MAINTAINER=	markp@FreeBSD.org
 COMMENT=	Splits standard input and pipes into a command
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 MAN1=		xin.1
 
 .include <bsd.port.mk>