aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFUJISHIMA Satsuki <sf@FreeBSD.org>2003-07-14 02:53:03 +0000
committerFUJISHIMA Satsuki <sf@FreeBSD.org>2003-07-14 02:53:03 +0000
commitb185046be2ec03555daaf4f26d38542c403a9955 (patch)
tree0274ce607614533de66837fc1f70d4c35770d9e1
parent88d002074007544d532f2495aeb93729291e6275 (diff)
downloadports-b185046be2ec03555daaf4f26d38542c403a9955.tar.gz
ports-b185046be2ec03555daaf4f26d38542c403a9955.zip
get rid of libgnugetopt dependency for -CURRENT,
use USE_GETOPT_LONG instead.
Notes
Notes: svn path=/head/; revision=84842
-rw-r--r--archivers/cabextract/Makefile6
-rw-r--r--astro/rmap/Makefile10
-rw-r--r--audio/cdparanoia/Makefile9
-rw-r--r--audio/cdparanoia/files/patch-Makefile.in12
-rw-r--r--audio/denemo/Makefile8
-rw-r--r--audio/mp3_check/Makefile5
-rw-r--r--audio/mp3_check/files/patch-aa4
-rw-r--r--audio/osalp/Makefile10
-rw-r--r--audio/quelcom/Makefile6
-rw-r--r--audio/rawrec/Makefile9
-rw-r--r--audio/rioutil/Makefile10
-rw-r--r--audio/rioutil/files/patch-aa20
-rw-r--r--chinese/oto/Makefile7
-rw-r--r--chinese/oto/files/patch-src::Makefile.in28
-rw-r--r--comms/bayonne/Makefile5
-rw-r--r--converters/psiconv/Makefile6
-rw-r--r--databases/postgresql-devel-server/Makefile4
-rw-r--r--databases/postgresql-devel/Makefile4
-rw-r--r--databases/postgresql7/Makefile4
-rw-r--r--databases/postgresql72/Makefile5
-rw-r--r--databases/postgresql73-server/Makefile4
-rw-r--r--databases/postgresql73/Makefile4
-rw-r--r--databases/postgresql74-server/Makefile4
-rw-r--r--databases/postgresql80-server/Makefile4
-rw-r--r--databases/postgresql81-server/Makefile4
-rw-r--r--databases/postgresql82-server/Makefile4
-rw-r--r--databases/postgresql83-server/Makefile4
-rw-r--r--databases/postgresql84-server/Makefile4
-rw-r--r--databases/postgresql90-server/Makefile4
-rw-r--r--databases/postgresql91-server/Makefile4
-rw-r--r--databases/postgresql92-server/Makefile4
-rw-r--r--databases/pxtools/Makefile10
-rw-r--r--databases/pxtools/files/patch-src::Makefile.in9
-rw-r--r--deskutils/glabels/Makefile5
-rw-r--r--deskutils/glabels/files/patch-barcode-0.98_Makefile.in11
-rw-r--r--devel/commoncpp/Makefile6
-rw-r--r--editors/lfhex/Makefile7
-rw-r--r--editors/lfhex/files/patch-src::Makefile.in6
-rw-r--r--emulators/tuxnes/Makefile4
-rw-r--r--ftp/prozilla/Makefile14
-rw-r--r--games/burgerspace/Makefile9
-rw-r--r--games/heroes/Makefile10
-rw-r--r--games/nethack33/Makefile8
-rw-r--r--games/nethack33/files/patch-ad2
-rw-r--r--graphics/qiv/Makefile9
-rw-r--r--graphics/stamp/Makefile10
-rw-r--r--graphics/vp/Makefile11
-rw-r--r--graphics/yafaray/Makefile10
-rw-r--r--graphics/yafray/Makefile10
-rw-r--r--lang/tinycobol/Makefile12
-rw-r--r--mail/liamail/Makefile9
-rw-r--r--math/gexpr/Makefile9
-rw-r--r--math/gexpr/files/patch-Makefile8
-rw-r--r--math/mtrxmath/Makefile9
-rw-r--r--math/mtrxmath/files/patch-Makefile8
-rw-r--r--misc/dvorak7min/Makefile12
-rw-r--r--misc/xosd/Makefile7
-rw-r--r--multimedia/dvdauthor/Makefile7
-rw-r--r--multimedia/transcode/Makefile12
-rw-r--r--net-mgmt/nagios/Makefile14
-rw-r--r--net-mgmt/nagios12/Makefile14
-rw-r--r--net-mgmt/nagios2/Makefile14
-rw-r--r--net-mgmt/netmask/Makefile13
-rw-r--r--net-mgmt/netsaint/Makefile11
-rw-r--r--net/nagios/Makefile14
-rw-r--r--net/nc/Makefile6
-rw-r--r--net/netmask/Makefile13
-rw-r--r--net/netsaint/Makefile11
-rw-r--r--net/ntop/Makefile8
-rw-r--r--net/pptpclient/Makefile16
-rw-r--r--net/rfbproxy/Makefile6
-rw-r--r--news/yencode/Makefile10
-rw-r--r--palm/pilot-link-devel/Makefile8
-rw-r--r--palm/pilot-link/Makefile8
-rw-r--r--security/authforce/Makefile28
-rw-r--r--security/ccrypt/Makefile6
-rw-r--r--security/dirmngr/Makefile3
-rw-r--r--security/pinentry/Makefile3
-rw-r--r--security/pinentry/files/patch-curses::Makefile.am2
-rw-r--r--security/pinentry/files/patch-gtk::Makefile.am2
-rw-r--r--security/pinentry/files/patch-qt::Makefile.am2
-rw-r--r--security/poc/Makefile8
-rw-r--r--security/smtpmap/Makefile6
-rw-r--r--sysutils/npadmin/Makefile6
-rw-r--r--sysutils/pwgen/Makefile5
-rw-r--r--sysutils/pwgen/files/patch-aa12
-rw-r--r--sysutils/pwgen2/Makefile5
-rw-r--r--sysutils/pwgen2/files/patch-aa12
-rw-r--r--sysutils/tmpwatch/Makefile7
-rw-r--r--sysutils/xin/Makefile5
-rw-r--r--x11/gxset/Makefile4
-rw-r--r--x11/wmappl/Makefile10
-rw-r--r--x11/wmappl/files/patch-Makefile8
93 files changed, 359 insertions, 401 deletions
diff --git a/archivers/cabextract/Makefile b/archivers/cabextract/Makefile
index 800a2727d92c..b79b8dff41ab 100644
--- a/archivers/cabextract/Makefile
+++ b/archivers/cabextract/Makefile
@@ -7,17 +7,15 @@
PORTNAME= cabextract
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= http://www.kyz.uklinux.net/downloads/
MAINTAINER= sobomax@FreeBSD.org
COMMENT= A program to extract Microsoft cabinet (.CAB) files
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
MAN1= cabextract.1
diff --git a/astro/rmap/Makefile b/astro/rmap/Makefile
index 3f32d1f7003c..1a8fe01e22b7 100644
--- a/astro/rmap/Makefile
+++ b/astro/rmap/Makefile
@@ -7,21 +7,21 @@
PORTNAME= rmap
PORTVERSION= 1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= astro
MASTER_SITES= http://www.reza.net/rmap/
MAINTAINER= trevor@FreeBSD.org
COMMENT= Generates images of the Earth centered at a particular location
-LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2 \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2
MAN1= rmap.1
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lgnugetopt"
+CPPFLAGS= -I${LOCALBASE}/include
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index 5cd7ed93620c..63c5acf213f2 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cdparanoia
PORTVERSION= 3.9.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio sysutils
MASTER_SITES= http://www.xiph.org/paranoia/download/
DISTNAME= ${PORTNAME}-${PORTVERSION:C/^3\./III-alpha/}
@@ -16,12 +16,7 @@ EXTRACT_SUFX= .src.tgz
MAINTAINER= corecode@corecode.ath.cx
COMMENT= A CDDA extraction tool (also known as ripper)
-.if !exists(/usr/include/getopt.h)
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lgnugetopt"
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-.endif
-
+USE_GETOPT_LONG=yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/cdparanoia/files/patch-Makefile.in b/audio/cdparanoia/files/patch-Makefile.in
index 170737364d99..c7b253824ff2 100644
--- a/audio/cdparanoia/files/patch-Makefile.in
+++ b/audio/cdparanoia/files/patch-Makefile.in
@@ -1,17 +1,11 @@
-Index: Makefile.in
-===================================================================
-RCS file: /home/cvs/cdparanoia/Makefile.in,v
-retrieving revision 1.1.1.1
-retrieving revision 1.7
-diff -u -r1.1.1.1 -r1.7
---- Makefile.in 2003/01/05 09:46:26 1.1.1.1
-+++ Makefile.in 2003/02/13 02:41:38 1.7
+--- Makefile.in.orig Wed Mar 28 07:46:58 2001
++++ Makefile.in Mon Jul 7 06:24:17 2003
@@ -8,7 +8,7 @@
srcdir=@srcdir@
@SET_MAKE@
-FLAGS=@TYPESIZES@ @CFLAGS@
-+FLAGS=@TYPESIZES@ @CFLAGS@ -I./interface
++FLAGS=@TYPESIZES@ @CPPFLAGS@ @CFLAGS@ -I./interface
OPT=@OPT@ $(FLAGS)
DEBUG=@DEBUG@ $(FLAGS)
CC=@CC@
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 93d0ed8a945c..1ef885658adf 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= denemo
PORTVERSION= 0.5.9
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,10 +15,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= trevor@FreeBSD.org
COMMENT= Graphical score editor
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- intl.4:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
xml.5:${PORTSDIR}/textproc/libxml
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
PLIST= ${WRKDIR}/pkg-plist
SHARED= denemo.conf denemo.keymaprc english.keymaprc french.keymaprc
@@ -29,11 +30,10 @@ USE_X_PREFIX= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500113
-BROKEN= "Does not compile"
+BROKEN= "Does not compile"
.endif
post-configure:
- ${PERL} -pi -e "s:module12:module12 -lgnugetopt:g" ${WRKSRC}/Makefile
${PERL} -pi -e "s:<wait.h:<sys/wait.h:g" ${WRKSRC}/*.c
pre-install:
diff --git a/audio/mp3_check/Makefile b/audio/mp3_check/Makefile
index 83ce30ad7989..6438aa7333c0 100644
--- a/audio/mp3_check/Makefile
+++ b/audio/mp3_check/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mp3_check
PORTVERSION= 1.98
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mp3check
@@ -14,6 +15,8 @@ MASTER_SITE_SUBDIR= mp3check
MAINTAINER= ericb@thedeepsky.com
COMMENT= Verifies the integrity of mp3 audio files
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
+MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
.include <bsd.port.mk>
diff --git a/audio/mp3_check/files/patch-aa b/audio/mp3_check/files/patch-aa
index 25fe0e723dce..d75fed36f1db 100644
--- a/audio/mp3_check/files/patch-aa
+++ b/audio/mp3_check/files/patch-aa
@@ -6,8 +6,8 @@
LOCALBASE ?= /usr/local
-CFLAGS += -Wall -Werror
-OPT_FLAGS = -L${LOCALBASE}/lib
-+CFLAGS += -Wall -I${LOCALBASE}/include
-+OPT_FLAGS = -L${LOCALBASE}/lib -lgnugetopt
++CFLAGS += -Wall ${CPPFLAGS}
++OPT_FLAGS = -L${LOCALBASE}/lib ${LDFLAGS}
OBJS = mp3_check.o \
mp3_check_misc.o
diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile
index eb4a982f008c..ee651b0e4a49 100644
--- a/audio/osalp/Makefile
+++ b/audio/osalp/Makefile
@@ -8,6 +8,7 @@
PORTNAME= osalp
PORTVERSION= 0.7.3
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,14 +18,15 @@ COMMENT= Open Source Audio Library Project
BUILD_DEPENDS= lame:${PORTSDIR}/audio/lame \
mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS= vorbis.2:${PORTSDIR}/audio/libvorbis \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= vorbis.2:${PORTSDIR}/audio/libvorbis
RUN_DEPENDS= ${BUILD_DEPENDS}
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-all
INSTALLS_SHLIB= yes
diff --git a/audio/quelcom/Makefile b/audio/quelcom/Makefile
index 22e3146daeed..69e944926011 100644
--- a/audio/quelcom/Makefile
+++ b/audio/quelcom/Makefile
@@ -7,14 +7,14 @@
PORTNAME= quelcom
PORTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.etse.urv.es/~dmanye/quelcom/src/
MAINTAINER= greid@FreeBSD.org
COMMENT= A set of command-line utilities for MP3 and wave files
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
USE_GMAKE= yes
MAKEFILE= makefile
@@ -25,7 +25,7 @@ MAN1= qmp3check.1 qmp3cut.1 qmp3info.1 qmp3join.1 qmp3report.1 \
.include <bsd.port.pre.mk>
.if ${OSVERSION} > 500000
-BROKEN= "does not build on FreeBSD 5.x; cout.form cannot be used with GCC 3.x"
+BROKEN= "does not build on FreeBSD 5.x; cout.form cannot be used with GCC 3.x"
.endif
do-install:
diff --git a/audio/rawrec/Makefile b/audio/rawrec/Makefile
index b23e6ce4bd20..27c02312fe67 100644
--- a/audio/rawrec/Makefile
+++ b/audio/rawrec/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rawrec
PORTVERSION= 0.9.97
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
${MASTER_SITE_SOURCEFORGE}
@@ -18,15 +18,14 @@ MASTER_SITE_SUBDIR= apps/sound/recorders \
MAINTAINER= ports@FreeBSD.org
COMMENT= A utility to record and playback raw audio data
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
WRKSRC= ${WRKDIR}/${DISTNAME}/src
+USE_GETOPT_LONG=yes
USE_REINPLACE= yes
USE_GMAKE= yes
MAKE_ARGS= CC="${CC}" \
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-lgnugetopt -lm ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+ CFLAGS="${CPPFLAGS} ${CFLAGS} ${PTHREAD_CFLAGS}" \
+ LDFLAGS="${LDFLAGS} -lm ${PTHREAD_LIBS}"
MAN1= rawrec.1
MLINKS= rawrec.1 rawplay.1
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index edd19a28416a..89bee16da7de 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -5,17 +5,17 @@
# $FreeBSD$
#
-PORTNAME= rioutil
+PORTNAME= rioutil
PORTVERSION= 1.0.6
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+PORTREVISION= 1
+CATEGORIES= audio
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A program to inferface with the Rio600, Rio800 and psa[play devices
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/audio/rioutil/files/patch-aa b/audio/rioutil/files/patch-aa
deleted file mode 100644
index d4eb5985b4dc..000000000000
--- a/audio/rioutil/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig Fri Dec 14 08:34:33 2001
-+++ configure Sat Dec 15 01:42:47 2001
-@@ -1672,7 +1672,7 @@
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-lgnugetopt $LIBS"
-+LIBS="-L${prefix}/lib -lgnugetopt $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1678 "configure"
- #include "confdefs.h"
-@@ -1706,7 +1706,7 @@
- #define $ac_tr_lib 1
- EOF
-
-- LIBS="-lgnugetopt $LIBS"
-+ LIBS="-L${prefix}/lib -lgnugetopt $LIBS"
-
- else
- echo "$ac_t""no" 1>&6
diff --git a/chinese/oto/Makefile b/chinese/oto/Makefile
index 73867e215b47..7cc5d1332a2c 100644
--- a/chinese/oto/Makefile
+++ b/chinese/oto/Makefile
@@ -7,6 +7,7 @@
PORTNAME= oto
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= chinese print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,12 +15,14 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= statue@freebsd.sinica.edu.tw
COMMENT= Show you font info and add new 'name' and 'cmap' tables
-LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
+USE_GETOPT_LONG=yes
HAS_CONFIGURE= YES
USE_GMAKE= YES
USE_REINPLACE= yes
+CPPFLAGS= -I${LOCALBASE}/include
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="-L${LOCALBASE}/lib -liconv"
.include <bsd.port.pre.mk>
post-patch:
diff --git a/chinese/oto/files/patch-src::Makefile.in b/chinese/oto/files/patch-src::Makefile.in
deleted file mode 100644
index bc62f9295ed8..000000000000
--- a/chinese/oto/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/Makefile.in.orig Sun Dec 15 19:11:54 2002
-+++ src/Makefile.in Sun Dec 15 19:20:48 2002
-@@ -75,14 +75,14 @@
- directory.c name.c cmap.c
-
-
--oto_LDADD = -lm
-+oto_LDADD = -lm -L/usr/local/lib -liconv -lgnugetopt
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
- PROGRAMS = $(bin_PROGRAMS)
-
-
--DEFS = @DEFS@ -I. -I$(srcdir) -I..
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I/usr/local/include
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
-@@ -92,7 +92,7 @@
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+LINK = $(CCLD) $(DEFS) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- DATA = $(pkgdata_DATA)
-
- DIST_COMMON = Makefile.am Makefile.in
diff --git a/comms/bayonne/Makefile b/comms/bayonne/Makefile
index 2abd2a897ace..db247310e681 100644
--- a/comms/bayonne/Makefile
+++ b/comms/bayonne/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bayonne
PORTVERSION= 0.5.3
+PORTREVISION= 1
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://www.voxilla.org/pub/bayonne/
@@ -19,9 +20,9 @@ BROKEN= "Port is outdated and there is no known working Hardware for FreeBSD >
LIB_DEPENDS= ccgnu2-1.0.0:${PORTSDIR}/devel/commoncpp \
ccscript-1.4.0:${PORTSDIR}/lang/ccscript \
- ccaudio.0:${PORTSDIR}/audio/ccaudio \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+ ccaudio.0:${PORTSDIR}/audio/ccaudio
+USE_GETOPT_LONG=yes
USE_GMAKE= yes
USE_LIBTOOL= yes
USE_AUTOCONF= yes
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index 165a4f42a401..49b529bf2de8 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -7,19 +7,17 @@
PORTNAME= psiconv
PORTVERSION= 0.8.3
+PORTREVISION= 1
CATEGORIES= converters devel
MASTER_SITES= http://huizen.dds.nl/~frodol/psiconv/
MAINTAINER= gnome@FreeBSD.org
COMMENT= A conversion utility to convert Psion 5(MX) files into other formats
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-imagemagick=no
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
.include <bsd.port.mk>
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index 7c2c8a8f3f1a..4648c7d9ffff 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.4.2003.06.30
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= http://freebsd.sean.chittenden.org/ports/ \
http://people.freebsd.org/~seanc/ports/
@@ -38,7 +38,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
--with-docdir=${LOCALBASE}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql72/Makefile b/databases/postgresql72/Makefile
index 057d35dc1374..78ca102b5a18 100644
--- a/databases/postgresql72/Makefile
+++ b/databases/postgresql72/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.4
+PORTREVISION= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -36,9 +37,7 @@ CONFIGURE_ARGS= --enable-locale --enable-syslog --with-CXX \
--with-includes=${LOCALBASE}/include
.if !defined(WITHOUT_GNUGETOPT)
-LDFLAGS+= -L${LOCALBASE}/lib -lgnugetopt
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
# if you want localized messages, make -DWITH_GETTEXT
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 801307228a86..3c781ee37849 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_GNUGETOPT)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
.endif
.if !defined(WITHOUT_GETTEXT)
diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile
index 97af0376b668..65bb8956da90 100644
--- a/databases/pxtools/Makefile
+++ b/databases/pxtools/Makefile
@@ -7,19 +7,21 @@
PORTNAME= pxtools
PORTVERSION= 0.0.19
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://jan.kneschke.de/projects/pxtools/download/
MAINTAINER= jedgar@FreeBSD.org
COMMENT= Collection of tools to work with Paradox databases
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- intl.4:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
@${REINPLACE_CMD} -e 's|-O2|${CFLAGS}|' \
diff --git a/databases/pxtools/files/patch-src::Makefile.in b/databases/pxtools/files/patch-src::Makefile.in
index 41b4fa8960f1..9c8d22975fde 100644
--- a/databases/pxtools/files/patch-src::Makefile.in
+++ b/databases/pxtools/files/patch-src::Makefile.in
@@ -1,14 +1,5 @@
--- src/Makefile.in.orig Tue Jul 16 07:12:57 2002
+++ src/Makefile.in Sat Sep 28 20:02:35 2002
-@@ -140,7 +140,7 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lgnugetopt
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/pxconvert.Po $(DEPDIR)/pxcsvdump.Po \
- @AMDEP_TRUE@ $(DEPDIR)/pxinfo.Po $(DEPDIR)/pxparse.Po \
@@ -195,7 +195,7 @@
$(LINK) $(pxcsvdump_LDFLAGS) $(pxcsvdump_OBJECTS) $(pxcsvdump_LDADD) $(LIBS)
pxinfo$(EXEEXT): $(pxinfo_OBJECTS) $(pxinfo_DEPENDENCIES)
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 20c0a0881018..a862fa40c2b7 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -7,16 +7,17 @@
PORTNAME= glabels
PORTVERSION= 1.91.1
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://snaught.com/glabels/source/
MAINTAINER= martin.klaffenboeck@gmx.at
COMMENT= A programm to create labels and business cards
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui20 \
+LIB_DEPENDS= gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui20 \
gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
+USE_GETOPT_LONG=yes
USE_GNOME= gnomehack gnomeprefix gnomelibs
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/deskutils/glabels/files/patch-barcode-0.98_Makefile.in b/deskutils/glabels/files/patch-barcode-0.98_Makefile.in
new file mode 100644
index 000000000000..4841a1c34f45
--- /dev/null
+++ b/deskutils/glabels/files/patch-barcode-0.98_Makefile.in
@@ -0,0 +1,11 @@
+--- barcode-0.98/Makefile.in.bak Tue Aug 27 12:23:41 2002
++++ barcode-0.98/Makefile.in Mon Jul 7 06:37:34 2003
+@@ -3,7 +3,7 @@
+ #
+
+ CC = @CC@
+-CFLAGS = @CFLAGS@ @DEFS@ @NO_GETOPT@ @NO_LIBPAPER@ @NO_STRERROR@
++CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ @NO_GETOPT@ @NO_LIBPAPER@ @NO_STRERROR@
+ RANLIB = @RANLIB@
+
+ INSTALL = @INSTALL@
diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile
index 645452efc4f7..59595f0e4707 100644
--- a/devel/commoncpp/Makefile
+++ b/devel/commoncpp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= commoncpp2
PORTVERSION= 1.0.8
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
@@ -16,9 +17,10 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= GNU project portable class framework for C++
BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
+
+USE_GETOPT_LONG=yes
USE_GMAKE= yes
USE_LIBTOOL= yes
USE_AUTOCONF= yes
diff --git a/editors/lfhex/Makefile b/editors/lfhex/Makefile
index 1261a742b0fa..7a2cdb995b5b 100644
--- a/editors/lfhex/Makefile
+++ b/editors/lfhex/Makefile
@@ -8,7 +8,7 @@
PORTNAME= lfhex
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= arved
@@ -16,8 +16,7 @@ MASTER_SITE_SUBDIR= arved
MAINTAINER= ports@freebsd.org
COMMENT= "Large file hex editor"
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
USE_REINPLACE= yes
USE_QT_VER= 3
GNU_CONFIGURE= yes
@@ -30,6 +29,6 @@ post-patch:
s,%%X11BASE%%,${X11BASE},g" ${WRKSRC}/src/Makefile.in
post-configure:
- ${REINPLACE_CMD} -e "s,LFLAGS =,LFLAGS = ${PTHREAD_LIBS}," ${WRKSRC}/src/Makefile
+ ${REINPLACE_CMD} -e "s,LFLAGS =,LFLAGS = ${PTHREAD_LIBS} ${LDFLAGS}," ${WRKSRC}/src/Makefile
.include <bsd.port.mk>
diff --git a/editors/lfhex/files/patch-src::Makefile.in b/editors/lfhex/files/patch-src::Makefile.in
index d4a29f691d27..855e2db88993 100644
--- a/editors/lfhex/files/patch-src::Makefile.in
+++ b/editors/lfhex/files/patch-src::Makefile.in
@@ -5,12 +5,12 @@
CXXFLAGS = @CXXFLAGS@
-INCLUDE_DIRS = $(QTDIR)/include
-+INCLUDE_DIRS = %%X11BASE%%/include %%LOCALBASE%%/include
++INCLUDE_DIRS = %%X11BASE%%/include
IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
-LIBRARIES = qt Xext X11 m
-LIB_DIRS = $(QTDIR)/lib /usr/X11R6/lib
-+LIBRARIES = qt-mt Xext X11 m gnugetopt
-+LIB_DIRS = $(QTDIR)/lib /usr/X11R6/lib %%LOCALBASE%%/lib
++LIBRARIES = qt-mt Xext X11 m
++LIB_DIRS = $(QTDIR)/lib /usr/X11R6/lib
LFLAGS = $(addprefix -L,$(LIB_DIRS)) $(addprefix -l,$(LIBRARIES))
CXX_SRC = $(wildcard *.cpp)
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index e3e730aca650..ef7aa731870e 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tuxnes
PORTVERSION= 0.75
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,8 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= asmodai@freebsd.org
COMMENT= A Nintendo Entertainment System 8-bit emulator
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
USE_GMAKE= YES
USE_X_PREFIX= YES
GNU_CONFIGURE= YES
diff --git a/ftp/prozilla/Makefile b/ftp/prozilla/Makefile
index c632a0c7502e..61e8687f9ba8 100644
--- a/ftp/prozilla/Makefile
+++ b/ftp/prozilla/Makefile
@@ -7,24 +7,26 @@
PORTNAME= prozilla
PORTVERSION= 1.3.6
+PORTREVISION= 1
CATEGORIES= ftp
MASTER_SITES= http://prozilla.genesys.ro/downloads/prozilla/tarballs/
MAINTAINER= rael@vectorstar.net
COMMENT= ProZilla is a fast download accelerator
-LIB_DEPENDS= ncurses.5:${PORTSDIR}/devel/ncurses \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= ncurses.5:${PORTSDIR}/devel/ncurses
-USE_REINPLACE= yes
+USE_GETOPT_LONG=yes
+USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= proz.1 prozilla.1
-DOCS= ANNOUNCE AUTHORS COPYING CREDITS ChangeLog INSTALL FAQ NEWS README TODO
+DOCS= ANNOUNCE AUTHORS COPYING CREDITS ChangeLog INSTALL FAQ NEWS README TODO
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile
index 0bfa4e1692da..a66e64d91c4c 100644
--- a/games/burgerspace/Makefile
+++ b/games/burgerspace/Makefile
@@ -7,18 +7,21 @@
PORTNAME= burgerspace
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www3.sympatico.ca/sarrazip/dev/
MAINTAINER= markp@FreeBSD.org
COMMENT= A BurgerTime clone
-LIB_DEPENDS= gengameng.4:${PORTSDIR}/devel/gengameng \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= gengameng.4:${PORTSDIR}/devel/gengameng
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lgnugetopt"
+CPPFLAGS= -I${X11BASE}/include -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
+CCONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+= --with-gengameng-prefix="${X11BASE}"
MAN6= burgerspace.6
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index bbb509086a2c..df7c436bb169 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -7,6 +7,7 @@
PORTNAME= heroes
PORTVERSION= 0.21
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +22,6 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= A game of yore similar to the "Tron" and "Nibbles"
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
iconv.3:${PORTSDIR}/converters/libiconv
DATAVERSION= 1.5
@@ -37,13 +37,15 @@ INSTPREFIX= ${PREFIX}/share/heroes
SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config
+USE_GETOPT_LONG=yes
USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-sdl_mixer=${LOCALBASE}
-CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt ${PTHREAD_LIBS} -lsmpeg" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lsmpeg
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+ SDL_CONFIG="${SDL_CONFIG}"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
MAN6= heroes.6 heroeslvl.6
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index 2a4b2e21cf2d..83b6faa656cb 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nethack
PORTVERSION= 3.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= nethack
@@ -23,14 +23,14 @@ NO_LATEST_LINK= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-MAKE_ENV= CXX="${CXX}" GRAPHICS="${GRAPHICS}"
+MAKE_ENV= CXX="${CXX}" GRAPHICS="${GRAPHICS}" LDFLAGS="${LDFLAGS}"
MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
.if defined(WITH_GNOME_GRAPHICS)
CATEGORIES= games gnome
PKGNAMESUFFIX= -gnome
-LIB_DEPENDS+= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
USE_GNOME= yes
GRAPHICS= GNOME_GRAPHICS
.elif defined(WITH_QT_GRAPHICS)
@@ -49,7 +49,7 @@ GRAPHICS= X11_GRAPHICS
.include <bsd.port.pre.mk>
.if defined(WITH_QT_GRAPHICS) && ${OSVERSION} >= 500113
-BROKEN= "Does not build"
+BROKEN= "Does not build"
.endif
pre-everything::
diff --git a/games/nethack33/files/patch-ad b/games/nethack33/files/patch-ad
index 51e4a09f5a54..2053453e3489 100644
--- a/games/nethack33/files/patch-ad
+++ b/games/nethack33/files/patch-ad
@@ -79,7 +79,7 @@
#
# libraries for Gnome
-WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt
-+WINGNOMELIB = $(shell ${GNOME_CONFIG} --libs gnomeui) -lgnugetopt
++WINGNOMELIB = $(shell ${GNOME_CONFIG} --libs gnomeui) ${LDFLAGS}
#
# libraries for Gem port
WINGEMLIB = -le_gem -lgem
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 7e7045b771b5..c1f9b215fc4d 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qiv
PORTVERSION= 1.8
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.klografx.net/qiv/download/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -15,8 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= trevor@FreeBSD.org
COMMENT= Small, fast GDK/Imlib image viewer
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= imlib
@@ -30,10 +30,9 @@ do-configure:
${WRKSRC}/qiv.1.pre_sed > ${WRKSRC}/qiv.1
@ ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.pre_sed
@ ${SED} -e 's#\/usr\/local#${PREFIX}#' \
- -e 's#RANDOM GETOPT_LONG#RANDOM#' \
-e 's#gcc#${CC}#' \
- -e 's#-O2#${CFLAGS}#' \
- -e 's#libs-gdk`#libs-gdk` -lgnugetopt#' \
+ -e 's#-O2#${CPPFLAGS} ${CFLAGS}#' \
+ -e 's#libs-gdk`#libs-gdk` ${LDFLAGS}#' \
${WRKSRC}/Makefile.pre_sed > ${WRKSRC}/Makefile
do-install:
diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile
index 7b230126db5f..3a3ed6b5f352 100644
--- a/graphics/stamp/Makefile
+++ b/graphics/stamp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= stamp
PORTVERSION= 2.0.8
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= stamp
@@ -14,12 +15,13 @@ MASTER_SITE_SUBDIR= stamp
MAINTAINER= billf@FreeBSD.org
COMMENT= Adds a graphical, configurable timestamp to a grayscale image
-LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lgnugetopt"
+CPPFLAGS= -I${LOCALBASE}/include
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+ LIBS="-L${LOCALBASE}/lib"
USE_GMAKE= unfortunatly
.include <bsd.port.mk>
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index 36a031c21d30..d447985628f9 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -7,19 +7,22 @@
PORTNAME= vp
PORTVERSION= 1.5
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://math.smsu.edu/~erik/files/
MAINTAINER= markp@FreeBSD.org
COMMENT= An image viewer for X
-LIB_DEPENDS= SDL_image.10:${PORTSDIR}/graphics/sdl_image \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= SDL_image.10:${PORTSDIR}/graphics/sdl_image
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
+USE_GETOPT_LONG=yes
USE_LIBTOOL= yes
-CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lgnugetopt" \
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+ SDL_CONFIG="${SDL_CONFIG}" \
ac_cv_func_getopt_long=yes
USE_REINPLACE= yes
MAN1= vp.1
diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile
index a97bcb31f2a4..f4593f46cae2 100644
--- a/graphics/yafaray/Makefile
+++ b/graphics/yafaray/Makefile
@@ -6,6 +6,7 @@
PORTNAME= yafray
PORTVERSION= 0.0.3
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.coala.uniovi.es/~jandro/noname/downloads/
@@ -14,6 +15,7 @@ COMMENT= A fast XML based raytracer
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
+USE_GETOPT_LONG=yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
@@ -30,12 +32,6 @@ pre-everything::
@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
.endif
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500041
-LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-.endif
-
post-patch:
@${REINPLACE_CMD} -e \
's|-lpthread|${PTHREAD_LIBS}|' \
@@ -48,4 +44,4 @@ post-patch:
s|-Wall|${CXXFLAGS}|' \
${WRKSRC}/src/Makefile.in
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/yafray/Makefile b/graphics/yafray/Makefile
index a97bcb31f2a4..f4593f46cae2 100644
--- a/graphics/yafray/Makefile
+++ b/graphics/yafray/Makefile
@@ -6,6 +6,7 @@
PORTNAME= yafray
PORTVERSION= 0.0.3
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.coala.uniovi.es/~jandro/noname/downloads/
@@ -14,6 +15,7 @@ COMMENT= A fast XML based raytracer
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
+USE_GETOPT_LONG=yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
@@ -30,12 +32,6 @@ pre-everything::
@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
.endif
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500041
-LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-.endif
-
post-patch:
@${REINPLACE_CMD} -e \
's|-lpthread|${PTHREAD_LIBS}|' \
@@ -48,4 +44,4 @@ post-patch:
s|-Wall|${CXXFLAGS}|' \
${WRKSRC}/src/Makefile.in
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/tinycobol/Makefile b/lang/tinycobol/Makefile
index 9388d95814d8..1eacf6b7b92f 100644
--- a/lang/tinycobol/Makefile
+++ b/lang/tinycobol/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tinycobol
PORTVERSION= 0.59
+PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tiny-cobol
@@ -14,19 +15,20 @@ MASTER_SITE_SUBDIR= tiny-cobol
MAINTAINER= patrick@freebsd.org
COMMENT= A tiny COBOL compiler for IA32 platforms
-LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db2 \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db2
ONLY_FOR_ARCHS= i386
+USE_GETOPT_LONG=yes
HAS_CONFIGURE= yes
USE_BISON= yes
USE_GMAKE= yes
CONFIGURE_ARGS= "--with-readline"
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt ${LDFLAGS}" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-MAN1= htcobol.1 htcobf2f.1 htcobolpp.1
+MAN1= htcobol.1 htcobf2f.1 htcobolpp.1
pre-install:
diff --git a/mail/liamail/Makefile b/mail/liamail/Makefile
index ba9a8acac069..6567bb3d1657 100644
--- a/mail/liamail/Makefile
+++ b/mail/liamail/Makefile
@@ -8,6 +8,7 @@
PORTNAME= liamail
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,20 +16,16 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= kde@freebsd.org
COMMENT= A graphical mail client
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
-
USE_REINPLACE= yes
USE_QT_VER= 2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lgnugetopt" \
- QTDIR="${X11BASE}"
+CONFIGURE_ENV= QTDIR="${X11BASE}"
USE_GMAKE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500113
-BROKEN= "Does not compile"
+BROKEN= "Does not compile"
.endif
post-patch:
diff --git a/math/gexpr/Makefile b/math/gexpr/Makefile
index 8241d26cc26f..987763b06992 100644
--- a/math/gexpr/Makefile
+++ b/math/gexpr/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gexpr
PORTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/math/calc
@@ -15,13 +16,11 @@ MASTER_SITE_SUBDIR= apps/math/calc
MAINTAINER= ijliao@FreeBSD.org
COMMENT= A shell calculator
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
USE_REINPLACE= yes
+MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
MAN1= gexpr.1
-post-patch:
- @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
-
.include <bsd.port.mk>
diff --git a/math/gexpr/files/patch-Makefile b/math/gexpr/files/patch-Makefile
index 54f3d5c71b87..66a75a976db9 100644
--- a/math/gexpr/files/patch-Makefile
+++ b/math/gexpr/files/patch-Makefile
@@ -1,16 +1,16 @@
---- Makefile.orig Thu Jun 14 05:36:02 2001
-+++ Makefile Thu Jun 14 05:39:22 2001
+--- Makefile.orig Sat Feb 13 02:28:35 1999
++++ Makefile Sun Jul 6 20:06:03 2003
@@ -1,11 +1,10 @@
# Makefile for gexpr
# Last updated: 10 February 1999
-CC = gcc
-OPTS = -s -O2 -Wall
-+OPTS = ${CFLAGS} -I%%LOCALBASE%%/include
++OPTS = ${CFLAGS} ${CPPFLAGS}
OBJS = eval.o read_token.o commands.o output.o errors.o gexpr.o
GEXPR = gexpr
-LIBS = -lm
-+LIBS = -lm -L%%LOCALBASE%%/lib -lgnugetopt
++LIBS = -lm ${LDFLAGS}
all: $(GEXPR)
diff --git a/math/mtrxmath/Makefile b/math/mtrxmath/Makefile
index 1c7bec009a47..5da4f3f73698 100644
--- a/math/mtrxmath/Makefile
+++ b/math/mtrxmath/Makefile
@@ -5,15 +5,18 @@
# $FreeBSD$
#
-PORTNAME= mtrxmath
+PORTNAME= mtrxmath
PORTVERSION= 0.9.3
-CATEGORIES= math
+PORTREVISION= 1
+CATEGORIES= math
MASTER_SITES= http://www.angelfire.com/linux/linuxjeff/mtrxmath/files/
MAINTAINER= greid@ukug.uk.freebsd.org
COMMENT= A small tool for matrix mathemetics
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
+MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mtrxmath ${PREFIX}/bin
diff --git a/math/mtrxmath/files/patch-Makefile b/math/mtrxmath/files/patch-Makefile
index 4e9502de0bf9..f096036dd594 100644
--- a/math/mtrxmath/files/patch-Makefile
+++ b/math/mtrxmath/files/patch-Makefile
@@ -1,8 +1,8 @@
---- Makefile.orig Sun Jan 7 23:29:11 2001
-+++ Makefile Tue Jan 9 20:43:18 2001
+--- Makefile.orig Mon Jan 8 08:29:11 2001
++++ Makefile Sun Jul 6 20:09:15 2003
@@ -1,4 +1,4 @@
-CFLAGS=-Wall -g
-+CFLAGS+=-Wall -g -I${PREFIX}/include
++CFLAGS+=-Wall -g ${CPPFLAGS}
SRCS=add.c mtrxmath.c mult.c sub.c inverse.c
@@ -11,7 +11,7 @@
${EXE}: ${OBJS}
- ${CC} -o $@ ${OBJS}
-+ ${CC} -o $@ ${OBJS} -L${PREFIX}/lib -lgnugetopt
++ ${CC} -o $@ ${OBJS} ${LDFLAGS}
clean:
rm -f ${OBJS} ${EXE} *.orig
diff --git a/misc/dvorak7min/Makefile b/misc/dvorak7min/Makefile
index 97fb03e032d1..bdee15ffdcf8 100644
--- a/misc/dvorak7min/Makefile
+++ b/misc/dvorak7min/Makefile
@@ -7,22 +7,18 @@
PORTNAME= dvorak7min
PORTVERSION= 1.6
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://lightside.eresmas.com/
MAINTAINER= llwang@infor.org
COMMENT= An ncurses-based Dvorak typing tutor
+USE_GETOPT_LONG=yes
+
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500041
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-MAKE_ARGS= PROF="-I${LOCALBASE}/include ${CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="-lncurses -lgnugetopt"
-.else
-MAKE_ARGS= PROF="${CFLAGS}"
-.endif
+MAKE_ARGS= PROF="${CPPFLAGS} ${CFLAGS}" LDFLAGS="${LDFLAGS}"
pre-build:
@cd ${WRKSRC} ; ${MAKE} clean
diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile
index bbdee3a3ca7f..528a8011b3a7 100644
--- a/misc/xosd/Makefile
+++ b/misc/xosd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xosd
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://www.ignavus.net/ \
${MASTER_SITE_LOCAL}
@@ -15,20 +16,20 @@ MASTER_SITE_SUBDIR= perky
MAINTAINER= perky@FreeBSD.org
COMMENT= X On-Screen-Display Library and XMMS plug-in
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
.if !defined(WITHOUT_XMMS)
LIB_DEPENDS+= xmms.3:${PORTSDIR}/multimedia/xmms
.endif
XMMS_CONFIG?= ${X11BASE}/bin/xmms-config
+USE_GETOPT_LONG=yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
-CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib -lgnugetopt' \
+CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib' \
CFLAGS='${CFLAGS}' X11BASE='${X11BASE}' \
GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG='${GLIB_CONFIG}' \
XMMS_PLUGINDIR=${X11BASE}/lib/xmms
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 886d3ad53e20..a2a145ad3153 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dvdauthor
PORTVERSION= 0.5.3
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,11 +16,9 @@ MAINTAINER= pb@FreeBSD.org
COMMENT= Makes a DVD file structure from one or more MPEG2 streams
LIB_DEPENDS= dvdread.3:${PORTSDIR}/multimedia/libdvdread \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
png.5:${PORTSDIR}/graphics/png
-.include <bsd.port.pre.mk>
-
+USE_GETOPT_LONG=yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -29,4 +28,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dvdauthor
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 1be47e715f92..3657c9287a05 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,6 +7,7 @@
PORTNAME= transcode
PORTVERSION= 0.6.8
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://www.zebra.fh-weingarten.de/~transcode/pre/
@@ -14,15 +15,16 @@ MAINTAINER= hendrik@scholz.net
COMMENT= A text-console utility for video stream processing
LIB_DEPENDS= dvdread.3:${PORTSDIR}/multimedia/libdvdread \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
jpeg.9:${PORTSDIR}/graphics/jpeg
+USE_GETOPT_LONG=yes
USE_XLIB= yes
USE_GNOME= gtk12
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnugetopt" \
+LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
+CPPFLAGS= -I${X11BASE}/include -I${LOCALBASE}/include
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
CONFIGURE_ARGS= --program-transform-name=""
USE_REINPLACE= yes
@@ -201,7 +203,7 @@ PLIST_SUB+= WITH_LAME="@comment "
.if defined(WITH_OGG)
LIB_DEPENDS+= ogg.4:${PORTSDIR}/audio/libogg
-CONFIGURE_ARGS+= --with-ogg=yes
+CONFIGURE_ARGS+= --with-ogg=yes
PLIST_SUB+= WITH_OGG=""
.else
PLIST_SUB+= WITH_OGG="@comment "
@@ -229,7 +231,7 @@ PLIST_SUB+= WITH_SUBRIP="@comment "
.if defined(WITH_DIVX5)
BUILD_DEPENDS+= ${LINUXBASE}/usr/lib/libdivxdecore.so:${PORTSDIR}/multimedia/linux-divx4linux
-CONFIGURE_ENV+= CFLAGS="-I${LINUXBASE}/usr/include/divx" CPPFLAGS="-I${LINUXBASE}/usr/include/divx"
+CONFIGURE_ENV+= CFLAGS="-I${LINUXBASE}/usr/include/divx" CPPFLAGS="-I${LINUXBASE}/usr/include/divx"
.else
.endif
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index f427cd1dfd07..05ebe1bb238e 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nagios
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nagios
@@ -15,17 +16,20 @@ MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Extremely powerful network monitoring system
.if defined(WITH_GD2)
-LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2
.else
LIB_DEPENDS= gd1.2:${PORTSDIR}/graphics/gd
.endif
-LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${INCGD} -I${LOCALBASE}/include" \
- CFLAGS="${CFLAGS} ${INCGD} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib ${LIBGD} -lgnugetopt"
+
+CPPFLAGS= ${INCGD} -I${LOCALBASE}/include
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ CFLAGS="${CFLAGS} ${INCGD}" \
+ LIBS="-L${LOCALBASE}/lib ${LIBGD}"
CONFIGURE_ARGS= --with-command-user=nagios \
--with-command-grp=www \
--with-nagios-user=nagios \
diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile
index f427cd1dfd07..05ebe1bb238e 100644
--- a/net-mgmt/nagios12/Makefile
+++ b/net-mgmt/nagios12/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nagios
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nagios
@@ -15,17 +16,20 @@ MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Extremely powerful network monitoring system
.if defined(WITH_GD2)
-LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2
.else
LIB_DEPENDS= gd1.2:${PORTSDIR}/graphics/gd
.endif
-LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${INCGD} -I${LOCALBASE}/include" \
- CFLAGS="${CFLAGS} ${INCGD} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib ${LIBGD} -lgnugetopt"
+
+CPPFLAGS= ${INCGD} -I${LOCALBASE}/include
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ CFLAGS="${CFLAGS} ${INCGD}" \
+ LIBS="-L${LOCALBASE}/lib ${LIBGD}"
CONFIGURE_ARGS= --with-command-user=nagios \
--with-command-grp=www \
--with-nagios-user=nagios \
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index f427cd1dfd07..05ebe1bb238e 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nagios
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nagios
@@ -15,17 +16,20 @@ MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Extremely powerful network monitoring system
.if defined(WITH_GD2)
-LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2
.else
LIB_DEPENDS= gd1.2:${PORTSDIR}/graphics/gd
.endif
-LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${INCGD} -I${LOCALBASE}/include" \
- CFLAGS="${CFLAGS} ${INCGD} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib ${LIBGD} -lgnugetopt"
+
+CPPFLAGS= ${INCGD} -I${LOCALBASE}/include
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ CFLAGS="${CFLAGS} ${INCGD}" \
+ LIBS="-L${LOCALBASE}/lib ${LIBGD}"
CONFIGURE_ARGS= --with-command-user=nagios \
--with-command-grp=www \
--with-nagios-user=nagios \
diff --git a/net-mgmt/netmask/Makefile b/net-mgmt/netmask/Makefile
index 928a39217f46..dc317c750ae9 100644
--- a/net-mgmt/netmask/Makefile
+++ b/net-mgmt/netmask/Makefile
@@ -5,7 +5,7 @@
PORTNAME= netmask
PORTVERSION= 2.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= dists/potato/main/source/net
@@ -15,17 +15,10 @@ MAINTAINER= mike@urgle.com
COMMENT= Tool for generating terse netmasks in several common formats
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
+USE_GETOPT_LONG=yes
USE_AUTOMAKE= yes
USE_GMAKE= yes
MAN1= netmask.1
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500041
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/netsaint/Makefile b/net-mgmt/netsaint/Makefile
index 026e6f2b8433..9a042d807eae 100644
--- a/net-mgmt/netsaint/Makefile
+++ b/net-mgmt/netsaint/Makefile
@@ -7,7 +7,7 @@
PORTNAME= netsaint
PORTVERSION= 0.0.7
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= http://netsaint.sourceforge.net/download/ \
@@ -18,15 +18,16 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= Extremely powerful network monitoring system
-LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd
RUN_DEPENDS= ${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
USE_PERL5= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+CPPFLAGS= -I${LOCALBASE}/include
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt"
+ LIBS="-L${LOCALBASE}/lib -lgd"
CONFIGURE_ARGS= --with-command-user=netsaint \
--with-command-grp=www \
--with-netsaint-user=netsaint \
diff --git a/net/nagios/Makefile b/net/nagios/Makefile
index f427cd1dfd07..05ebe1bb238e 100644
--- a/net/nagios/Makefile
+++ b/net/nagios/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nagios
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nagios
@@ -15,17 +16,20 @@ MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Extremely powerful network monitoring system
.if defined(WITH_GD2)
-LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2
.else
LIB_DEPENDS= gd1.2:${PORTSDIR}/graphics/gd
.endif
-LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${INCGD} -I${LOCALBASE}/include" \
- CFLAGS="${CFLAGS} ${INCGD} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib ${LIBGD} -lgnugetopt"
+
+CPPFLAGS= ${INCGD} -I${LOCALBASE}/include
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ CFLAGS="${CFLAGS} ${INCGD}" \
+ LIBS="-L${LOCALBASE}/lib ${LIBGD}"
CONFIGURE_ARGS= --with-command-user=nagios \
--with-command-grp=www \
--with-nagios-user=nagios \
diff --git a/net/nc/Makefile b/net/nc/Makefile
index d34731024eb8..d0b7b47fa517 100644
--- a/net/nc/Makefile
+++ b/net/nc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nc
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= utils/file
@@ -15,11 +16,8 @@ DISTNAME= ncat-${PORTVERSION}
MAINTAINER= markp@FreeBSD.org
COMMENT= Network aware cat
-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= ncat.1
.include <bsd.port.mk>
diff --git a/net/netmask/Makefile b/net/netmask/Makefile
index 928a39217f46..dc317c750ae9 100644
--- a/net/netmask/Makefile
+++ b/net/netmask/Makefile
@@ -5,7 +5,7 @@
PORTNAME= netmask
PORTVERSION= 2.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= dists/potato/main/source/net
@@ -15,17 +15,10 @@ MAINTAINER= mike@urgle.com
COMMENT= Tool for generating terse netmasks in several common formats
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
+USE_GETOPT_LONG=yes
USE_AUTOMAKE= yes
USE_GMAKE= yes
MAN1= netmask.1
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500041
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/netsaint/Makefile b/net/netsaint/Makefile
index 026e6f2b8433..9a042d807eae 100644
--- a/net/netsaint/Makefile
+++ b/net/netsaint/Makefile
@@ -7,7 +7,7 @@
PORTNAME= netsaint
PORTVERSION= 0.0.7
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= http://netsaint.sourceforge.net/download/ \
@@ -18,15 +18,16 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= Extremely powerful network monitoring system
-LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd
RUN_DEPENDS= ${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
USE_PERL5= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+CPPFLAGS= -I${LOCALBASE}/include
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt"
+ LIBS="-L${LOCALBASE}/lib -lgd"
CONFIGURE_ARGS= --with-command-user=netsaint \
--with-command-grp=www \
--with-netsaint-user=netsaint \
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 738934c3f02e..4024b30bd63e 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ntop
PORTVERSION= 2.2
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,8 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Network monitoring tool with command line and web interfaces
BUILD_DEPENDS= ${LOCALBASE}/lib/libgdc.a:${PORTSDIR}/graphics/gdchart
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt \
- gdbm:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS= gdbm:${PORTSDIR}/databases/gdbm
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
IS_INTERACTIVE= yes
@@ -27,13 +26,14 @@ IS_INTERACTIVE= yes
DBDIR?= /var/db
WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME}
+USE_GETOPT_LONG=yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_OPENSSL= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
PLIST_SUB+= DBDIR=${DBDIR}
-CONFIGURE_ENV= LIBS="-lcrypto -L${LOCALBASE}/lib -lgnugetopt"
+CONFIGURE_ENV= LIBS="-lcrypto -L${LOCALBASE}/lib"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --localstatedir=${DBDIR} \
--with-ossl-root=${OPENSSLBASE} \
diff --git a/net/pptpclient/Makefile b/net/pptpclient/Makefile
index 528089639a09..cd21d9023f68 100644
--- a/net/pptpclient/Makefile
+++ b/net/pptpclient/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pptpclient
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pptpclient
@@ -16,12 +17,15 @@ DISTFILES= pptp-linux-1.1.0-1.tar.gz
MAINTAINER= thomas@cuivre.fr.eu.org
COMMENT= PPTP client for establishing a VPN link with an NT server
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
-MAKE_ARGS= DEBUG="" \
- INCLUDE="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lgnugetopt" \
- all
+.include <bsd.port.pre.mk>
+
+MAKE_ARGS= DEBUG=""
+.if ${OSVERSION} < 500041
+MAKE_ARGS+= INCLUDE="${CPPFLAGS}" \
+ LIBS="${LDFLAGS}"
+.endif
GUNZIP_CMD= ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS}
@@ -39,4 +43,4 @@ do-install:
${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/examples/pptpclient
${INSTALL_DATA} ${FILESDIR}/ppp.conf ${PREFIX}/share/examples/pptpclient
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/rfbproxy/Makefile b/net/rfbproxy/Makefile
index 4cc0cb01c4aa..b869456e5ca4 100644
--- a/net/rfbproxy/Makefile
+++ b/net/rfbproxy/Makefile
@@ -8,18 +8,16 @@
PORTNAME= rfbproxy
PORTVERSION= 0.6.5
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://cyberelk.net/tim/data/rfbproxy/stable/
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple tool for recording VNC sessions
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
MAN1= rfbproxy.1
diff --git a/news/yencode/Makefile b/news/yencode/Makefile
index 60207660c89d..004eeeaee80a 100644
--- a/news/yencode/Makefile
+++ b/news/yencode/Makefile
@@ -8,7 +8,7 @@
PORTNAME= yencode
PORTVERSION= 0.46
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,12 +16,12 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A free (GPL) encoder and decoder for the yEnc Usenet file format
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- intl.4:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
+USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lgnugetopt"
+CPPFLAGS= ${CXXFLAGS} -I${LOCALBASE}/include
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="-L${LOCALBASE}/lib"
MAN1= ydecode.1 yencode.1 ypost.1
MAN5= ypostrc.5
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index 5c0ef6f3cb20..6cd2270a4640 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -7,17 +7,17 @@
PORTNAME= pilot-link
PORTVERSION= 0.11.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= palm comms tk83
MASTER_SITES= http://www.pilot-link.org/source/
MAINTAINER= dima@FreeBSD.org
COMMENT= PalmPilot communications utilities (backup/restore/install/debug/...)
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- tk83:${PORTSDIR}/x11-toolkits/tk83 \
+LIB_DEPENDS= tk83:${PORTSDIR}/x11-toolkits/tk83 \
iconv.3:${PORTSDIR}/converters/libiconv
+USE_GETOPT_LONG=yes
USE_BZIP2= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
@@ -26,7 +26,7 @@ USE_PERL5= yes
CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3
HAS_CONFIGURE= yes
CONFIGURE_ARGS+=--with-perl5=${PERL5} --with-libiconv=${LOCALBASE}
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
+CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
.include "${.CURDIR}/manpages.mk"
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 5c0ef6f3cb20..6cd2270a4640 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -7,17 +7,17 @@
PORTNAME= pilot-link
PORTVERSION= 0.11.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= palm comms tk83
MASTER_SITES= http://www.pilot-link.org/source/
MAINTAINER= dima@FreeBSD.org
COMMENT= PalmPilot communications utilities (backup/restore/install/debug/...)
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- tk83:${PORTSDIR}/x11-toolkits/tk83 \
+LIB_DEPENDS= tk83:${PORTSDIR}/x11-toolkits/tk83 \
iconv.3:${PORTSDIR}/converters/libiconv
+USE_GETOPT_LONG=yes
USE_BZIP2= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
@@ -26,7 +26,7 @@ USE_PERL5= yes
CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3
HAS_CONFIGURE= yes
CONFIGURE_ARGS+=--with-perl5=${PERL5} --with-libiconv=${LOCALBASE}
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
+CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
.include "${.CURDIR}/manpages.mk"
diff --git a/security/authforce/Makefile b/security/authforce/Makefile
index 0a85f7f8066c..83af959597bc 100644
--- a/security/authforce/Makefile
+++ b/security/authforce/Makefile
@@ -5,26 +5,26 @@
# $FreeBSD$
#
-PORTNAME= authforce
-PORTVERSION= 0.9.6
-CATEGORIES= security www
-MASTER_SITES= http://kapheine.hypa.net/authforce/
+PORTNAME= authforce
+PORTVERSION= 0.9.6
+PORTREVISION= 1
+CATEGORIES= security www
+MASTER_SITES= http://kapheine.hypa.net/authforce/
-MAINTAINER= ache@FreeBSD.org
+MAINTAINER= ache@FreeBSD.org
COMMENT= HTTP authentication brute forcer
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- curl.2:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS= curl.2:${PORTSDIR}/ftp/curl \
intl.4:${PORTSDIR}/devel/gettext
-USE_BZIP2= yes
-
-GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
+USE_BZIP2= yes
+USE_GETOPT_LONG=yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="-lgnugetopt -lintl"
+ LIBS="-lintl"
-MAN1= authforce.1
-MANCOMPRESSED= yes
+MAN1= authforce.1
+MANCOMPRESSED= yes
.include <bsd.port.mk>
diff --git a/security/ccrypt/Makefile b/security/ccrypt/Makefile
index 5e3e173f6259..e227420f0366 100644
--- a/security/ccrypt/Makefile
+++ b/security/ccrypt/Makefile
@@ -8,6 +8,7 @@
PORTNAME= ccrypt
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://quasar.mathstat.uottawa.ca/~selinger/ccrypt/download/
@@ -16,12 +17,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jim@corebsd.or.id
COMMENT= A command-line utility for encrypting and decrypting files and streams
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
MAN1= ccrypt.1
MLINKS= ccrypt.1 ccencrypt.1 \
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index d07bc05e197e..d4b56839713c 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dirmngr
PORTVERSION= 0.4.5
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG} \
http://tigress.com/lofi/:lofi/
@@ -19,9 +20,9 @@ COMMENT= A client for managing and downloading certificate revocation lists
LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db2 \
gcrypt.6:${PORTSDIR}/security/libgcrypt \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
ksba.7:${PORTSDIR}/security/libksba
+USE_GETOPT_LONG=yes
USE_AUTOMAKE_VER= 15
USE_LIBTOOL= yes
USE_GMAKE= yes
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 2d34d775a574..93d65144e2f8 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pinentry
PORTVERSION= 0.6.9
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ftp://ftp.klaralvdalens-datakonsult.se/pub/aegypten/alpha/latest/ \
${MASTER_SITE_GNUPG} \
@@ -20,9 +21,9 @@ MAINTAINER= michaelnottebrock@gmx.net
COMMENT= A collection of simple PIN or passphrase entry dialogs
LIB_DEPENDS= gcrypt.6:${PORTSDIR}/security/libgcrypt \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
ksba.7:${PORTSDIR}/security/libksba
+USE_GETOPT_LONG=yes
USE_AUTOMAKE_VER= 15
WANT_GNOME= yes
USE_LIBTOOL= yes
diff --git a/security/pinentry/files/patch-curses::Makefile.am b/security/pinentry/files/patch-curses::Makefile.am
index 42222522344b..36dce30e679c 100644
--- a/security/pinentry/files/patch-curses::Makefile.am
+++ b/security/pinentry/files/patch-curses::Makefile.am
@@ -7,6 +7,6 @@
- ../assuan/libassuan.a ../secmem/libsecmem.a \
- $(LIBCAP) $(LIBCURSES) $(LIBICONV)
+ ../assuan/libassuan.a ../secmem/libsecmem.a ../common/libcommon.a \
-+ $(LIBCAP) $(LIBCURSES) $(LIBICONV) -lgnugetopt
++ $(LIBCAP) $(LIBCURSES) $(LIBICONV)
pinentry_curses_SOURCES = pinentry-curses.c
diff --git a/security/pinentry/files/patch-gtk::Makefile.am b/security/pinentry/files/patch-gtk::Makefile.am
index 8d7b22ebbcf7..42ec50ec2448 100644
--- a/security/pinentry/files/patch-gtk::Makefile.am
+++ b/security/pinentry/files/patch-gtk::Makefile.am
@@ -5,7 +5,7 @@
-I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
- $(LIBCAP) $(GTK_LIBS) $(libcurses)
-+ ../common/libcommon.a $(LIBCAP) $(GTK_LIBS) $(libcurses) -lgnugetopt
++ ../common/libcommon.a $(LIBCAP) $(GTK_LIBS) $(libcurses)
pinentry_gtk_SOURCES = pinentry-gtk.c \
gtksecentry.c gtksecentry.h
diff --git a/security/pinentry/files/patch-qt::Makefile.am b/security/pinentry/files/patch-qt::Makefile.am
index fd0629c05073..a25aafba5f7b 100644
--- a/security/pinentry/files/patch-qt::Makefile.am
+++ b/security/pinentry/files/patch-qt::Makefile.am
@@ -7,7 +7,7 @@
- $(top_builddir)/secmem/libsecmem.a $(LIBCAP) \
- $(QT_LIBS) $(libcurses)
+ $(top_builddir)/secmem/libsecmem.a $(top_builddir)/common/libcommon.a \
-+ $(LIBCAP) $(QT_LIBS) $(libcurses) -lgnugetopt
++ $(LIBCAP) $(QT_LIBS) $(libcurses)
pinentry_qt_LDFLAGS = $(QT_LDFLAGS)
pinentry_qt_SOURCES = pinentrydialog.h pinentrydialog.cpp \
diff --git a/security/poc/Makefile b/security/poc/Makefile
index e3e93084add1..42d79061eb21 100644
--- a/security/poc/Makefile
+++ b/security/poc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= poc
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=poc
@@ -14,13 +15,12 @@ MASTER_SITE_SUBDIR=poc
MAINTAINER= king@v2project.com
COMMENT= Program for managing passwords on smartcards
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- towitoko.2:${PORTSDIR}/devel/towitoko
+LIB_DEPENDS= towitoko.2:${PORTSDIR}/devel/towitoko
+USE_GETOPT_LONG=yes
USE_GMAKE= yes
USE_AUTOMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="-lgnugetopt"
+ LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/security/smtpmap/Makefile b/security/smtpmap/Makefile
index 3f878226c3ea..52a23021d378 100644
--- a/security/smtpmap/Makefile
+++ b/security/smtpmap/Makefile
@@ -7,6 +7,7 @@
PORTNAME= smtpmap
PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= security mail net
MASTER_SITES= http://plasmahh.free-bsd.org/
@@ -14,11 +15,10 @@ MAINTAINER= hubert@frbsd.org
COMMENT= An SMTP software identifier
.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
-MAKE_ENV= LIBS="-L${LOCALBASE}/lib -lgnugetopt" \
- INC=-I${LOCALBASE}/include
+MAKE_ENV= LIBS="${LDFLAGS}" INC="${CPPFLAGS}"
.endif
+USE_GETOPT_LONG=yes
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GMAKE= yes
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>
diff --git a/x11/gxset/Makefile b/x11/gxset/Makefile
index 4a4629f868c5..cad3bd1302ce 100644
--- a/x11/gxset/Makefile
+++ b/x11/gxset/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gxset
PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.seindal.dk/pub/rene/ \
${MASTER_SITE_LOCAL}
@@ -15,8 +16,7 @@ MASTER_SITE_SUBDIR= petef
MAINTAINER= bms@spc.org
COMMENT= GTK frontend for xset(1)
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_XPM= yes
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index 155ccf3a03ba..43eaebed5cba 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmappl
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= x11 windowmaker
MASTER_SITES= http://www.upl.cs.wisc.edu/~charkins/wmappl/
.ifndef(NOICONS)
@@ -17,11 +18,12 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= od@iclub.nsu.ru
COMMENT= An application launcher dockapp similar to wmbutton
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
USE_X_PREFIX= yes
USE_XPM= yes
-MAKE_ENV= DATADIR="${DATADIR}"
+MAKE_ENV= DATADIR="${DATADIR}" \
+ CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
ICONSDIST= 16x16xpms.tar.gz icons_16x16.tar.gz smallicons.tar.gz
.ifndef(NOICONS)
PLIST_SUB= ICONS=""
@@ -49,7 +51,7 @@ post-install:
@${ECHO_CMD} ""
@${ECHO_CMD} "===> Installing icons to ${DATADIR} directory"
@${MKDIR} ${DATADIR}
- @${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${DATADIR}
+ @(cd ${WRKSRC}/icons; ${INSTALL_DATA} *.xpm ${DATADIR})
.endif
.ifndef(NOPORTDOCS)
@${ECHO_CMD} "===> Installing README as ${DOCSDIR}/README"
diff --git a/x11/wmappl/files/patch-Makefile b/x11/wmappl/files/patch-Makefile
index df195e311626..aeeeba25a84a 100644
--- a/x11/wmappl/files/patch-Makefile
+++ b/x11/wmappl/files/patch-Makefile
@@ -11,14 +11,14 @@
-DESTDIR = /usr/X11R6/bin
-ICONDIR = /usr/share/icons/wmappl
+CFLAGS += -DICONPATH=\"${DATADIR}\"
-+INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include -I${LOCALBASE}/include
-+LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib
++INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include ${CPPFLAGS}
++LIBDIR = -L${X11BASE}/lib
+DESTDIR = ${X11BASE}/bin
+ICONDIR = ${DATADIR}
# for linux
-LIBS = -lXpm -lX11 -lXext
-+LIBS = -lXpm -lX11 -lXext -lgnugetopt
++LIBS = -lXpm -lX11 -lXext
# for Solaris
# LIBS = -lXpm -lX11 -lXext -lsocket
@@ -27,7 +27,7 @@
$(TARGET): $(OBJS)
- $(CC) $(CFLAGS) -o $(TARGET) $^ $(INCDIR) $(LIBDIR) $(LIBS)
-+ $(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(INCDIR) $(LIBDIR) $(LIBS)
++ $(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(INCDIR) $(LDFLAGS) $(LIBDIR) $(LIBS)
clean:
for i in $(OBJS) ; do \