diff options
484 files changed, 360 insertions, 792 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index c91fe8f767f2..5f9db8a0453a 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -116,8 +116,7 @@ gnomeprefix_CONFIGURE_ARGS=--localstatedir=${DESTDIR}${GNOME_LOCALSTATEDIR} \ --with-html-dir=${DESTDIR}${GNOME_HTML_DIR} \ --with-help-dir=${TARGETDIR}/share/gnome/help \ --disable-gtk-doc \ - --with-gconf-source=${GCONF_CONFIG_SOURCE} \ - --mandir=${PREFIX}/man + --with-gconf-source=${GCONF_CONFIG_SOURCE} gnomeprefix_USE_GNOME_IMPL=gnomehier .if !defined(WITHOUT_HACK) gnomeprefix_PREFIX=${LOCALBASE} diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 647c161e8805..1024a448178f 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -659,7 +659,8 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Set the following to specify all .info files your port installs. # # INFO - A list of .info files (omitting the trailing ".info"); -# only one entry per document! +# only one entry per document! These files are listed in +# the path relative to ${INFO_PATH}. # INFO_PATH - Path, where all .info files will be installed by your # port, relative to ${PREFIX} # Default: "share/info" if ${PREFIX} is equal to /usr @@ -889,7 +890,8 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Default: ${ARCH}-portbld-freebsd${OSREL} # CONFIGURE_ARGS # - Pass these args to configure if ${HAS_CONFIGURE} is set. -# Default: "--prefix=${PREFIX} ${CONFIGURE_TARGET}" if +# Default: "--prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} +# --mandir=${MANPREFIX}/man ${CONFIGURE_TARGET}" if # GNU_CONFIGURE is set, "CC=${CC} CCFLAGS=${CFLAGS} # PREFIX=${PREFIX} INSTALLPRIVLIB=${PREFIX}/lib # INSTALLARCHLIB=${PREFIX}/lib" if PERL_CONFIGURE is set, @@ -2977,9 +2979,18 @@ CONFIGURE_FAIL_MESSAGE?= "Please report the problem to ${MAINTAINER} [maintainer .if !defined(CONFIGURE_MAX_CMD_LEN) CONFIGURE_MAX_CMD_LEN!= ${SYSCTL} -n kern.argmax .endif -CONFIGURE_ARGS+= --prefix=${PREFIX} ${CONFIGURE_TARGET} +CONFIGURE_ARGS+= --prefix=${PREFIX} $${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET} CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN} HAS_CONFIGURE= yes + +SET_LATE_CONFIGURE_ARGS= \ + _LATE_CONFIGURE_ARGS="" ; \ + if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \ + _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${MANPREFIX}/man" ; \ + fi ; \ + if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \ + _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \ + fi ; .endif # Passed to most of script invocations @@ -3109,6 +3120,20 @@ INFO_PATH?= share/info INFO_PATH?= info .endif +.if defined(INFO) +. for D in ${INFO:H} +RD:= ${D} +. if ${RD} != "." +. if !defined(INFO_SUBDIR) +INFO_SUBDIR:= ${RD} +. elif ${INFO_SUBDIR} != ${RD} +BROKEN= only one subdirectory in INFO is allowed +. endif +. endif +.undef RD +. endfor +.endif + DOCSDIR_REL?= ${DOCSDIR:S,^${TARGETDIR}/,,} EXAMPLESDIR_REL?= ${EXAMPLESDIR:S,^${TARGETDIR}/,,} DATADIR_REL?= ${DATADIR:S,^${TARGETDIR}/,,} @@ -3723,6 +3748,7 @@ do-configure: .endif .if defined(HAS_CONFIGURE) @(cd ${CONFIGURE_WRKSRC} && \ + ${SET_LATE_CONFIGURE_ARGS} \ if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \ @@ -5859,14 +5885,14 @@ add-plist-info: @${LS} ${TARGETDIR}/${INFO_PATH}/$i.info* | ${SED} -e s:${TARGETDIR}/::g >> ${TMPPLIST} @${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ >> ${TMPPLIST} - @if [ "`${DIRNAME} $i`" != "." ]; then \ - ${ECHO_CMD} "@unexec ${RMDIR} %D/info/`${DIRNAME} $i` 2> /dev/null || true" >> ${TMPPLIST}; \ - fi .endfor +.if defined(INFO_SUBDIR) + @${ECHO_CMD} "@unexec ${RMDIR} %D/${INFO_PATH}/${INFO_SUBDIR} 2> /dev/null || true" >> ${TMPPLIST} +.endif .if (${PREFIX} != "/usr") @${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST} .if (${PREFIX} != ${LOCALBASE_REL} && ${PREFIX} != ${X11BASE_REL} && ${PREFIX} != ${LINUXBASE_REL}) - @${ECHO_CMD} "@unexec rmdir %D/info 2> /dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec rmdir %D/${INFO_PATH} 2>/dev/null || true" >> ${TMPPLIST} .endif .endif .endif diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index 59ffc2bdb2db..eda8cb0c063d 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -42,8 +42,6 @@ DIST_SUBDIR= xorg/${XORG_CAT} MASTER_SITES?= ${MASTER_SITE_XORG} MASTER_SITE_SUBDIR?= individual/${XORG_CAT} -CONFIGURE_ARGS+= --mandir="${PREFIX}/man/" - . if ${XORG_CAT} == "app" USE_GNOME+= pkgconfig . endif diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile index 0b324badde91..b254469203fd 100644 --- a/archivers/dpkg/Makefile +++ b/archivers/dpkg/Makefile @@ -30,9 +30,8 @@ PLIST_SUB+= DPKGDIR=${DPKGDIR:C,^/,,} SUB_FILES= pkg-install pkg-deinstall SUB_LIST+= DPKGDIR=${DPKGDIR} -CONFIGURE_ARGS+=--with-admindir=${DPKGDIR} --mandir=${PREFIX}/man \ - --libdir=${PREFIX}/libexec --program-transform-name="" \ - --infodir=${PREFIX}/info --with-libintl-prefix=${LOCALBASE} +CONFIGURE_ARGS+=--with-admindir=${DPKGDIR} --libdir=${PREFIX}/libexec \ + --program-transform-name="" --with-libintl-prefix=${LOCALBASE} MANLANG= "" de fr hu ja pl ru sv diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile index 7490a23859b9..95a621cb5591 100644 --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -21,8 +21,7 @@ INFO= tar USE_BZIP2= yes USE_ICONV= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-prefix=g \ - --infodir=${PREFIX}/${INFO_PATH} +CONFIGURE_ARGS= --program-prefix=g CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \ LDFLAGS='-L${LOCALBASE}/lib ${LDSTATIC}' \ DEFAULT_ARCHIVE=/dev/sa0 \ diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile index f4c82486bd4c..e01bf6300c33 100644 --- a/archivers/gzip/Makefile +++ b/archivers/gzip/Makefile @@ -17,8 +17,6 @@ COMMENT= A compression utility designed to be a replacement for compress GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --infodir=${LOCALBASE}/info \ - --mandir=${MANPREFIX}/man MAN1= gunzip.1 gzexe.1 gzip.1 zcat.1 zcmp.1 zdiff.1 zforce.1 \ zgrep.1 zless.1 zmore.1 znew.1 diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile index ebf37353f5f1..d1ad2917b356 100644 --- a/archivers/libarchive/Makefile +++ b/archivers/libarchive/Makefile @@ -15,7 +15,6 @@ COMMENT= Library to create and read several streaming archive formats GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man PLIST_FILES= bin/bsdtar \ include/archive.h \ diff --git a/astro/starplot/Makefile b/astro/starplot/Makefile index 454b2e16c714..a4f4025fd3bb 100644 --- a/astro/starplot/Makefile +++ b/astro/starplot/Makefile @@ -20,7 +20,6 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAKE_ENV= DOCSDIR="${DOCSDIR}" EXAMPLESDIR="${EXAMPLESDIR}" MAN1= starconvert.1 starpkg.1 starplot.1 diff --git a/astro/tclgeomap/Makefile b/astro/tclgeomap/Makefile index 229f5218eb8b..a3db6278e3e0 100644 --- a/astro/tclgeomap/Makefile +++ b/astro/tclgeomap/Makefile @@ -15,8 +15,7 @@ COMMENT= Read, manipulate and display geo data USE_TCL= 82+ GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \ - --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} WRKSRC= ${WRKDIR}/${DISTNAME}/unix TKPKG= ${PORTNAME} PLIST_SUB= INC=include/${TKPKG} LIB=lib/${TKPKG} diff --git a/astro/tkgeomap/Makefile b/astro/tkgeomap/Makefile index e9d7da6411cd..34b6a13d0b15 100644 --- a/astro/tkgeomap/Makefile +++ b/astro/tkgeomap/Makefile @@ -18,7 +18,6 @@ LIB_DEPENDS= tclgeomap.0:${PORTSDIR}/astro/tclgeomap CONFIGURE_ARGS= --with-tclgeomap-include=${LOCALBASE}/include/tclgeomap --with-x \ --with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \ --with-tk=${TK_LIBDIR} --with-tkinclude=${TK_INCLUDEDIR} \ - --mandir=${MANPREFIX}/man \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include CONFIGURE_ENV= TCLGEOMAP_LIB=${LOCALBASE}/lib/tclgeomap USE_TK= 82+ diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile index 35ef2dc983e8..92b56a3db69e 100644 --- a/audio/audacity-devel/Makefile +++ b/audio/audacity-devel/Makefile @@ -31,8 +31,6 @@ USE_GCC= 4.1 USE_WX= 2.6 WX_COMPS= wx -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man - MAN1= audacity.1 MANCOMPRESSED= yes diff --git a/audio/checkmate/Makefile b/audio/checkmate/Makefile index 5627880e4844..f4b6721b22f2 100644 --- a/audio/checkmate/Makefile +++ b/audio/checkmate/Makefile @@ -17,7 +17,6 @@ COMMENT= A command-line utility for checking mp3 files for errors GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= mpck.1 diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 11dfcf67e21a..3bbfb5aeccb8 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -20,7 +20,7 @@ USE_GCC= 3.2+ USE_GMAKE= yes USE_ICONV= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS+=prefix=${TARGETDIR} mandir=${TARGETDIR}/man +CONFIGURE_ARGS+=prefix=${TARGETDIR} mandir=${MANPREFIX}/man CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile index 6849e6763d70..e08508fb3c06 100644 --- a/audio/darkice/Makefile +++ b/audio/darkice/Makefile @@ -24,8 +24,7 @@ OPTIONS= VORBIS "Ogg Vorbis support" on \ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --without-alsa +CONFIGURE_ARGS= --without-alsa MAN1= darkice.1 MAN5= darkice.cfg.5 diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile index d9f53abf3583..0065e811b11c 100644 --- a/audio/ecasound/Makefile +++ b/audio/ecasound/Makefile @@ -19,8 +19,7 @@ USE_GMAKE= yes USE_GCC= 3.4+ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --disable-pyecasound \ +CONFIGURE_ARGS= --disable-pyecasound \ --disable-rubyecasound \ --with-largefile \ --enable-sys-readline diff --git a/audio/esound/Makefile b/audio/esound/Makefile index eb530963f7fa..14d9ce459850 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -25,7 +25,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= JW=false USE_GETOPT_LONG=yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFLICTS= py*-ro-[0-9]* diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile index d6e002b33d53..44a26e1e272f 100644 --- a/audio/gnupod/Makefile +++ b/audio/gnupod/Makefile @@ -36,7 +36,7 @@ NO_BUILD= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --infodir=${PREFIX}/info \ - --mandir=${PREFIX}/man + --mandir=${MANPREFIX}/man CONFIGURE_ENV= ac_cv_path_PERL=${PERL} OPTIONS= FLAC "Enable FLAC support" off diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile index 8252f7130287..e2e5b863bbc2 100644 --- a/audio/gtick/Makefile +++ b/audio/gtick/Makefile @@ -20,7 +20,6 @@ USE_GNOME= gtk20 USE_GETTEXT= yes CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+= --mandir=${MAN1PREFIX}/man MAN1= gtick.1 diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 423feef33f4c..7d353ed21cf9 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -24,7 +24,6 @@ LATEST_LINK= jack CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" LDFLAGS="-L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" \ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" -CONFIGURE_ARGS= --mandir=${PREFIX}/man/ GNU_CONFIGURE= yes USE_GETOPT_LONG=yes USE_LDCONFIG= yes diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile index f85a3ffc705f..0bb443d132eb 100644 --- a/audio/libadplug/Makefile +++ b/audio/libadplug/Makefile @@ -30,7 +30,6 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \ CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man --infodir=${PREFIX}/info INFO= libadplug MAN1= adplugdb.1 diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile index ea6d1903b841..a0145823ec07 100644 --- a/audio/libsndfile/Makefile +++ b/audio/libsndfile/Makefile @@ -39,7 +39,6 @@ LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac .endif post-patch: - @${REINPLACE_CMD} -e 's|@mandir@|${PREFIX}/man|' ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e '/^SUBDIRS =/s/ doc / /g' ${WRKSRC}/Makefile.in post-install: diff --git a/audio/moc/Makefile b/audio/moc/Makefile index 4eb3dc97115a..91ff20f7414f 100644 --- a/audio/moc/Makefile +++ b/audio/moc/Makefile @@ -18,7 +18,6 @@ USE_GETOPT_LONG= yes USE_GMAKE= yes USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= mocp.1 diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile index 317fd2828ea3..9e06080f9628 100644 --- a/audio/mp3blaster/Makefile +++ b/audio/mp3blaster/Makefile @@ -20,8 +20,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes WANT_GNOME= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --with-cxxflags="${CXXFLAGS}" \ - --infodir="${PREFIX}/info" --mandir="${PREFIX}/man" +CONFIGURE_ARGS= --with-cxxflags="${CXXFLAGS}" MAN1= mp3blaster.1 nmixer.1 splay.1 diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index c9af8069ef9f..c4070952d98b 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -35,8 +35,7 @@ OPTIONS= FLAC "Support for FLAC Audio" on \ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-pulse \ - --disable-shout \ - --mandir=${MANPREFIX}/man + --disable-shout .include <bsd.port.pre.mk> diff --git a/audio/py-eyed3/Makefile b/audio/py-eyed3/Makefile index 82ce888ca893..1fcbb30f8547 100644 --- a/audio/py-eyed3/Makefile +++ b/audio/py-eyed3/Makefile @@ -22,7 +22,6 @@ CONFIGURE_ENV= PYTHON="${PYTHON_CMD}" MAKE_ENV= SETUP_ARGS_BUILD="${PYDISTUTILS_BUILDARGS}" \ SETUP_ARGS_INSTALL="${PYDISTUTILS_INSTALLARGS}" DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} -MANDIR= ${PREFIX}/man MAN1= eyeD3.1 MANCOMPRESSED= yes @@ -34,7 +33,6 @@ post-patch: ${REINPLACE_CMD} -e 's,\(setup.py build\),\1 $${SETUP_ARGS_BUILD},g' \ -e 's,\(setup.py install\),\1 $${SETUP_ARGS_INSTALL} ,g' \ -e 's,^docdir:=.*,docdir:=${DOCSDIR},g' \ - -e 's,^mandir:=.*,mandir:=${MANDIR},g' \ ${WRKSRC}/Makefile.in .if defined(NOPORTDOCS) ${REINPLACE_CMD} -e 's,.*docdir.*,#,g' \ diff --git a/audio/shntool/Makefile b/audio/shntool/Makefile index ffcdd9b7549d..807a805110f8 100644 --- a/audio/shntool/Makefile +++ b/audio/shntool/Makefile @@ -14,7 +14,6 @@ MAINTAINER= infofarmer@FreeBSD.org COMMENT= Multi-purpose .wav processing utility GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man SHN_ALIASES= tool len fix hash pad join split cat cmp cue conv info strip gen trim PLIST_FILES= ${SHN_ALIASES:S|^|bin/shn|} MAN1= shntool.1 diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile index 607105f6951d..b5aacadfbdb4 100644 --- a/audio/solfege/Makefile +++ b/audio/solfege/Makefile @@ -25,8 +25,7 @@ USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_XML2PO="" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --disable-oss-sound \ +CONFIGURE_ARGS= --disable-oss-sound \ --enable-docbook-stylesheet=${STYLESHEET} MAKE_ARGS= skipmanual=yes diff --git a/audio/speex/Makefile b/audio/speex/Makefile index 0e068bf5f25b..766a0af18db7 100644 --- a/audio/speex/Makefile +++ b/audio/speex/Makefile @@ -23,7 +23,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GETOPT_LONG=yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-ogg-dir=${LOCALBASE} --mandir=${PREFIX}/man +CONFIGURE_ARGS= --with-ogg-dir=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/twolame/Makefile b/audio/twolame/Makefile index f146cb8a4ca1..f27686eda32d 100644 --- a/audio/twolame/Makefile +++ b/audio/twolame/Makefile @@ -21,7 +21,6 @@ USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man MAN1= twolame.1 diff --git a/audio/wavbreaker/Makefile b/audio/wavbreaker/Makefile index f95a6556eb37..9a5ce38ee230 100644 --- a/audio/wavbreaker/Makefile +++ b/audio/wavbreaker/Makefile @@ -18,8 +18,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --disable-alsa +CONFIGURE_ARGS= --disable-alsa INSTALLS_ICONS= yes MAN1= wavbreaker.1 wavinfo.1 wavmerge.1 diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile index f1b8b0394a2d..fd7bc70c4d8b 100644 --- a/audio/xanalyser/Makefile +++ b/audio/xanalyser/Makefile @@ -27,7 +27,6 @@ MAN1= xanalyser.1 PLIST_FILES= bin/xanalyser \ lib/X11/app-defaults/XAnalyser CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man post-patch: @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile index 05c0f6580e65..5eeca5048504 100644 --- a/benchmarks/postal/Makefile +++ b/benchmarks/postal/Makefile @@ -28,7 +28,7 @@ MAN8= bhm.8 postal.8 rabid.8 CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man --disable-gnutls +CONFIGURE_ARGS= --disable-gnutls CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" .include <bsd.port.post.mk> diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile index 14e8a967f9bd..3199886f0523 100644 --- a/cad/alliance/Makefile +++ b/cad/alliance/Makefile @@ -28,7 +28,7 @@ USE_XLIB= yes HAS_CONFIGURE= yes CONFIGURE_ENV+= ALLIANCE_TOP=${ALLIANCE_TOP} -CONFIGURE_ARGS+=--mandir=${PREFIX}/man \ +CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \ --x-libraries=${X11BASE}/lib \ --x-includes=${X11BASE}/include \ --prefix=${ALLIANCE_TOP} ${CONFIGURE_TARGET} diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile index 12627c2294c5..227699c34645 100644 --- a/cad/freehdl/Makefile +++ b/cad/freehdl/Makefile @@ -22,7 +22,7 @@ USE_XLIB= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib \ --prefix=${PREFIX} \ - --mandir=${PREFIX}/man \ + --mandir=${MANPREFIX}/man \ --infodir=${PREFIX}/info MAN1= freehdl-config.1 \ diff --git a/cad/geda-gattrib/Makefile b/cad/geda-gattrib/Makefile index ffd9b9c0f98b..567799e420ca 100644 --- a/cad/geda-gattrib/Makefile +++ b/cad/geda-gattrib/Makefile @@ -25,7 +25,7 @@ DOCSDIR= ${PREFIX}/share/doc/geda GNU_CONFIGURE= yes USE_GNOME= gtk20 -CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --mandir=${PREFIX}/man +CONFIGURE_ARGS= --with-docdir=${DOCSDIR} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile index 17e8cf1d1ddf..40750a679525 100644 --- a/cad/geda-gschem/Makefile +++ b/cad/geda-gschem/Makefile @@ -25,8 +25,7 @@ DATADIR= ${PREFIX}/share/geda GNU_CONFIGURE= yes USE_GNOME= gtk20 -CONFIGURE_ARGS= --enable-gdgeda --with-docdir=${DOCSDIR} \ - --mandir=${PREFIX}/man --infodir=${PREFIX}/info +CONFIGURE_ARGS= --enable-gdgeda --with-docdir=${DOCSDIR} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile index 1ea7b28ed954..454e6ebf3327 100644 --- a/cad/geda-netlist/Makefile +++ b/cad/geda-netlist/Makefile @@ -25,7 +25,7 @@ DOCSDIR= ${PREFIX}/share/doc/geda GNU_CONFIGURE= yes USE_GNOME= gtk20 -CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --mandir=${PREFIX}/man +CONFIGURE_ARGS= --with-docdir=${DOCSDIR} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/cad/geda-symcheck/Makefile b/cad/geda-symcheck/Makefile index f44e05f0a67e..e7657809e305 100644 --- a/cad/geda-symcheck/Makefile +++ b/cad/geda-symcheck/Makefile @@ -25,7 +25,7 @@ DATADIR= ${PREFIX}/share/geda GNU_CONFIGURE= yes USE_GNOME= gtk20 -CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --mandir=${PREFIX}/man +CONFIGURE_ARGS= --with-docdir=${DOCSDIR} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile index 13afd98ab33d..c7242842c729 100644 --- a/cad/geda-utils/Makefile +++ b/cad/geda-utils/Makefile @@ -26,7 +26,7 @@ DATADIR= ${PREFIX}/share/geda GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gtk20 -CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --mandir=${PREFIX}/man +CONFIGURE_ARGS= --with-docdir=${DOCSDIR} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile index 3302d4f5ff95..3f8d5b34fd03 100644 --- a/cad/gerbv/Makefile +++ b/cad/gerbv/Makefile @@ -20,7 +20,6 @@ USE_GNOME= gnometarget gtk20 USE_GETOPT_LONG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN1= gerbv.1 diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile index c3a6ef9586cd..41f8ed2cc095 100644 --- a/cad/gnucap/Makefile +++ b/cad/gnucap/Makefile @@ -18,8 +18,7 @@ COMMENT= The Gnu Circuit Analysis Package USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/${PORTNAME} \ - --mandir=${PREFIX}/man +CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/${PORTNAME} OPTIONS= READLINE "Enable commandline features via readline" on diff --git a/cad/qucs/Makefile b/cad/qucs/Makefile index a095a4e04edf..06a766a634f7 100644 --- a/cad/qucs/Makefile +++ b/cad/qucs/Makefile @@ -17,7 +17,6 @@ USE_QT_VER= 3 USE_GNOME= gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN1= ps2sp.1 qucs.1 qucsator.1 qucsattenuator.1 qucsconv.1 \ qucsdigi.1 qucsedit.1 qucsfilter.1 qucshelp.1 qucslib.1 \ diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile index 21f5b19f8886..c277e927fd55 100644 --- a/comms/efax-gtk/Makefile +++ b/comms/efax-gtk/Makefile @@ -22,7 +22,6 @@ RUN_DEPENDS= ggv:${PORTSDIR}/print/ggv USE_GHOSTSCRIPT_RUN= yes USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${X11BASE}/man MAN1= efax.1 efix.1 efax-gtk.1 post-install: diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile index 5740fe95508a..31edc5d644e3 100644 --- a/comms/gpredict/Makefile +++ b/comms/gpredict/Makefile @@ -18,7 +18,6 @@ LIB_DEPENDS= hamlib:${PORTSDIR}/comms/hamlib:install USE_GNOME= gtk20 GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man MAN1= gpredict.1 diff --git a/comms/grig/Makefile b/comms/grig/Makefile index 5de869a7cc53..3f4cae434ad4 100644 --- a/comms/grig/Makefile +++ b/comms/grig/Makefile @@ -19,7 +19,6 @@ LIB_DEPENDS= hamlib:${PORTSDIR}/comms/hamlib USE_GNOME= gtk20 GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man MAN1= grig.1 diff --git a/comms/hf/Makefile b/comms/hf/Makefile index 30523d455783..38359de4b43e 100644 --- a/comms/hf/Makefile +++ b/comms/hf/Makefile @@ -21,7 +21,7 @@ USE_GNOME= gtk12 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX} --mandir=${PREFIX}/man +CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX} ONLY_FOR_ARCHS= i386 diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile index b4156de10b09..64c7c2effb78 100644 --- a/comms/linrad/Makefile +++ b/comms/linrad/Makefile @@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-0${PORTVERSION} GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX} --mandir=${PREFIX}/man +CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX} USE_GMAKE= yes USE_BZIP2= yes ALL_TARGET= xlinrad diff --git a/comms/qfaxreader/Makefile b/comms/qfaxreader/Makefile index dbd0c5f7843f..4a49432bfc63 100644 --- a/comms/qfaxreader/Makefile +++ b/comms/qfaxreader/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_QT_VER= 3 CONFIGURE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} -CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --with-docdir=${DOCSDIR} MAN1= qfaxreader.1 MANCOMPRESSED= yes diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile index 96f6f493ed86..000181503773 100644 --- a/comms/tilp2/Makefile +++ b/comms/tilp2/Makefile @@ -34,7 +34,6 @@ CONFIGURE_ARGS= --disable-nls PLIST_SUB= NLS="@comment " .endif -CONFIGURE_ARGS+= --mandir=${TARGETDIR}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -export-dynamic" diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile index 708d2087d44e..882671bd148d 100644 --- a/comms/xdx/Makefile +++ b/comms/xdx/Makefile @@ -17,7 +17,6 @@ COMMENT= Amateur Radio DX cluster monitor USE_GNOME= gtk20 GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man MAN1= xdx.1 diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile index ef79329078ca..11207f4e9e36 100644 --- a/comms/xlog/Makefile +++ b/comms/xlog/Makefile @@ -17,8 +17,7 @@ COMMENT= Amateur Radio logging application USE_GETTEXT= yes USE_GNOME= libgnomeprint gnomelibs gtk20 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-mime-update \ - --mandir=${PREFIX}/man +CONFIGURE_ARGS= --with-mime-update LIB_DEPENDS+= hamlib:${PORTSDIR}/comms/hamlib diff --git a/converters/tnef/Makefile b/converters/tnef/Makefile index 066dc39fcca0..214ae236dbca 100644 --- a/converters/tnef/Makefile +++ b/converters/tnef/Makefile @@ -16,7 +16,6 @@ COMMENT= Unpack data in MS Outlook TNEF format GNU_CONFIGURE= yes USE_GETOPT_LONG= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= tnef.1 diff --git a/databases/postgis/Makefile b/databases/postgis/Makefile index 1d68fd98777b..0e6b7fee351b 100644 --- a/databases/postgis/Makefile +++ b/databases/postgis/Makefile @@ -31,7 +31,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${PREFIX}/share/postgis \ --bindir=${PREFIX}/bin \ --libdir=${PREFIX}/lib \ - --mandir=${PREFIX}/man \ --with-proj .include <bsd.port.pre.mk> diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile index 93831ed7caef..fa0fa77d4f63 100644 --- a/databases/xapian-core/Makefile +++ b/databases/xapian-core/Makefile @@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= miwi MAINTAINER= jean-francois.dockes@wanadoo.fr COMMENT= A probabilistic text search database engine -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/databases/xapian-core10/Makefile b/databases/xapian-core10/Makefile index 93831ed7caef..fa0fa77d4f63 100644 --- a/databases/xapian-core10/Makefile +++ b/databases/xapian-core10/Makefile @@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= miwi MAINTAINER= jean-francois.dockes@wanadoo.fr COMMENT= A probabilistic text search database engine -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/deskutils/doodle/Makefile b/deskutils/doodle/Makefile index 82eeebba0f61..6944b4f53426 100644 --- a/deskutils/doodle/Makefile +++ b/deskutils/doodle/Makefile @@ -22,7 +22,6 @@ USE_GETTEXT= yes USE_FAM= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= doodle.1 doodled.1 diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile index c88a696d1624..f15efdcdbc5f 100644 --- a/deskutils/gdesklets/Makefile +++ b/deskutils/gdesklets/Makefile @@ -43,7 +43,6 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS= --mandir=${PREFIX}/man/ post-install: @${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 1a6a6ac68250..b934e0e2e860 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -39,8 +39,4 @@ MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 \ GCONF_SCHEMAS= gnome-dictionary.schemas gnome-screenshot.schemas \ gnome-search-tool.schemas logview.schemas baobab.schemas -post-patch: - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} -n 10 \ - ${REINPLACE_CMD} -e 's|@mandir@|${PREFIX}/man|' - .include <bsd.port.mk> diff --git a/devel/arm-elf-binutils/Makefile b/devel/arm-elf-binutils/Makefile index 362fa03758b1..3afd728bc205 100644 --- a/devel/arm-elf-binutils/Makefile +++ b/devel/arm-elf-binutils/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --target=${PKGNAMEPREFIX:S/-$//} -CONFIGURE_ARGS= --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info +INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info MAN1= ${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}as.1 \ ${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}c++filt.1 \ ${PKGNAMEPREFIX}dlltool.1 ${PKGNAMEPREFIX}ld.1 \ diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile index e19e1161fcef..4185285da65c 100644 --- a/devel/autoconf261/Makefile +++ b/devel/autoconf261/Makefile @@ -30,8 +30,7 @@ INFO= autoconf${BUILD_VERSION} standards${BUILD_VERSION} GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir \ - --infodir=${PREFIX}/info --mandir=${PREFIX}/man +CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh missing diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile index e19e1161fcef..4185285da65c 100644 --- a/devel/autoconf262/Makefile +++ b/devel/autoconf262/Makefile @@ -30,8 +30,7 @@ INFO= autoconf${BUILD_VERSION} standards${BUILD_VERSION} GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir \ - --infodir=${PREFIX}/info --mandir=${PREFIX}/man +CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh missing diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile index e19e1161fcef..4185285da65c 100644 --- a/devel/autoconf267/Makefile +++ b/devel/autoconf267/Makefile @@ -30,8 +30,7 @@ INFO= autoconf${BUILD_VERSION} standards${BUILD_VERSION} GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir \ - --infodir=${PREFIX}/info --mandir=${PREFIX}/man +CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh missing diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile index e19e1161fcef..4185285da65c 100644 --- a/devel/autoconf268/Makefile +++ b/devel/autoconf268/Makefile @@ -30,8 +30,7 @@ INFO= autoconf${BUILD_VERSION} standards${BUILD_VERSION} GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir \ - --infodir=${PREFIX}/info --mandir=${PREFIX}/man +CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh missing diff --git a/devel/autodist/Makefile b/devel/autodist/Makefile index fdf87fe57bd3..7aad89391aeb 100644 --- a/devel/autodist/Makefile +++ b/devel/autodist/Makefile @@ -17,7 +17,6 @@ COMMENT= Distribution creation system GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --infodir=${PREFIX}/${INFO_PATH} --mandir=${MANPREFIX}/man USE_GMAKE= yes MAN1= autodist.1 diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile index 6a1a8f347b8d..3bd52905661d 100644 --- a/devel/autogen/Makefile +++ b/devel/autogen/Makefile @@ -23,8 +23,7 @@ USE_BZIP2= yes USE_GNOME= gnomehack gnometarget libxml2 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-libguile=yes --with-libxml2=yes --datadir=${PREFIX}/share \ - --infodir=${PREFIX}/info --mandir=${PREFIX}/man +CONFIGURE_ARGS= --with-libguile=yes --with-libxml2=yes --datadir=${PREFIX}/share USE_LDCONFIG= yes MAN1= autogen.1 autoopts-config.1 columns.1 getdefs.1 xml2ag.1 diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile index 6b06cd222ca9..281a5d2d3c58 100644 --- a/devel/automake110/Makefile +++ b/devel/automake110/Makefile @@ -25,8 +25,7 @@ LATEST_LINK= automake${BUILD_VERSION} USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} \ - --infodir=${PREFIX}/info --mandir=${PREFIX}/man +CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INFO= automake${BUILD_VERSION} diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile index 87241d34df47..1bf11a36f33d 100644 --- a/devel/automake19/Makefile +++ b/devel/automake19/Makefile @@ -26,8 +26,7 @@ USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ENV= AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo -CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} \ - --infodir=${PREFIX}/info +CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INFO= automake${BUILD_VERSION} diff --git a/devel/cook/Makefile b/devel/cook/Makefile index 168d405301e9..2a444f8262be 100644 --- a/devel/cook/Makefile +++ b/devel/cook/Makefile @@ -17,7 +17,6 @@ MAINTAINER= jasone@FreeBSD.org COMMENT= Like make(1), but more powerful and clean GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib \ YACC=yacc CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/devel/cppi/Makefile b/devel/cppi/Makefile index 8b1a500e8c71..5f44308b5b0c 100644 --- a/devel/cppi/Makefile +++ b/devel/cppi/Makefile @@ -17,7 +17,6 @@ COMMENT= A tool to indent the C preprocessor directives USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" PLIST_FILES= bin/cppi diff --git a/devel/cxref/Makefile b/devel/cxref/Makefile index 90dbe455e19a..a5b0f673b900 100644 --- a/devel/cxref/Makefile +++ b/devel/cxref/Makefile @@ -20,7 +20,7 @@ COMMENT= C program cross-referencing & documentation tool USE_GMAKE= yes USE_GNOME= gnometarget GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-cxref-cpp --mandir="${PREFIX}/man" +CONFIGURE_ARGS= --without-cxref-cpp ALL_TARGET= programs MAN1= cxref.1 cxref-query.1 diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile index 956504ca32bd..fa08a090a39a 100644 --- a/devel/darcs/Makefile +++ b/devel/darcs/Makefile @@ -20,7 +20,6 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ OPTIONS= SERVER "install server" off GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/ ${PTHREAD_LIBS}" \ CFLAGS="" diff --git a/devel/djgpp-binutils/Makefile b/devel/djgpp-binutils/Makefile index 7ff8257b64e7..56fab454977c 100644 --- a/devel/djgpp-binutils/Makefile +++ b/devel/djgpp-binutils/Makefile @@ -31,8 +31,8 @@ SRCDIR= ${WRKDIR}/binutils-${BINUTILVERSION}.${PATCHVERSION} WRKSRC= ${WRKDIR}/build CONFIGURE_ARGS= --target=${TARGET} \ --with-gcc --with-gnu-ld --with-gnu-as \ - --disable-nls --disable-shared \ - --infodir=${PREFIX}/${TARGET}/info + --disable-nls --disable-shared +INFO_PATH= ${TARGET}/info MAN1= ${TARGET}-addr2line.1 ${TARGET}-ar.1 \ ${TARGET}-as.1 ${TARGET}-dlltool.1 \ diff --git a/devel/djgpp-gcc/Makefile b/devel/djgpp-gcc/Makefile index dbd0b9ba8e19..e58bc2b93211 100644 --- a/devel/djgpp-gcc/Makefile +++ b/devel/djgpp-gcc/Makefile @@ -56,7 +56,6 @@ CONFIGURE_ARGS= --target=${TARGET} \ --with-gcc --with-gnu-ld --with-gnu-as \ --disable-nls --disable-shared \ --with-gxx-include-dir=${PREFIX}/${TARGET}/include/c++/ \ - --infodir=${PREFIX}/${TARGET}/info \ --includedir=${PREFIX}/${TARGET}/include \ --datadir=${PREFIX}/${TARGET}/share .if defined(WITH_FORTRAN) @@ -64,6 +63,7 @@ CONFIGURE_ARGS+=--enable-languages=c,c++,fortran,objc,obj-c++ .else CONFIGURE_ARGS+=--enable-languages=c,c++,objc,obj-c++ .endif +INFO_PATH= ${TARGET}/info MAKE_ENV= PATH=${PREFIX}/bin:${PATH} LIBTOOLFILES= configure gcc/configure diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 6989d6652824..c14e74ea7d64 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -32,8 +32,7 @@ USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack \ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --disable-gtk-doc \ - --mandir=${PREFIX}/man + --disable-gtk-doc # --enable-gconf-source=${PREFIX}/etc/gconf/schemas \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/geany/Makefile b/devel/geany/Makefile index 7aa44f9a21af..6744e8f8139f 100644 --- a/devel/geany/Makefile +++ b/devel/geany/Makefile @@ -20,7 +20,6 @@ INSTALLS_ICONS= yes USE_BZIP2= yes USE_GNOME= gtk20 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+=--mandir="${MANPREFIX}/man" OPTIONS= VTE "Enable Virtual Terminal Emulation support" on \ NLS "Enable Native Language support" on diff --git a/devel/gengetopt/Makefile b/devel/gengetopt/Makefile index 9d4ad0c7ee4d..83104453277e 100644 --- a/devel/gengetopt/Makefile +++ b/devel/gengetopt/Makefile @@ -16,7 +16,6 @@ MAINTAINER= laszlof@FreeBSD.org COMMENT= A tool for generating a C function which parses command line arguments GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --infodir=${PREFIX}/info --mandir=${PREFIX}/man CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index dbffeb1dc56b..3da44d8b511e 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -28,8 +28,7 @@ CONFIGURE_ENV= ACLOCAL="${TRUE}" \ CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ EMACS="no" -CONFIGURE_ARGS= --disable-csharp --disable-threads --disable-openmp \ - --mandir=${PREFIX}/man --infodir=${PREFIX}/info +CONFIGURE_ARGS= --disable-csharp --disable-threads --disable-openmp USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION} diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile index fd92153f16f9..f36a585778b6 100644 --- a/devel/gnu-autoconf/Makefile +++ b/devel/gnu-autoconf/Makefile @@ -31,8 +31,7 @@ NO_MTREE= yes INFO= autoconf standards CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --infodir=${PREFIX}/info --mandir=${PREFIX}/man \ - --without-lispdir +CONFIGURE_ARGS= --without-lispdir CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= autoconf.1 autoheader.1 autom4te.1 autoreconf.1 autoscan.1 \ diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile index 40853d6bffde..f3ee383e59e8 100644 --- a/devel/gnu-automake/Makefile +++ b/devel/gnu-automake/Makefile @@ -30,7 +30,6 @@ CONFIGURE_ENV= AUTOCONF=${LOCALBASE}/gnu-autotools/bin/autoconf \ AUTOHEADER=${LOCALBASE}/gnu-autotools/bin/autoheader \ MAKEINFO="${MAKEINFO} --no-split" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --infodir=${PREFIX}/info --mandir=${PREFIX}/man PLIST_SUB= VERSION=1.10 diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile index 2af7ca04b2c9..ed490471744b 100644 --- a/devel/gperf/Makefile +++ b/devel/gperf/Makefile @@ -17,8 +17,6 @@ COMMENT= Generates perfect hash functions for sets of keywords GNU_CONFIGURE= yes MAN1= gperf.1 INFO= gperf -CONFIGURE_ARGS+= --mandir=${PREFIX}/man \ - --infodir=${PREFIX}/${INFO_PATH} \ - --docdir=${DOCSDIR} +CONFIGURE_ARGS+= --docdir=${DOCSDIR} .include <bsd.port.mk> diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile index d9cc98a6018a..a1b3fa0c9d49 100644 --- a/devel/gtranslator/Makefile +++ b/devel/gtranslator/Makefile @@ -27,8 +27,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lgnuregex" CONFIGURE_ARGS= --disable-debug \ - --enable-compile-warnings=no \ - --mandir=${PREFIX}/man + --enable-compile-warnings=no MAN1= gtranslator.1 pozilla.sh.1 diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile index 986443252ba1..886490012c85 100644 --- a/devel/guile-lib/Makefile +++ b/devel/guile-lib/Makefile @@ -18,7 +18,6 @@ BUILD_DEPENDS= guile:${PORTSDIR}/lang/guile RUN_DEPENDS= guile:${PORTSDIR}/lang/guile GNU_CONFIGURE= yes -CONFIGURE_ARGS= --infodir=${PREFIX}/info USE_GMAKE= yes INFO= guile-library diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile index 956504ca32bd..fa08a090a39a 100644 --- a/devel/hs-darcs/Makefile +++ b/devel/hs-darcs/Makefile @@ -20,7 +20,6 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ OPTIONS= SERVER "install server" off GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/ ${PTHREAD_LIBS}" \ CFLAGS="" diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index 6c8afea465f5..634653844522 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -31,8 +31,7 @@ USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes -CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \ - --with-db-include-dir=${BDB_INCLUDE_DIR} \ +CONFIGURE_ARGS+=--with-db-include-dir=${BDB_INCLUDE_DIR} \ --with-db-lib-dir=${BDB_LIB_DIR} --with-db-name=${BDB_LIB_NAME} \ --with-apr-config=${LOCALBASE}/bin/apr-1-config \ --with-apu-config=${LOCALBASE}/bin/apu-1-config \ diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index 6c8afea465f5..634653844522 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -31,8 +31,7 @@ USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes -CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \ - --with-db-include-dir=${BDB_INCLUDE_DIR} \ +CONFIGURE_ARGS+=--with-db-include-dir=${BDB_INCLUDE_DIR} \ --with-db-lib-dir=${BDB_LIB_DIR} --with-db-name=${BDB_LIB_NAME} \ --with-apr-config=${LOCALBASE}/bin/apr-1-config \ --with-apu-config=${LOCALBASE}/bin/apu-1-config \ diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile index a80cd6de8e8d..a5cd2c296fd6 100644 --- a/devel/libIDL/Makefile +++ b/devel/libIDL/Makefile @@ -22,8 +22,7 @@ USE_BISON= yes USE_GNOME= gnomehack glib20 USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --infodir=${PREFIX}/info +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index fda80eee4ad7..d312ac404f1b 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -31,8 +31,7 @@ GNU_CONFIGURE= yes USE_PERL5= yes USE_GNOME= gnomehack intlhack libxml2 orbit2 referencehack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --disable-gtk-doc \ - --mandir=${PREFIX}/man + --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" MAKE_ENV= gnomelocaledir=${PREFIX}/share/locale diff --git a/devel/libccid/Makefile b/devel/libccid/Makefile index 7be111caf779..313431955cfe 100644 --- a/devel/libccid/Makefile +++ b/devel/libccid/Makefile @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_PERL5_BUILD=yes CONFIGURE_ARGS= --enable-usbdropdir=${LOCALBASE}/lib/pcsc/drivers \ --enable-ccidtwindir=${LOCALBASE}/lib/pcsc/drivers/serial \ - --enable-udev --mandir=${PREFIX}/man + --enable-udev CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \ LIBUSB_CFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile index e54eddc1d7f5..eb05758dd686 100644 --- a/devel/libevent/Makefile +++ b/devel/libevent/Makefile @@ -13,7 +13,6 @@ MASTER_SITES= http://monkey.org/~provos/ MAINTAINER= mnag@FreeBSD.org COMMENT= Provides an API to execute callback functions on certain events -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index fd5cd87dbc52..6d13526f41e3 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -25,8 +25,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack glib20 ltverhack intlhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS= --infodir=${PREFIX}/info \ - --disable-gtk-doc \ +CONFIGURE_ARGS= --disable-gtk-doc \ --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libruin/Makefile b/devel/libruin/Makefile index 95e1e4802e2e..43d4165cb5f6 100644 --- a/devel/libruin/Makefile +++ b/devel/libruin/Makefile @@ -19,8 +19,6 @@ BUILD_DEPENDS= ${LOCALBASE}/share/guile/site/config/load.scm:${PORTSDIR}/devel/g RUN_DEPENDS= ${LOCALBASE}/share/guile/site/config/load.scm:${PORTSDIR}/devel/guile-lib GNU_CONFIGURE= yes -CONFIGURE_ARGS= --infodir=${PREFIX}/info \ - --mandir=${PREFIX}/man USE_LDCONFIG= yes MAN3= ruin.3 diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile index 45f02dfe98fa..933cbc988dca 100644 --- a/devel/libslang2/Makefile +++ b/devel/libslang2/Makefile @@ -30,7 +30,6 @@ INSTALL_TARGET= install install-static MAN1= slsh.1 DOCSDIR= ${PREFIX}/share/doc/slang DATADIR= ${PREFIX}/share/slsh -CONFIGURE_ARGS= --mandir=${MAN1PREFIX}/man OPTIONS= PCRE "Include pcre support" on \ PNG "Include png support" on \ diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile index 9b43c49aed5e..597f0d793249 100644 --- a/devel/libstatgrab/Makefile +++ b/devel/libstatgrab/Makefile @@ -32,7 +32,7 @@ MAN3= sg_get_cpu_percents.3 sg_get_cpu_stats.3 \ sg_get_process_stats.3 sg_get_swap_stats.3 \ sg_get_user_stats.3 statgrab.3 -CONFIGURE_ARGS+= --disable-examples --mandir=${PREFIX}/man +CONFIGURE_ARGS+= --disable-examples .ifdef(WITHOUT_STATGRAB) CONFIGURE_ARGS+= --disable-statgrab diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile index ab5d4c94be0a..91ed7c37d172 100644 --- a/devel/libtool15/Makefile +++ b/devel/libtool15/Makefile @@ -18,7 +18,6 @@ COMMENT?= Generic shared library support script GNU_CONFIGURE= yes CONFIGURE_ARGS?= --disable-ltdl-install -CONFIGURE_ARGS+= --infodir=${PREFIX}/info CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INFO?= libtool diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile index 64f5652e16fd..1ea6d9090dd5 100644 --- a/devel/libzvbi/Makefile +++ b/devel/libzvbi/Makefile @@ -30,6 +30,5 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/li post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|mandir = .*|mandir = ${MANPREFIX}/man|g' ${WRKSRC}/contrib/Makefile.in .include <bsd.port.mk> diff --git a/devel/m4/Makefile b/devel/m4/Makefile index fb8dafb37e18..a7ffe5860a19 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -16,8 +16,7 @@ COMMENT= GNU m4 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --infodir=${PREFIX}/info --mandir=${PREFIX}/man \ - --program-prefix=g +CONFIGURE_ARGS= --program-prefix=g .if defined(WITH_CHANGEWORD) CONFIGURE_ARGS+= --enable-changeword diff --git a/devel/mcpp/Makefile b/devel/mcpp/Makefile index c363f9672a5e..c8e59eb133ae 100644 --- a/devel/mcpp/Makefile +++ b/devel/mcpp/Makefile @@ -17,7 +17,6 @@ COMMENT= Alternative C/C++ preprocessor GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN1= mcpp.1 PLIST_FILES= bin/mcpp \ diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile index d21855e855e9..3558b9152b09 100644 --- a/devel/mingw32-binutils/Makefile +++ b/devel/mingw32-binutils/Makefile @@ -40,8 +40,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \ --with-gcc --with-gnu-ld --with-gnu-as \ --disable-nls --disable-win32-registry \ - --disable-shared \ - --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info + --disable-shared +INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info MAN1= ${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}ar.1 \ ${PKGNAMEPREFIX}as.1 ${PKGNAMEPREFIX}dlltool.1 \ diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile index cc23fc10798e..db0892457de2 100644 --- a/devel/mingw32-gcc/Makefile +++ b/devel/mingw32-gcc/Makefile @@ -66,9 +66,9 @@ CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \ --enable-interpreter --enable-hash-synchronization \ --without-newlib \ --with-gxx-include-dir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/include/c++/${GCCVERSION} \ - --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info \ --includedir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/include \ --datadir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/share +INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info MAKE_ENV= PATH=${PREFIX}/bin:${PATH} LIBTOOLFILES= configure gcc/configure MAN1= ${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}g77.1 \ diff --git a/devel/mm/Makefile b/devel/mm/Makefile index 0235367a2aff..da819f9ea151 100644 --- a/devel/mm/Makefile +++ b/devel/mm/Makefile @@ -17,7 +17,6 @@ COMMENT= Shared memory allocation library for pre-forked process models USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN1= mm-config.1 MAN3= mm.3 diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index ed0693ab660b..6fb8ff66866b 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -21,7 +21,6 @@ USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --infodir=${PREFIX}/${INFO_PATH} --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ MAKEINFO="makeinfo --no-split" diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile index e652d882ca81..1b6007e35964 100644 --- a/devel/msp430-binutils/Makefile +++ b/devel/msp430-binutils/Makefile @@ -22,7 +22,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \ --with-gcc --with-gnu-ld --with-gnu-as \ - --disable-nls --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info + --disable-nls +INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info MAN1= ${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}nm.1 \ ${PKGNAMEPREFIX}objdump.1 ${PKGNAMEPREFIX}ranlib.1 \ ${PKGNAMEPREFIX}size.1 ${PKGNAMEPREFIX}strings.1 \ diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile index c1858454ae48..70a7dd964419 100644 --- a/devel/msp430-gcc/Makefile +++ b/devel/msp430-gcc/Makefile @@ -35,8 +35,8 @@ USE_PERL5_BUILD=yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \ --with-gcc --with-gnu-ld --with-gnu-as \ - --enable-languages=c --disable-nls \ - --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info + --enable-languages=c --disable-nls +INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info MAKE_ENV= PATH=${PREFIX}/bin:${PATH} MAN1= ${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1 diff --git a/devel/msp430-gcc3/Makefile b/devel/msp430-gcc3/Makefile index c1858454ae48..70a7dd964419 100644 --- a/devel/msp430-gcc3/Makefile +++ b/devel/msp430-gcc3/Makefile @@ -35,8 +35,8 @@ USE_PERL5_BUILD=yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \ --with-gcc --with-gnu-ld --with-gnu-as \ - --enable-languages=c --disable-nls \ - --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info + --enable-languages=c --disable-nls +INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info MAKE_ENV= PATH=${PREFIX}/bin:${PATH} MAN1= ${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1 diff --git a/devel/ossp-cfg/Makefile b/devel/ossp-cfg/Makefile index d42e7958d3fd..96a7f737cf44 100644 --- a/devel/ossp-cfg/Makefile +++ b/devel/ossp-cfg/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= ex.10:${PORTSDIR}/devel/ossp-ex GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-ex=${LOCALBASE} --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --with-ex=${LOCALBASE} USE_LDCONFIG= yes MAN3= cfg.3 diff --git a/devel/ossp-l2/Makefile b/devel/ossp-l2/Makefile index 48991d900564..930662564640 100644 --- a/devel/ossp-l2/Makefile +++ b/devel/ossp-l2/Makefile @@ -16,7 +16,6 @@ MAINTAINER= mnag@FreeBSD.org COMMENT= A C library for a flexible and sophisticated Unix logging facility GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_LDCONFIG= yes diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 862a4c61b933..868fe9e424d1 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -19,8 +19,7 @@ COMMENT= Perl Compatible Regular Expressions library USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man --enable-utf8 \ - --enable-unicode-properties +CONFIGURE_ARGS= --enable-utf8 --enable-unicode-properties CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} .if !defined(NOPORTDOCS) diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile index 651fb92d8846..5a8c5b40c254 100644 --- a/devel/pcsc-lite/Makefile +++ b/devel/pcsc-lite/Makefile @@ -30,8 +30,7 @@ CONFIGURE_ARGS+=--enable-debug \ --enable-confdir=${PREFIX}/etc/ \ --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers/ \ --enable-muscledropdir=${PREFIX}/lib/pcsc/services/ \ - --enable-threadsafe \ - --mandir=${PREFIX}/man + --enable-threadsafe USE_GETOPT_LONG=yes PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index 55d116d28698..65bcb1ce2fef 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -31,7 +31,6 @@ PC_PATH:= ${PC_PATH}:${LOCALBASE}/lib/pkgconfig .endif CONFIGURE_ARGS= --disable-threads \ - --with-pc-path="${PC_PATH}" \ - --mandir=${MANPREFIX}/man + --with-pc-path="${PC_PATH}" .include <bsd.port.post.mk> diff --git a/devel/rlwrap/Makefile b/devel/rlwrap/Makefile index 3a5898e76e98..56c7672d5985 100644 --- a/devel/rlwrap/Makefile +++ b/devel/rlwrap/Makefile @@ -18,7 +18,6 @@ USE_GETOPT_LONG= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= ptyttylib_cv_ptys=BSD LDFLAGS=-lutil -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man MAN1= rlwrap.1 diff --git a/devel/shtool/Makefile b/devel/shtool/Makefile index 2f0c7f988de2..d50ea81358a6 100644 --- a/devel/shtool/Makefile +++ b/devel/shtool/Makefile @@ -18,7 +18,6 @@ COMMENT= The GNU Portable Shell Tool USE_PERL5_BUILD= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN1= shtool-arx.1 shtool-echo.1 shtool-fixperm.1 shtool-install.1 \ shtool-mdate.1 shtool-mkdir.1 shtool-mkln.1 shtool-mkshadow.1 \ diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile index 12f24cadea7a..755106ade487 100644 --- a/devel/yasm/Makefile +++ b/devel/yasm/Makefile @@ -18,7 +18,6 @@ USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man .include <bsd.port.pre.mk> diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile index 681e25a4d0bd..4d82c32306f2 100644 --- a/devel/zziplib/Makefile +++ b/devel/zziplib/Makefile @@ -18,7 +18,6 @@ USE_BZIP2= yes USE_GNOME= gnomehack pkgconfig GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${PREFIX}/man USE_PYTHON_BUILD= yes USE_LDCONFIG= yes diff --git a/dns/bind9-sdb-ldap/Makefile b/dns/bind9-sdb-ldap/Makefile index a6ee41b28bbd..0da04c267546 100644 --- a/dns/bind9-sdb-ldap/Makefile +++ b/dns/bind9-sdb-ldap/Makefile @@ -42,8 +42,7 @@ PKGNAMESUFFIX= -sdb-ldap-base PREFIX= /usr BIND_DESTETC= /etc/namedb CONFIGURE_ARGS+= --prefix=${PREFIX} \ - --sysconfdir=${BIND_DESTETC} \ - --mandir=${MANPREFIX}/man + --sysconfdir=${BIND_DESTETC} .else BIND_DESTETC= ${PREFIX}/etc .endif diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile index b830f1639417..da7c623ce89b 100644 --- a/dns/bind9/Makefile +++ b/dns/bind9/Makefile @@ -59,8 +59,7 @@ PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb CONFIGURE_ARGS+= --prefix=${PREFIX} \ - --sysconfdir=${BIND_DESTETC} \ - --mandir=${MANPREFIX}/man + --sysconfdir=${BIND_DESTETC} .else BIND_DESTETC= ${PREFIX}/etc .endif diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile index d029e89e4170..ccf426c441cc 100644 --- a/dns/bind94/Makefile +++ b/dns/bind94/Makefile @@ -67,8 +67,7 @@ PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb CONFIGURE_ARGS+= --prefix=${PREFIX} \ - --sysconfdir=${BIND_DESTETC} \ - --mandir=${MANPREFIX}/man + --sysconfdir=${BIND_DESTETC} .else BIND_DESTETC= ${PREFIX}/etc .endif diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile index d029e89e4170..ccf426c441cc 100644 --- a/dns/bind95/Makefile +++ b/dns/bind95/Makefile @@ -67,8 +67,7 @@ PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb CONFIGURE_ARGS+= --prefix=${PREFIX} \ - --sysconfdir=${BIND_DESTETC} \ - --mandir=${MANPREFIX}/man + --sysconfdir=${BIND_DESTETC} .else BIND_DESTETC= ${PREFIX}/etc .endif diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile index d029e89e4170..ccf426c441cc 100644 --- a/dns/bind96/Makefile +++ b/dns/bind96/Makefile @@ -67,8 +67,7 @@ PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb CONFIGURE_ARGS+= --prefix=${PREFIX} \ - --sysconfdir=${BIND_DESTETC} \ - --mandir=${MANPREFIX}/man + --sysconfdir=${BIND_DESTETC} .else BIND_DESTETC= ${PREFIX}/etc .endif diff --git a/dns/c-ares/Makefile b/dns/c-ares/Makefile index 35b7c7d1e62a..e7b2a7f6109a 100644 --- a/dns/c-ares/Makefile +++ b/dns/c-ares/Makefile @@ -32,7 +32,7 @@ PLIST_SUB= SHLIB_VER="${SHLIB_VER}" GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${PREFIX}/man --enable-shared +CONFIGURE_ARGS= --enable-shared MAN3= ares_cancel.3 \ ares_destroy.3 \ diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile index 610ffede5b84..df014d325bd4 100644 --- a/dns/libidn/Makefile +++ b/dns/libidn/Makefile @@ -21,8 +21,6 @@ USE_ICONV= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_PERL5_BUILD= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man \ - --infodir=${PREFIX}/info CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile index 221f7bb89e52..7b4da7c6df09 100644 --- a/dns/powerdns-devel/Makefile +++ b/dns/powerdns-devel/Makefile @@ -27,7 +27,6 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-modules="pipe" \ --with-dynmodules="${CONFIGURE_MODULES}" \ --sysconfdir="${PREFIX}/etc/pdns" \ - --mandir="${PREFIX}/man" # --enable-debug SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR2="${.CURDIR}" \ diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index 221f7bb89e52..7b4da7c6df09 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -27,7 +27,6 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-modules="pipe" \ --with-dynmodules="${CONFIGURE_MODULES}" \ --sysconfdir="${PREFIX}/etc/pdns" \ - --mandir="${PREFIX}/man" # --enable-debug SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR2="${.CURDIR}" \ diff --git a/dns/updatedd/Makefile b/dns/updatedd/Makefile index ff53f1e8e039..3f1073bcf23f 100644 --- a/dns/updatedd/Makefile +++ b/dns/updatedd/Makefile @@ -19,7 +19,6 @@ USE_PERL5= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --mandir=${PREFIX}/man WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 7404a21189c2..bb970bfe7687 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -55,8 +55,6 @@ CONFIGURE_ARGS= --with-gtk CONFIGURE_ARGS+= --without-xim .endif -CONFIGURE_ARGS+= --infodir='$${prefix}/info' --mandir='$${prefix}/man' - MAN1= ctags.1 emacs.1 emacsclient.1 etags.1 PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 361c8b45e445..bf05fe50988b 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -37,8 +37,8 @@ USE_XLIB= yes USE_XORG= xbitmaps .endif CONFIGURE_ARGS+= --with-line-space \ - --bindir='$${archlibdir}' \ - --infodir='$${datadir}/emacs/$${version}/info' + --bindir='$${archlibdir}' +INFO_PATH= ${DATADIR_REL}/${EMACS_VER}/info MAKE_ARGS+= manext=20.1 MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile index 9fc88c5ef932..8f84be7d4dfa 100644 --- a/editors/gobby/Makefile +++ b/editors/gobby/Makefile @@ -23,8 +23,6 @@ USE_XLIB= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack pkgconfig gtksourceview -CONFIGURE_ARGS= "--mandir=${PREFIX}/man" - PLIST_FILES= bin/gobby share/pixmaps/gobby.png \ share/pixmaps/gobby/userlist.png \ share/pixmaps/gobby/doclist.png \ diff --git a/editors/morla/Makefile b/editors/morla/Makefile index 3571e2641e11..2ce95c206b6c 100644 --- a/editors/morla/Makefile +++ b/editors/morla/Makefile @@ -23,7 +23,6 @@ RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I/${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man USE_GETTEXT= yes USE_GNOME= libgtkhtml libxslt diff --git a/editors/nano/Makefile b/editors/nano/Makefile index 632a2b6603fe..5d03670cf991 100644 --- a/editors/nano/Makefile +++ b/editors/nano/Makefile @@ -15,8 +15,7 @@ MAINTAINER= naddy@FreeBSD.org COMMENT= Nano's ANOther editor, an enhanced free Pico clone GNU_CONFIGURE= yes -CONFIGURE_ARGS= --infodir=${PREFIX}/${INFO_PATH} --mandir=${PREFIX}/man \ - --enable-all +CONFIGURE_ARGS= --enable-all CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile index 406eeb7e4237..0939ac092951 100644 --- a/editors/poedit/Makefile +++ b/editors/poedit/Makefile @@ -29,7 +29,6 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ WXRC="${WXRC_CMD}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man INSTALLS_ICONS= yes MAN1= poedit.1 diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile index 931b864b9586..73e15e911f4f 100644 --- a/editors/psgml/Makefile +++ b/editors/psgml/Makefile @@ -49,8 +49,7 @@ PLIST_SUB+= XEMACS="@comment " \ .if defined(EMACS_PORT_NAME) PSGML_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/psgml GNU_CONFIGURE= YES -CONFIGURE_ARGS= --lispdir=${PSGML_LISPDIR} \ - --infodir=${PREFIX}/${INFO_PATH} +CONFIGURE_ARGS= --lispdir=${PSGML_LISPDIR} CONFIGURE_ENV= EMACS=${EMACS_CMD} .else .BEGIN: diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile index c9b5848176e1..85be090b9de2 100644 --- a/editors/xemacs-devel-mule/Makefile +++ b/editors/xemacs-devel-mule/Makefile @@ -7,6 +7,7 @@ PORTNAME= xemacs-devel-mule PORTVERSION= ${XEMACS_VER:S/-/./} +PORTREVISION= 1 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL} @@ -81,6 +82,22 @@ DESCR= ${PKGDIR}/pkg-descr.ja .else MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \ gnuserv.1 xemacs.1 +INFO= xemacs-${XEMACS_VER}/beta \ + xemacs-${XEMACS_VER}/cl \ + xemacs-${XEMACS_VER}/custom \ + xemacs-${XEMACS_VER}/emodules \ + xemacs-${XEMACS_VER}/external-widget \ + xemacs-${XEMACS_VER}/info \ + xemacs-${XEMACS_VER}/internals \ + xemacs-${XEMACS_VER}/lispref \ + xemacs-${XEMACS_VER}/new-users-guide \ + xemacs-${XEMACS_VER}/standards \ + xemacs-${XEMACS_VER}/term \ + xemacs-${XEMACS_VER}/termcap \ + xemacs-${XEMACS_VER}/texinfo \ + xemacs-${XEMACS_VER}/widget \ + xemacs-${XEMACS_VER}/xemacs-faq \ + xemacs-${XEMACS_VER}/xemacs .endif # Debugging. diff --git a/editors/xemacs-devel-mule/pkg-plist b/editors/xemacs-devel-mule/pkg-plist index 20d86c68b3e0..44ac3e68a73e 100644 --- a/editors/xemacs-devel-mule/pkg-plist +++ b/editors/xemacs-devel-mule/pkg-plist @@ -9,6 +9,7 @@ bin/ootags bin/rcs-checkin bin/xemacs bin/xemacs-%%XEMACS_VER%% +info/xemacs-%%XEMACS_VER%%/dir @exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp lib/xemacs-%%XEMACS_VER%%/etc/COPYING lib/xemacs-%%XEMACS_VER%%/etc/ChangeLog @@ -863,46 +864,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/sorted-doc lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/vcdiff lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow -lib/xemacs-%%XEMACS_VER%%/info/beta.info -lib/xemacs-%%XEMACS_VER%%/info/cl.info -lib/xemacs-%%XEMACS_VER%%/info/custom.info -lib/xemacs-%%XEMACS_VER%%/info/dir -lib/xemacs-%%XEMACS_VER%%/info/emodules.info -lib/xemacs-%%XEMACS_VER%%/info/external-widget.info -lib/xemacs-%%XEMACS_VER%%/info/info.info -lib/xemacs-%%XEMACS_VER%%/info/internals.info -lib/xemacs-%%XEMACS_VER%%/info/internals.info-1 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-2 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-3 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-4 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-5 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10 -lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info -lib/xemacs-%%XEMACS_VER%%/info/standards.info -lib/xemacs-%%XEMACS_VER%%/info/term.info -lib/xemacs-%%XEMACS_VER%%/info/termcap.info -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2 -lib/xemacs-%%XEMACS_VER%%/info/widget.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK lib/xemacs-%%XEMACS_VER%%/lisp/README @@ -1460,7 +1421,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule @dirrm lib/xemacs-%%XEMACS_VER%%/lisp -@dirrm lib/xemacs-%%XEMACS_VER%%/info @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index 249af927ffeb..c858c33564fc 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= xemacs-devel PORTVERSION= ${XEMACS_VER:S/-/./} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} @@ -60,6 +60,22 @@ CONFIGURE_ARGS?=--enable-clash-detection \ MAKE_ARGS= prefix=${PREFIX} MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \ gnuserv.1 xemacs.1 +INFO= xemacs-${XEMACS_VER}/beta \ + xemacs-${XEMACS_VER}/cl \ + xemacs-${XEMACS_VER}/custom \ + xemacs-${XEMACS_VER}/emodules \ + xemacs-${XEMACS_VER}/external-widget \ + xemacs-${XEMACS_VER}/info \ + xemacs-${XEMACS_VER}/internals \ + xemacs-${XEMACS_VER}/lispref \ + xemacs-${XEMACS_VER}/new-users-guide \ + xemacs-${XEMACS_VER}/standards \ + xemacs-${XEMACS_VER}/term \ + xemacs-${XEMACS_VER}/termcap \ + xemacs-${XEMACS_VER}/texinfo \ + xemacs-${XEMACS_VER}/widget \ + xemacs-${XEMACS_VER}/xemacs-faq \ + xemacs-${XEMACS_VER}/xemacs ALL_TARGET= all dist PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} diff --git a/editors/xemacs-devel/pkg-plist b/editors/xemacs-devel/pkg-plist index 4bae4d0d6a60..03814df23921 100644 --- a/editors/xemacs-devel/pkg-plist +++ b/editors/xemacs-devel/pkg-plist @@ -9,6 +9,7 @@ bin/ootags bin/rcs-checkin bin/xemacs bin/xemacs-%%XEMACS_VER%% +info/xemacs-%%XEMACS_VER%%/dir @exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp lib/xemacs-%%XEMACS_VER%%/etc/COPYING lib/xemacs-%%XEMACS_VER%%/etc/ChangeLog @@ -860,46 +861,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/sorted-doc lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/vcdiff lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow -lib/xemacs-%%XEMACS_VER%%/info/beta.info -lib/xemacs-%%XEMACS_VER%%/info/cl.info -lib/xemacs-%%XEMACS_VER%%/info/custom.info -lib/xemacs-%%XEMACS_VER%%/info/dir -lib/xemacs-%%XEMACS_VER%%/info/emodules.info -lib/xemacs-%%XEMACS_VER%%/info/external-widget.info -lib/xemacs-%%XEMACS_VER%%/info/info.info -lib/xemacs-%%XEMACS_VER%%/info/internals.info -lib/xemacs-%%XEMACS_VER%%/info/internals.info-1 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-2 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-3 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-4 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-5 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10 -lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info -lib/xemacs-%%XEMACS_VER%%/info/standards.info -lib/xemacs-%%XEMACS_VER%%/info/term.info -lib/xemacs-%%XEMACS_VER%%/info/termcap.info -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2 -lib/xemacs-%%XEMACS_VER%%/info/widget.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK lib/xemacs-%%XEMACS_VER%%/lisp/README @@ -1457,7 +1418,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule @dirrm lib/xemacs-%%XEMACS_VER%%/lisp -@dirrm lib/xemacs-%%XEMACS_VER%%/info @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index b46c735d88af..9932bb29558f 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -7,7 +7,7 @@ PORTNAME= xemacs PORTVERSION= ${XEMACS_VER} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL} @@ -42,6 +42,21 @@ CONFIGURE_ARGS?=--with-clash-detection \ MAKE_ARGS= prefix=${PREFIX} MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \ gnuserv.1 xemacs.1 +INFO= xemacs-${XEMACS_VER}/cl \ + xemacs-${XEMACS_VER}/custom \ + xemacs-${XEMACS_VER}/emodules \ + xemacs-${XEMACS_VER}/external-widget \ + xemacs-${XEMACS_VER}/info \ + xemacs-${XEMACS_VER}/internals \ + xemacs-${XEMACS_VER}/lispref \ + xemacs-${XEMACS_VER}/new-users-guide \ + xemacs-${XEMACS_VER}/standards \ + xemacs-${XEMACS_VER}/term \ + xemacs-${XEMACS_VER}/termcap \ + xemacs-${XEMACS_VER}/texinfo \ + xemacs-${XEMACS_VER}/widget \ + xemacs-${XEMACS_VER}/xemacs-faq \ + xemacs-${XEMACS_VER}/xemacs ALL_TARGET= all dist PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} \ @@ -125,6 +140,10 @@ pre-patch: @${ECHO_MSG} "want to use X11." .endif +post-patch:: + @${REINPLACE_CMD} -e 's,@mandir@,@mandir@/man1,' \ + ${WRKSRC}/Makefile.in.in + # Drop faces (libcompface) and offix (libDnd) if building package, # autodetect otherwise .if defined(PACKAGE_BUILDING) diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist index 0e98cf29579d..8cdc2900abb2 100644 --- a/editors/xemacs/pkg-plist +++ b/editors/xemacs/pkg-plist @@ -10,6 +10,7 @@ bin/rcs-checkin bin/xemacs bin/xemacs-%%XEMACS_VER%% %%PDUMP%%bin/xemacs-%%XEMACS_VER%%.dmp +info/xemacs-%%XEMACS_VER%%/dir @exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp lib/xemacs-%%XEMACS_VER%%/etc/BETA lib/xemacs-%%XEMACS_VER%%/etc/CHARSETS @@ -756,41 +757,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/sorted-doc lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/vcdiff lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow -lib/xemacs-%%XEMACS_VER%%/info/cl.info -lib/xemacs-%%XEMACS_VER%%/info/custom.info -lib/xemacs-%%XEMACS_VER%%/info/dir -lib/xemacs-%%XEMACS_VER%%/info/emodules.info -lib/xemacs-%%XEMACS_VER%%/info/external-widget.info -lib/xemacs-%%XEMACS_VER%%/info/info.info -lib/xemacs-%%XEMACS_VER%%/info/internals.info -lib/xemacs-%%XEMACS_VER%%/info/internals.info-1 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-2 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9 -lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info -lib/xemacs-%%XEMACS_VER%%/info/standards.info -lib/xemacs-%%XEMACS_VER%%/info/term.info -lib/xemacs-%%XEMACS_VER%%/info/termcap.info -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2 -lib/xemacs-%%XEMACS_VER%%/info/widget.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.1 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK @@ -1244,7 +1210,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule @dirrm lib/xemacs-%%XEMACS_VER%%/lisp -@dirrm lib/xemacs-%%XEMACS_VER%%/info @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile index 9032a9fad45d..70929fb4c6c6 100644 --- a/editors/xemacs21-mule/Makefile +++ b/editors/xemacs21-mule/Makefile @@ -75,6 +75,7 @@ CONFIGURE_ARGS= --with-x11 \ ${WITH_XIM} \ ${WITH_MENUBARS} ${WITH_SCROLLBARS} \ ${WITH_DIALOGS} ${WITH_WIDGETS} +INFO_PATH= lib/xemacs-${XEMACS_VER}/info MAKE_ARGS= prefix=${PREFIX} ALL_TARGET= all dist .if defined(PKGNAMEPREFIX) @@ -188,6 +189,8 @@ pre-configure:: @${SED} -e 's/\.1/&.gz/' ${WRKSRC}/${f} > ${WRKDIR}/tmp_zot @${MV} ${WRKDIR}/tmp_zot ${WRKSRC}/${f} .endfor + @${REINPLACE_CMD} -e 's/^mandir=@mandir@/mandir=@mandir@\/man1/' \ + ${WRKSRC}/Makefile.in.in pre-build: @${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) \ diff --git a/editors/zile/Makefile b/editors/zile/Makefile index 7e230cffdc20..172f6d93e378 100644 --- a/editors/zile/Makefile +++ b/editors/zile/Makefile @@ -17,8 +17,6 @@ USE_GETOPT_LONG=yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= LIBS="-lgnuregex" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --infodir=${PREFIX}/${INFO_PATH} MAN1= zile.1 INFO= zile diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 6a44ffed2218..d883926c5c55 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms \ xml2:${PORTSDIR}/textproc/libxml2 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man --datadir=${DATADIR} +CONFIGURE_ARGS= --datadir=${DATADIR} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ EXTRA_BINARIES="wine-kthread" diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 6a44ffed2218..d883926c5c55 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms \ xml2:${PORTSDIR}/textproc/libxml2 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man --datadir=${DATADIR} +CONFIGURE_ARGS= --datadir=${DATADIR} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ EXTRA_BINARIES="wine-kthread" diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile index b23ecd535ab8..5a09498db9bb 100644 --- a/finance/grisbi/Makefile +++ b/finance/grisbi/Makefile @@ -44,7 +44,6 @@ PLIST_SUB+= NLS="" .endif pre-configure: - @${REINPLACE_CMD} -e "/^mandir=/s|datarootdir|prefix|" ${WRKSRC}/configure .if defined(NOPORTDOCS) @${REINPLACE_CMD} -e "s|pixmaps help|pixmaps|" ${WRKSRC}/Makefile.in .endif diff --git a/finance/ktoblzcheck/Makefile b/finance/ktoblzcheck/Makefile index c60c2cf8f789..241abba894db 100644 --- a/finance/ktoblzcheck/Makefile +++ b/finance/ktoblzcheck/Makefile @@ -18,7 +18,6 @@ USE_GNOME= gnomehack gnometarget pkgconfig USE_PYTHON= 2.3+ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man USE_LDCONFIG= yes MAN1= ktoblzcheck.1 diff --git a/finance/quantlib/Makefile b/finance/quantlib/Makefile index ae90ae94a8b7..63c1c17e188e 100644 --- a/finance/quantlib/Makefile +++ b/finance/quantlib/Makefile @@ -24,7 +24,6 @@ WRKSRC= ${WRKDIR}/QuantLib-${PORTVERSION} USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" USE_LDCONFIG= yes diff --git a/ftp/axel/Makefile b/ftp/axel/Makefile index 343c7a97e4c4..6cbc7a7460b8 100644 --- a/ftp/axel/Makefile +++ b/ftp/axel/Makefile @@ -18,7 +18,7 @@ COMMENT= A download accelerator USE_GETTEXT= yes USE_GMAKE= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man --i18n=1 +CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man --i18n=1 MAN1= axel.1 diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index a21e298492f0..d4d61f453847 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -48,7 +48,6 @@ PLIST_SUB= SHLIB_VER="${SHLIB_VER}" USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${PREFIX}/man OPTIONS= CARES "Asynchronous DNS resolution via c-ares" off \ CURL_DEBUG "Enable curl diagnostic output" off \ diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile index 47906b76ae3b..0e959f64e28f 100644 --- a/ftp/lftp/Makefile +++ b/ftp/lftp/Makefile @@ -61,8 +61,6 @@ CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif -CONFIGURE_ARGS+=--mandir="${MAN1PREFIX}/man" - MAN1= lftp.1 lftpget.1 post-install: diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile index 28c6427bff5e..06718fdc44fb 100644 --- a/ftp/pavuk/Makefile +++ b/ftp/pavuk/Makefile @@ -21,8 +21,7 @@ USE_GNOME= gnometarget USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --with-locale-dir=${PREFIX}/share/locale \ +CONFIGURE_ARGS= --with-locale-dir=${PREFIX}/share/locale \ --disable-debug --disable-gnome --disable-js \ --enable-utf-8 --enable-threads diff --git a/ftp/wxdfast/Makefile b/ftp/wxdfast/Makefile index 3f0ff559f095..5a889bc8febf 100644 --- a/ftp/wxdfast/Makefile +++ b/ftp/wxdfast/Makefile @@ -19,7 +19,6 @@ USE_WX= 2.6 WX_CONF_ARGS= relative WX_UNICODE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir="${MANPREFIX}/man" WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAN1= wxdfast.1 diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile index 20a1f2ec3ae0..c6b03188d683 100644 --- a/ftp/wzdftpd/Makefile +++ b/ftp/wzdftpd/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GNOME= pkgconfig ltverhack -CONFIGURE_ARGS+= --without-pam --disable-pgsql --disable-bonjour --mandir=${MANPREFIX}/man +CONFIGURE_ARGS+= --without-pam --disable-pgsql --disable-bonjour CONFIGURE_ENV= CPPFLAGS="${CPPLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/games/asc/Makefile b/games/asc/Makefile index 96f4bc42d5a4..11b5714b7186 100644 --- a/games/asc/Makefile +++ b/games/asc/Makefile @@ -33,8 +33,7 @@ CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags`" \ LIBS="`${SDL_CONFIG} --libs` -lm" CONFIGURE_ARGS= --disable-paraguitest \ - --prefix=${TARGETDIR} \ - --mandir=${MANPREFIX}/man + --prefix=${TARGETDIR} OPTIONS= MUSIC "Install extra music files" off diff --git a/games/crimson/Makefile b/games/crimson/Makefile index b90d529641d5..6767b037c33b 100644 --- a/games/crimson/Makefile +++ b/games/crimson/Makefile @@ -14,7 +14,6 @@ MAINTAINER= carpetsmoker@xs4all.nl COMMENT= Tactical war game in the tradition of Battle Isle GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man USE_GMAKE= yes USE_SDL= mixer sdl ttf diff --git a/games/dontspace/Makefile b/games/dontspace/Makefile index 52a374e7b979..3058dccfcce4 100644 --- a/games/dontspace/Makefile +++ b/games/dontspace/Makefile @@ -15,8 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A solitaire game for X11 modeled after Free Space GNU_CONFIGURE= yes -CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/games \ - --mandir=${PREFIX}/man +CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/games CONFIGURE_ENV= WISHX=${PREFIX}/bin/wish8.4 USE_TK= yes MAN6= dontspace.6 diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile index 40436201e925..ff8dc78ce5ba 100644 --- a/games/freedroidrpg/Makefile +++ b/games/freedroidrpg/Makefile @@ -17,7 +17,7 @@ USE_BZIP2= yes USE_SDL= mixer image net sdl WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-transform-name= --mandir="${MANPREFIX}/man" +CONFIGURE_ARGS= --program-transform-name= MAN6= freedroidRPG.6 diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 753c42f1b4b1..809490b1a1dd 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -32,7 +32,6 @@ GNU_CONFIGURE= yes USE_PYTHON= yes USE_SDL= mixer USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui pygnome2 -CONFIGURE_ARGS= --infodir=${PREFIX}/info CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ LIBS="${PTHREAD_LIBS} -lm" diff --git a/games/ggz-client-libs/Makefile b/games/ggz-client-libs/Makefile index cf03f41d7479..53f284be4968 100644 --- a/games/ggz-client-libs/Makefile +++ b/games/ggz-client-libs/Makefile @@ -20,8 +20,7 @@ USE_GNOME= gnometarget USE_GETOPT_LONG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --disable-debug --with-libggz-dir="${LOCALBASE}" \ - --mandir="${MANPREFIX}/man" +CONFIGURE_ARGS= --disable-debug --with-libggz-dir="${LOCALBASE}" USE_LDCONFIG= yes USE_GGZ= core diff --git a/games/ggz-gtk-client/Makefile b/games/ggz-gtk-client/Makefile index 4a339c2ee87c..39a0e79fc9dd 100644 --- a/games/ggz-gtk-client/Makefile +++ b/games/ggz-gtk-client/Makefile @@ -19,7 +19,7 @@ USE_GNOME= gnometarget gtk20 USE_GETOPT_LONG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --disable-debug --mandir="${MANPREFIX}/man" +CONFIGURE_ARGS= --disable-debug USE_GGZ= client MAN6= ggz-gtk.6 diff --git a/games/ggz-kde-client/Makefile b/games/ggz-kde-client/Makefile index e0d066a42999..565e93e6a825 100644 --- a/games/ggz-kde-client/Makefile +++ b/games/ggz-kde-client/Makefile @@ -14,7 +14,6 @@ MAINTAINER= yinjieh@csie.nctu.edu.tw COMMENT= The GGZ Gaming Zone - KDE Client GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir="${MANPREFIX}/man" USE_GMAKE= yes USE_KDELIBS_VER= 3 USE_GGZ= client diff --git a/games/ggz-txt-client/Makefile b/games/ggz-txt-client/Makefile index efe21e5e8a29..612a271122c4 100644 --- a/games/ggz-txt-client/Makefile +++ b/games/ggz-txt-client/Makefile @@ -17,7 +17,7 @@ USE_GNOME= gnometarget USE_GETOPT_LONG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --disable-debug --mandir="${MANPREFIX}/man" +CONFIGURE_ARGS= --disable-debug USE_GGZ= client MAN6= ggz-txt.6 diff --git a/games/gnono/Makefile b/games/gnono/Makefile index 26455e93ce26..c057fe7fe69e 100644 --- a/games/gnono/Makefile +++ b/games/gnono/Makefile @@ -22,7 +22,6 @@ INSTALLS_ICONS= yes GNU_CONFIGURE= yes CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN6= ${PORTNAME}.6 diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile index d97e4e39ed0b..ddcad623123f 100644 --- a/games/gtetrinet/Makefile +++ b/games/gtetrinet/Makefile @@ -23,8 +23,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --bindir=${PREFIX}/bin --enable-ipv6 \ - --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --bindir=${PREFIX}/bin --enable-ipv6 MAN6= gtetrinet.6 GCONF_SCHEMAS= gtetrinet.schemas diff --git a/games/hinversi/Makefile b/games/hinversi/Makefile index 09d9d1cc092b..d465ab79a08a 100644 --- a/games/hinversi/Makefile +++ b/games/hinversi/Makefile @@ -16,7 +16,7 @@ COMMENT= Reversi/Othello clone USE_GETTEXT= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --mandir=${PREFIX}/man\ +CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} \ --disable-static MAN1= hinversi-cli.1 diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile index a2bde403cc11..a36584846ae8 100644 --- a/games/icebreaker/Makefile +++ b/games/icebreaker/Makefile @@ -19,7 +19,7 @@ USE_SDL= mixer sdl USE_GMAKE= yes MAKE_ENV+= prefix="${PREFIX}" \ highscoredir="${PREFIX}/share/icebreaker/scores" \ - mandir="${PREFIX}/man" \ + mandir="${MANPREFIX}/man" \ CHMOD="${CHMOD}" \ CHOWN="${CHOWN}" \ MKDIR="${MKDIR}" \ diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile index b74f6e1bf81b..a31a5fe8ed72 100644 --- a/games/klavaro/Makefile +++ b/games/klavaro/Makefile @@ -22,7 +22,6 @@ CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN1= ${PORTNAME}.1 .include <bsd.port.mk> diff --git a/games/klondike/Makefile b/games/klondike/Makefile index 7f29c7c52768..4861b37d07e1 100644 --- a/games/klondike/Makefile +++ b/games/klondike/Makefile @@ -15,8 +15,7 @@ MAINTAINER= faber@isi.edu COMMENT= A solitaire game for X11 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/games \ - --mandir=${PREFIX}/man +CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/games USE_TK_RUN= yes MAN6= klondike.6 diff --git a/games/latrine/Makefile b/games/latrine/Makefile index b6441c181436..17c37ea3f55d 100644 --- a/games/latrine/Makefile +++ b/games/latrine/Makefile @@ -14,7 +14,7 @@ MAINTAINER= nox@FreeBSD.org COMMENT= Curses-based LAnguage TRaINEr GNU_CONFIGURE= yes -CONFIGURE_ARGS= "CFLAGS=-I${LOCALBASE}/include -I${WRKDIR} -D_XOPEN_SOURCE_EXTENDED" LDFLAGS=-L${LOCALBASE}/lib --mandir=${PREFIX}/man +CONFIGURE_ARGS= "CFLAGS=-I${LOCALBASE}/include -I${WRKDIR} -D_XOPEN_SOURCE_EXTENDED" LDFLAGS=-L${LOCALBASE}/lib USE_GMAKE= yes USE_GETTEXT= yes WRKSRC= ${WRKDIR}/${DISTNAME}/src diff --git a/games/libggz/Makefile b/games/libggz/Makefile index 250babeefbcb..b5c8144b0514 100644 --- a/games/libggz/Makefile +++ b/games/libggz/Makefile @@ -18,7 +18,7 @@ USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gnometarget GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --disable-debug --mandir="${MANPREFIX}/man" +CONFIGURE_ARGS= --disable-debug USE_LDCONFIG= yes MAN3= ggz.h.3 diff --git a/games/penguin-command/Makefile b/games/penguin-command/Makefile index 47744200e959..ea47466b5dc7 100644 --- a/games/penguin-command/Makefile +++ b/games/penguin-command/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_SDL= mixer image sdl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man --program-prefix="" +CONFIGURE_ARGS= --program-prefix="" MAN6= penguin-command.6 penguin-command.ja.6 diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile index 13bfdb239427..4124d6d469a3 100644 --- a/games/pioneers/Makefile +++ b/games/pioneers/Makefile @@ -23,7 +23,6 @@ INSTALLS_OMF= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir="${MANPREFIX}/man" MAN6= pioneers.6 pioneers-server-gtk.6 pioneers-server-console.6 \ pioneersai.6 pioneers-meta-server.6 diff --git a/games/poker-engine/Makefile b/games/poker-engine/Makefile index 9f02e2382d24..e8b56fb514da 100644 --- a/games/poker-engine/Makefile +++ b/games/poker-engine/Makefile @@ -23,7 +23,6 @@ BUILD_DEPENDS= ${RUN_DEPENDS} USE_GNOME= gnometarget pkgconfig USE_PYTHON= 2.3+ GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man USE_GMAKE= yes MAN8= pokerconfigupgrade.8 diff --git a/games/tmw/Makefile b/games/tmw/Makefile index 0483ac745d25..578db9e9cb48 100644 --- a/games/tmw/Makefile +++ b/games/tmw/Makefile @@ -31,7 +31,6 @@ USE_GETOPT_LONG=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN6= tmw.6 OPTIONS= MUSIC "Install additional music" On diff --git a/games/vamos/Makefile b/games/vamos/Makefile index 6e3d07896e3e..bc6a197d3752 100644 --- a/games/vamos/Makefile +++ b/games/vamos/Makefile @@ -26,7 +26,6 @@ USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ MAKEINFO="makeinfo --no-split" CONFIGURE_ARGS= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \ - --infodir=${PREFIX}/${INFO_PATH} \ ac_cv_header_boost_test_unit_test_hpp=no USE_LDCONFIG= yes diff --git a/games/warmux/Makefile b/games/warmux/Makefile index 200c7ebeffa4..7d2f44de7824 100644 --- a/games/warmux/Makefile +++ b/games/warmux/Makefile @@ -20,8 +20,7 @@ LIB_DEPENDS= xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26 \ GNU_CONFIGURE= yes USE_SDL= sdl image mixer ttf gfx net -CONFIGURE_ARGS= --with-datadir-name=${DATADIR} --program-prefix="" \ - --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --with-datadir-name=${DATADIR} --program-prefix="" MAN6= wormux.6 diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile index 40896c8ff8c1..c41b6389a59c 100644 --- a/games/wesnoth-devel/Makefile +++ b/games/wesnoth-devel/Makefile @@ -27,8 +27,7 @@ CONFIGURE_ARGS= --localstatedir=/var \ --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} \ --with-freetype-prefix=${LOCALBASE} \ - --with-localedir=${PREFIX}/share/locale \ - --mandir=${PREFIX}/man + --with-localedir=${PREFIX}/share/locale CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS} -ftemplate-depth-45" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 40896c8ff8c1..c41b6389a59c 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -27,8 +27,7 @@ CONFIGURE_ARGS= --localstatedir=/var \ --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} \ --with-freetype-prefix=${LOCALBASE} \ - --with-localedir=${PREFIX}/share/locale \ - --mandir=${PREFIX}/man + --with-localedir=${PREFIX}/share/locale CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS} -ftemplate-depth-45" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" diff --git a/games/wormux-devel/Makefile b/games/wormux-devel/Makefile index 209715354761..9bf887b39e20 100644 --- a/games/wormux-devel/Makefile +++ b/games/wormux-devel/Makefile @@ -23,7 +23,6 @@ USE_SDL= sdl image mixer ttf gfx net USE_GMAKE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/games/wormux/Makefile b/games/wormux/Makefile index 200c7ebeffa4..7d2f44de7824 100644 --- a/games/wormux/Makefile +++ b/games/wormux/Makefile @@ -20,8 +20,7 @@ LIB_DEPENDS= xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26 \ GNU_CONFIGURE= yes USE_SDL= sdl image mixer ttf gfx net -CONFIGURE_ARGS= --with-datadir-name=${DATADIR} --program-prefix="" \ - --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --with-datadir-name=${DATADIR} --program-prefix="" MAN6= wormux.6 diff --git a/games/xabacus/Makefile b/games/xabacus/Makefile index cc17e5cdd95e..643bde7043e2 100644 --- a/games/xabacus/Makefile +++ b/games/xabacus/Makefile @@ -23,8 +23,7 @@ WANT_GNOME= yes USE_GNOME= gnometarget USE_XPM= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --without-nas +CONFIGURE_ARGS= --without-nas MAN6= xabacus.6 diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile index 3fc87bd1eb03..b0820fbe9dff 100644 --- a/games/xmoto/Makefile +++ b/games/xmoto/Makefile @@ -30,7 +30,6 @@ USE_GCC= 3.4+ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir="${PREFIX}/man" CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -I${LUA_INCDIR} LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -L${LUA_LIBDIR} MANCOMPRESSED= yes diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index b822a31132cc..0104d95edb81 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -35,7 +35,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 libltdl:15 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --enable-shared --mandir=${MANPREFIX}/man --without-dps +CONFIGURE_ARGS= --enable-shared --without-dps USE_LDCONFIG= yes MAN1= ImageMagick.1 Magick++-config.1 Magick-config.1 Wand-config.1 \ diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile index 2d05b8a0d553..fcfab7b645e6 100644 --- a/graphics/bugle/Makefile +++ b/graphics/bugle/Makefile @@ -26,7 +26,7 @@ USE_AUTOTOOLS= libltdl:15 USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/${PORTNAME} CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS=--enable-ltdl-install=no --mandir=${MANPREFIX}/man +CONFIGURE_ARGS=--enable-ltdl-install=no CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ GL_LIBS="-L${X11BASE}/lib" diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile index 3d454a026000..f8c85edc0e10 100644 --- a/graphics/digikam-kde4/Makefile +++ b/graphics/digikam-kde4/Makefile @@ -26,7 +26,6 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS= --mandir=${PREFIX}/man USE_GMAKE= yes USE_KDELIBS_VER=3 USE_GETTEXT= yes diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 3d454a026000..f8c85edc0e10 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -26,7 +26,6 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS= --mandir=${PREFIX}/man USE_GMAKE= yes USE_KDELIBS_VER=3 USE_GETTEXT= yes diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile index 87cf22eb4081..128044330db3 100644 --- a/graphics/exif/Makefile +++ b/graphics/exif/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \ USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-popt-prefix=${LOCALBASE} --mandir=${PREFIX}/man +CONFIGURE_ARGS= --with-popt-prefix=${LOCALBASE} .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile index 9d159e33d34f..33ffbe3317ff 100644 --- a/graphics/exiv2/Makefile +++ b/graphics/exiv2/Makefile @@ -20,7 +20,6 @@ USE_GMAKE= yes USE_LDCONFIG= yes MAN1= exiv2.1 ALLTARGET= all -CONFIGURE_ARGS= --mandir=${PREFIX}/man USE_GCC= 3.4+ post-patch: diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile index 25f12a11a683..289e041b1e12 100644 --- a/graphics/gimp-app-devel/Makefile +++ b/graphics/gimp-app-devel/Makefile @@ -122,8 +122,6 @@ post-patch: ${WRKSRC}/plug-ins/pygimp/Makefile.in @${REINPLACE_CMD} -e 's|"libpng"|"libpng12"|' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|@mandir@|${PREFIX}/man|' \ - ${WRKSRC}/docs/Makefile.in post-install: .if !defined(GIMP_SLAVE) diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index acbf73b65439..79e73164ca22 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -48,7 +48,6 @@ CONFIGURE_ARGS= --disable-perl \ --docdir=${PREFIX}/share/doc/gimp \ --disable-gtk-doc \ --enable-static \ - --mandir=${PREFIX}/man \ --disable-print CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 434810fb75dd..b35bd4d3b85f 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -25,7 +25,7 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --without-cdk --mandir=${PREFIX}/man +CONFIGURE_ARGS= --without-cdk MAN1= gphoto2.1 diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index 4addcc74d2f1..c3e2133fbe2b 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -26,7 +26,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALLS_OMF= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index b1065624278f..7e71664909f3 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -22,7 +22,6 @@ USE_XLIB= yes WANT_GNOME= yes USE_GNOME= gnomehack gnomehier gnometarget gtk20 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile index 2100508080dc..30d0b7449132 100644 --- a/graphics/gwenview-kde4/Makefile +++ b/graphics/gwenview-kde4/Makefile @@ -23,8 +23,7 @@ USE_GMAKE= yes USE_KDELIBS_VER=3 USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS+=--enable-kipi \ - --mandir=${MANPREFIX}/man +CONFIGURE_ARGS+=--enable-kipi MAN1= gwenview.1 diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index 2100508080dc..30d0b7449132 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -23,8 +23,7 @@ USE_GMAKE= yes USE_KDELIBS_VER=3 USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS+=--enable-kipi \ - --mandir=${MANPREFIX}/man +CONFIGURE_ARGS+=--enable-kipi MAN1= gwenview.1 diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index ef994c62485a..6de1506285c1 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -28,8 +28,7 @@ USE_GNOME= gnomehack desktopfileutils intlhack libxslt USE_GETTEXT= yes GNU_CONFIGURE= yes USE_GCC= 3.4+ -CONFIGURE_ARGS= --with-popt \ - --mandir=${PREFIX}/man +CONFIGURE_ARGS= --with-popt CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" diff --git a/graphics/jpeginfo/Makefile b/graphics/jpeginfo/Makefile index 646a60d41a91..a5f6192e82c4 100644 --- a/graphics/jpeginfo/Makefile +++ b/graphics/jpeginfo/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -MAKE_ARGS= mandir=${PREFIX}/man +MAKE_ARGS= mandir=${MANPREFIX}/man MAN1= jpeginfo.1 PLIST_FILES= bin/jpeginfo diff --git a/graphics/jpegoptim/Makefile b/graphics/jpegoptim/Makefile index c3d3fa8ab5b4..18136ecc39ee 100644 --- a/graphics/jpegoptim/Makefile +++ b/graphics/jpegoptim/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-libjpeg=${LOCALBASE} -MAKE_ARGS= mandir=${PREFIX}/man +MAKE_ARGS= mandir=${MANPREFIX}/man MAN1= jpegoptim.1 PLIST_FILES= bin/jpegoptim diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile index 303cf0d58018..1de4e318dcfe 100644 --- a/graphics/kipi-plugins-kde4/Makefile +++ b/graphics/kipi-plugins-kde4/Makefile @@ -48,8 +48,6 @@ USE_KDELIBS_VER=3 USE_GETTEXT= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man - .include <bsd.port.pre.mk> .if !defined(WITHOUT_ACQUIREIMAGES) diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile index 303cf0d58018..1de4e318dcfe 100644 --- a/graphics/kipi-plugins/Makefile +++ b/graphics/kipi-plugins/Makefile @@ -48,8 +48,6 @@ USE_KDELIBS_VER=3 USE_GETTEXT= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man - .include <bsd.port.pre.mk> .if !defined(WITHOUT_ACQUIREIMAGES) diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile index 589944307a20..d00b95c43cda 100644 --- a/graphics/lcms/Makefile +++ b/graphics/lcms/Makefile @@ -22,7 +22,6 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir="${PREFIX}/man/" USE_LDCONFIG= yes OPTIONS= TIFFICC "Build color profile applier for tiff" off \ diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile index b90e3d3a514d..9de73ccb64e2 100644 --- a/graphics/libcaca/Makefile +++ b/graphics/libcaca/Makefile @@ -20,8 +20,7 @@ USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lm -lncurses" CONFIGURE_ARGS= --disable-doc \ - --enable-ncurses \ - --mandir=${PREFIX}/man + --enable-ncurses DOCS= AUTHORS COPYING COPYING.GPL COPYING.LGPL ChangeLog NEWS \ NOTES README THANKS TODO diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index 9114e131636a..8bb1b502c9eb 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -22,7 +22,6 @@ USE_GNOME= gnometarget pkgconfig ltverhack USE_GETOPT_LONG= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS= --mandir=${PREFIX}/man LIBTOOLFILES= configure libgphoto2_port/configure USE_LDCONFIG= yes PLIST_SUB= VERSION="${PORTVERSION}" VERSION_PORT=0.7.1 diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile index 8998c7db4037..18b0adfa08e3 100644 --- a/graphics/passepartout/Makefile +++ b/graphics/passepartout/Makefile @@ -25,7 +25,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man CONFIGURE_ENV= CFALGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 72b0680b6a32..a7549c19f4c9 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -23,8 +23,7 @@ USE_GNOME= gnomehack gnometarget libxml2 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-zlib \ --enable-xpdf-headers \ - --with-html-dir=${DOCSDIR} \ - --mandir=${PREFIX}/man + --with-html-dir=${DOCSDIR} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile index e813603089c1..484d47554f2f 100644 --- a/graphics/qcomicbook/Makefile +++ b/graphics/qcomicbook/Makefile @@ -23,8 +23,7 @@ USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --with-Qt-dir="${QT_PREFIX}" +CONFIGURE_ARGS= --with-Qt-dir="${QT_PREFIX}" MAN1= qcomicbook.1 diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index cbc9bb837adb..86fb6e1d9bda 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -32,7 +32,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${PREFIX}/man --with-docdir=${DOCSDIR} \ +CONFIGURE_ARGS= --with-docdir=${DOCSDIR} \ --disable-locking MAKE_ENV= NOPORTDOCS=${NOPORTDOCS} diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile index 91277d71a068..947d82ea8713 100644 --- a/graphics/swftools/Makefile +++ b/graphics/swftools/Makefile @@ -25,7 +25,6 @@ USE_GCC= 3.4+ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN1= font2swf.1 gif2swf.1 jpeg2swf.1 pdf2swf.1 png2swf.1 \ swfbbox.1 swfc.1 swfcombine.1 swfdump.1 swfextract.1 \ diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index 8984147e6878..e9faa9ca2fa8 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -30,7 +30,7 @@ WANT_GNOME= yes LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CPPFLAGS= -I${LOCALBASE}/include CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man --enable-mime +CONFIGURE_ARGS= --enable-mime .ifndef WITHOUT_EXIF LIB_DEPENDS+= exif:${PORTSDIR}/graphics/libexif diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile index 1942e84a14ea..e8923370f704 100644 --- a/graphics/xmedcon/Makefile +++ b/graphics/xmedcon/Makefile @@ -36,7 +36,6 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --includedir=${PREFIX}/include/xmedcon \ - --mandir=${MANPREFIX}/man \ --enable-llcheck USE_LDCONFIG= yes diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile index 77486652583b..b07498fcd6ce 100644 --- a/graphics/xmorph/Makefile +++ b/graphics/xmorph/Makefile @@ -30,9 +30,7 @@ USE_XORG= xbitmaps USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -CONFIGURE_ARGS= --infodir=${PREFIX}/${INFO_PATH} \ - --mandir=${MANPREFIX}/man \ - --without-waili +CONFIGURE_ARGS= --without-waili USE_LDCONFIG= yes MAN1= gtkmorph.1 xmorph.1 diff --git a/irc/bitlbee-otr/Makefile b/irc/bitlbee-otr/Makefile index b2789ba4a123..10bb7dd471d3 100644 --- a/irc/bitlbee-otr/Makefile +++ b/irc/bitlbee-otr/Makefile @@ -33,7 +33,7 @@ OPTIONS= MSN "Enable MSN protocol support" On \ OPENSSL "Use openssl rather than gnutls" Off \ IPV6 "Compile IPV6 support" On -CONFIGURE_ARGS= --mandir=${PREFIX}/man --config=${PREFIX}/etc/bitlbee +CONFIGURE_ARGS= --config=${PREFIX}/etc/bitlbee .include <bsd.port.pre.mk> diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile index b2789ba4a123..10bb7dd471d3 100644 --- a/irc/bitlbee/Makefile +++ b/irc/bitlbee/Makefile @@ -33,7 +33,7 @@ OPTIONS= MSN "Enable MSN protocol support" On \ OPENSSL "Use openssl rather than gnutls" Off \ IPV6 "Compile IPV6 support" On -CONFIGURE_ARGS= --mandir=${PREFIX}/man --config=${PREFIX}/etc/bitlbee +CONFIGURE_ARGS= --config=${PREFIX}/etc/bitlbee .include <bsd.port.pre.mk> diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile index 6313591d3768..6e9d4c385339 100644 --- a/irc/ircd-hybrid/Makefile +++ b/irc/ircd-hybrid/Makefile @@ -75,7 +75,6 @@ CONFIGURE_ARGS+= --with-maxclients=${MAXCLIENTS} CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/ircd-hybrid \ --moduledir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/modules \ --automoduledir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/modules/autoload \ - --mandir=${MANPREFIX}/man \ --uhelpdir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/help/users \ --ohelpdir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/help/opers \ --messagedir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/messages \ diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile index d96741795a28..a4a79defe805 100644 --- a/irc/kvirc-devel/Makefile +++ b/irc/kvirc-devel/Makefile @@ -23,7 +23,6 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+= --mandir=${PREFIX}/man CONFIGURE_ENV= QTDIR="${X11BASE}" PLIST_SUB= VER=${PORTVERSION} CONFLICTS= kvirc-3.2.0* diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile index e1c9cc367a06..b2ce43cc17a3 100644 --- a/irc/kvirc/Makefile +++ b/irc/kvirc/Makefile @@ -24,7 +24,6 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+= --mandir=${PREFIX}/man PLIST_SUB= VER=${PORTVERSION} MAN1= kvirc.1 diff --git a/irc/miau/Makefile b/irc/miau/Makefile index cae5ea0b7750..4992fb2521e7 100644 --- a/irc/miau/Makefile +++ b/irc/miau/Makefile @@ -32,9 +32,7 @@ CONFIGURE_ARGS= --enable-dccbounce \ --enable-onconnect \ --enable-empty-awaymsg \ --enable-dumpstatus \ - --disable-dependency-tracking \ - --infodir=${PREFIX}/info \ - --mandir=${PREFIX}/man + --disable-dependency-tracking CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS}" \ diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile index cd32ebf8e891..462bf4cbd979 100644 --- a/irc/riece-emacs21/Makefile +++ b/irc/riece-emacs21/Makefile @@ -18,8 +18,7 @@ COMMENT= IRC client for Emacs USE_EMACS= yes EMACS_PORT_NAME?= emacs21 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --infodir=${PREFIX}/${INFO_PATH} \ - --with-emacs=${EMACS_CMD} \ +CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \ --with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} USE_GMAKE= yes USE_RUBY= yes diff --git a/irc/riece/Makefile b/irc/riece/Makefile index cd32ebf8e891..462bf4cbd979 100644 --- a/irc/riece/Makefile +++ b/irc/riece/Makefile @@ -18,8 +18,7 @@ COMMENT= IRC client for Emacs USE_EMACS= yes EMACS_PORT_NAME?= emacs21 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --infodir=${PREFIX}/${INFO_PATH} \ - --with-emacs=${EMACS_CMD} \ +CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \ --with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} USE_GMAKE= yes USE_RUBY= yes diff --git a/japanese/kasumi/Makefile b/japanese/kasumi/Makefile index a98dd462a0a0..43604f0577fa 100644 --- a/japanese/kasumi/Makefile +++ b/japanese/kasumi/Makefile @@ -22,7 +22,6 @@ LIB_DEPENDS= anthy.1:${PORTSDIR}/japanese/anthy GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${PREFIX}/man CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile index 4e414c9fae87..16410b9b3735 100644 --- a/japanese/lookup-emacs21/Makefile +++ b/japanese/lookup-emacs21/Makefile @@ -35,8 +35,7 @@ PLIST_SUB= ELISPDIR=${EMACS_VERSION_SITE_LISPDIR} .endif HAS_CONFIGURE= yes CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \ - --with-lispdir=${ELISPDIR} \ - --infodir=${PORTINFODIR} + --with-lispdir=${ELISPDIR} post-install: .if (${EMACS_PORT_NAME} == "xemacs21-mule") diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile index 4e414c9fae87..16410b9b3735 100644 --- a/japanese/lookup/Makefile +++ b/japanese/lookup/Makefile @@ -35,8 +35,7 @@ PLIST_SUB= ELISPDIR=${EMACS_VERSION_SITE_LISPDIR} .endif HAS_CONFIGURE= yes CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \ - --with-lispdir=${ELISPDIR} \ - --infodir=${PORTINFODIR} + --with-lispdir=${ELISPDIR} post-install: .if (${EMACS_PORT_NAME} == "xemacs21-mule") diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile index ed22a44df88d..bb79f7c0a271 100644 --- a/japanese/mecab/Makefile +++ b/japanese/mecab/Makefile @@ -24,8 +24,6 @@ USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I ${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_ARGS+= --mandir=${PREFIX}/man - # Default charset (euc-jp/shift_jis/utf-8) .if defined(WITH_CHARSET) CONFIGURE_ARGS+= --with-charset=${WITH_CHARSET} diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 86a1fdb0bebc..403b211c0c37 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -33,7 +33,7 @@ CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib MAKE_ENV= ${CONFIGURE_ENV} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -MAKEMAKE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man \ +MAKEMAKE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man \ --srcdir=${WRKSRC}/src --with-dynamic-ffi OPTIONS= BDB "Build Berkeley Database module" off \ diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index d1fd5963c01a..5f8a69186610 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \ --with-gmp=${LOCALBASE} \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} + --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean USE_LDCONFIG= ${TARGLIB} diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile index f91d24136ee7..921698e3ea87 100644 --- a/lang/gcc33/Makefile +++ b/lang/gcc33/Makefile @@ -51,8 +51,7 @@ CONFIGURE_ARGS+= --disable-nls \ --with-system-zlib \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} + --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" MAKE_ENV= LD_LIBRARY_PATH=.:${WRKSRC}/gcc ALL_TARGET= bootstrap-lean diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index af39caea449e..12adbeda5c5e 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -56,8 +56,7 @@ CONFIGURE_ARGS+= --disable-nls \ --with-libiconv-prefix=${LOCALBASE} \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} + --with-gxx-include-dir=${TARGLIB}/include/c++/ CONFIGURE_ENV= RANLIB=: MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile index 9a5ba0e5ab70..adeb323c73e8 100644 --- a/lang/gcc40/Makefile +++ b/lang/gcc40/Makefile @@ -50,8 +50,7 @@ CONFIGURE_ARGS+= --disable-nls \ --with-libiconv-prefix=${LOCALBASE} \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} + --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean USE_LDCONFIG= ${TARGLIB} diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile index 31c2c70567ee..302c43c1e512 100644 --- a/lang/gcc41/Makefile +++ b/lang/gcc41/Makefile @@ -56,8 +56,7 @@ CONFIGURE_ARGS+= --disable-nls \ --with-libiconv-prefix=${LOCALBASE} \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} + --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean USE_LDCONFIG= ${TARGLIB} diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile index 371f0014936b..2d82c4904ccd 100644 --- a/lang/gcc42/Makefile +++ b/lang/gcc42/Makefile @@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \ --with-gmp=${LOCALBASE} \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} + --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean USE_LDCONFIG= ${TARGLIB} diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile index d1fd5963c01a..5f8a69186610 100644 --- a/lang/gcc43/Makefile +++ b/lang/gcc43/Makefile @@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \ --with-gmp=${LOCALBASE} \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} + --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean USE_LDCONFIG= ${TARGLIB} diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index d1fd5963c01a..5f8a69186610 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \ --with-gmp=${LOCALBASE} \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} + --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean USE_LDCONFIG= ${TARGLIB} diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index d1fd5963c01a..5f8a69186610 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \ --with-gmp=${LOCALBASE} \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} + --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean USE_LDCONFIG= ${TARGLIB} diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index d1fd5963c01a..5f8a69186610 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \ --with-gmp=${LOCALBASE} \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} + --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean USE_LDCONFIG= ${TARGLIB} diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index d1fd5963c01a..5f8a69186610 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \ --with-gmp=${LOCALBASE} \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} + --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean USE_LDCONFIG= ${TARGLIB} diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index d1fd5963c01a..5f8a69186610 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -65,8 +65,7 @@ CONFIGURE_ARGS+= --disable-nls \ --with-gmp=${LOCALBASE} \ --program-suffix=${SUFFIX} \ --libdir=${TARGLIB} \ - --with-gxx-include-dir=${TARGLIB}/include/c++/ \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} + --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean USE_LDCONFIG= ${TARGLIB} diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile index 172d0b68a1f3..3da86bb67f9c 100644 --- a/lang/gcl/Makefile +++ b/lang/gcl/Makefile @@ -27,7 +27,6 @@ USE_XLIB= yes CONFIGURE_ARGS=--prefix=${PREFIX} \ --enable-ansi \ --enable-machine=FreeBSD \ - --infodir=${PREFIX}/info \ --enable-info=${PREFIX}/info \ --enable-tkconfig=${LOCALBASE}/lib/tk8.4 \ --enable-tclconfig=${LOCALBASE}/lib/tcl8.4 \ diff --git a/lang/gnat-gcc34/Makefile b/lang/gnat-gcc34/Makefile index 18cc31e19b56..f5c3115ac04f 100644 --- a/lang/gnat-gcc34/Makefile +++ b/lang/gnat-gcc34/Makefile @@ -65,8 +65,7 @@ CONFIGURE_ARGS= --enable-languages="c,ada" \ --enable-threads=posix \ --program-suffix=${gcc_suffix} \ --bindir=${PREFIX}/bin/gcc${gcc_suffix} \ - --libdir=${targlib} \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${gcc_suffix} + --libdir=${targlib} BUILD_WRKSRC= ${WRKDIR}/build diff --git a/lang/gnat-gcc41/Makefile b/lang/gnat-gcc41/Makefile index c6d25b30cc03..a2d7e5ec7c70 100644 --- a/lang/gnat-gcc41/Makefile +++ b/lang/gnat-gcc41/Makefile @@ -70,8 +70,7 @@ CONFIGURE_ARGS= --enable-languages="c,ada" \ --with-libiconv-prefix=${LOCALBASE} \ --program-suffix=${gcc_suffix} \ --bindir=${PREFIX}/bin/gcc${gcc_suffix} \ - --libdir=${targlib} \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${gcc_suffix} + --libdir=${targlib} ALL_TARGET= bootstrap-lean MAKE_ENV+= MAKEINFOFLAGS="--no-split" PTHREAD_LIBS=${PTHREAD_LIBS} diff --git a/lang/gnat-gcc42/Makefile b/lang/gnat-gcc42/Makefile index 904506322bb9..4c279fa5f5be 100644 --- a/lang/gnat-gcc42/Makefile +++ b/lang/gnat-gcc42/Makefile @@ -70,8 +70,7 @@ CONFIGURE_ARGS= --enable-languages="c,ada" \ --with-libiconv-prefix=${LOCALBASE} \ --program-suffix=${gcc_suffix} \ --bindir=${PREFIX}/bin/gcc${gcc_suffix} \ - --libdir=${targlib} \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${gcc_suffix} + --libdir=${targlib} ALL_TARGET= bootstrap-lean MAKE_ENV+= MAKEINFOFLAGS="--no-split" PTHREAD_LIBS=${PTHREAD_LIBS} diff --git a/lang/gnat-gcc43/Makefile b/lang/gnat-gcc43/Makefile index c5621695fd1f..d9d6492f5e88 100644 --- a/lang/gnat-gcc43/Makefile +++ b/lang/gnat-gcc43/Makefile @@ -75,8 +75,7 @@ CONFIGURE_ARGS= --enable-languages="c,ada" \ --with-libiconv-prefix=${LOCALBASE} \ --program-suffix=${gcc_suffix} \ --bindir=${PREFIX}/bin/gcc${gcc_suffix} \ - --libdir=${targlib} \ - --infodir=${PREFIX}/${INFO_PATH}/gcc${gcc_suffix} + --libdir=${targlib} ALL_TARGET= bootstrap-lean MAKE_ENV+= MAKEINFOFLAGS="--no-split" PTHREAD_LIBS=${PTHREAD_LIBS} diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile index 1a6cf4df1452..e2927760bce3 100644 --- a/lang/hugs/Makefile +++ b/lang/hugs/Makefile @@ -29,8 +29,7 @@ GNU_CONFIGURE= yes .include <bsd.port.pre.mk> -CONFIGURE_ARGS+= --with-pthreads \ - --mandir=${PREFIX}/man +CONFIGURE_ARGS+= --with-pthreads .if ${ARCH} == "ia64" BROKEN= dumps core during build on ${ARCH} diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile index 406b2c76f7dc..6e30319584e5 100644 --- a/lang/newlisp/Makefile +++ b/lang/newlisp/Makefile @@ -90,7 +90,6 @@ post-patch: @${REINPLACE_CMD} -E -e "s,install -m 644, \$${BSD_INSTALL_DATA},g" \ -e "s,install -m 755, \$${BSD_INSTALL_SCRIPT},g" \ -e "s,^(datadir=).*,\1${PREFIX}/share,g" \ - -e "s,^(mandir=).*,\1${PREFIX}/man,g" \ -e "s,^(bindir=).*,\1${PREFIX}/bin,g" \ ${WRKSRC}/Makefile diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile index ae183d1c0eac..922b41d8ae52 100644 --- a/lang/nickle/Makefile +++ b/lang/nickle/Makefile @@ -16,7 +16,6 @@ COMMENT= A desk calculator language USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnometarget -CONFIGURE_ARGS= --mandir=${PREFIX}/man # Nickle now has bindings which are likely to pull in libraries that need # libpthread. Link to it now, since it wouldn't work at runtime. diff --git a/lang/pfe-devel/Makefile b/lang/pfe-devel/Makefile index 0897d7d4ea72..8b60ba207d8e 100644 --- a/lang/pfe-devel/Makefile +++ b/lang/pfe-devel/Makefile @@ -23,7 +23,6 @@ USE_GNOME= gnometarget lthack USE_GMAKE= yes GNU_CONFIGURE= yes LIBTOOLFILES= pfe/configure -CONFIGURE_ARGS= --mandir=${PREFIX}/man MAN1= pfe.1 pfe-config.1 diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile index 0897d7d4ea72..8b60ba207d8e 100644 --- a/lang/pfe/Makefile +++ b/lang/pfe/Makefile @@ -23,7 +23,6 @@ USE_GNOME= gnometarget lthack USE_GMAKE= yes GNU_CONFIGURE= yes LIBTOOLFILES= pfe/configure -CONFIGURE_ARGS= --mandir=${PREFIX}/man MAN1= pfe.1 pfe-config.1 diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile index 444c5b3da839..730178842d76 100644 --- a/lang/ruby18/Makefile +++ b/lang/ruby18/Makefile @@ -21,8 +21,7 @@ COMMENT?= An object-oriented interpreted scripting language GNU_CONFIGURE= yes WRKSRC= ${RUBY_WRKSRC} CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ - --enable-shared --with-openssl-include=${OPENSSLINC} \ - --mandir=${PREFIX}/man + --enable-shared --with-openssl-include=${OPENSSLINC} USE_OPENSSL= yes USE_LDCONFIG= yes diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index 348f7611c380..780154166dd4 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -27,9 +27,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ ac_cv_prog_EMACS=no -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --infodir=${PREFIX}/${INFO_PATH} \ - --enable-generational-gc=no \ +CONFIGURE_ARGS= --enable-generational-gc=no \ --enable-gtk=no \ --with-emacs=no \ --with-gmp=no diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index 8b28b84ac9ff..f5ca9ad96ce3 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -33,7 +33,7 @@ PATCH_STRIP= -p1 BF_LIBS?= -ldb-4.3 BF_CPPFLAGS?= -I${LOCALBASE}/include/db43 -I${LOCALBASE}/include -CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc --mandir=${PREFIX}/man +CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc .if !defined(WITHOUT_UNICODE) CONFIGURE_ARGS+= --enable-unicode USE_ICONV= yes diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index 2617463860a2..4ea867f56698 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -43,8 +43,7 @@ MAN1= claws-mail.1 CONFIGURE_ARGS= \ --with-libiconv-prefix=${LOCALBASE} \ --with-manualdir=${DOCSDIR}/manual \ - --with-faqdir=${DOCSDIR}/faq \ - --mandir=${PREFIX}/man + --with-faqdir=${DOCSDIR}/faq CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index e4ab75c352ad..0a8825e815db 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -35,7 +35,7 @@ CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} CONFIGURE_ARGS+= --with-pkglibdir=${LOCALBASE}/lib/dbmail -MAKE_ARGS+= mandir=${PREFIX}/man +MAKE_ARGS+= mandir=${MANPREFIX}/man PORTDOCS= AUTHORS BUGS COPYING INSTALL NEWS README \ README.aliases README.exim README.ldap \ diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile index e4ab75c352ad..0a8825e815db 100644 --- a/mail/dbmail22/Makefile +++ b/mail/dbmail22/Makefile @@ -35,7 +35,7 @@ CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} CONFIGURE_ARGS+= --with-pkglibdir=${LOCALBASE}/lib/dbmail -MAKE_ARGS+= mandir=${PREFIX}/man +MAKE_ARGS+= mandir=${MANPREFIX}/man PORTDOCS= AUTHORS BUGS COPYING INSTALL NEWS README \ README.aliases README.exim README.ldap \ diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile index ffd8ffdb17f8..0b6dac2e92fb 100644 --- a/mail/dcc-dccd/Makefile +++ b/mail/dcc-dccd/Makefile @@ -38,7 +38,7 @@ DCCGID?= 112 # sed scripting breaks things. # -CONFIGURE_ARGS= --homedir=${PREFIX}/dcc --bindir=${PREFIX}/bin --mandir=${PREFIX}/man --with-rundir=/var/run +CONFIGURE_ARGS= --homedir=${PREFIX}/dcc --bindir=${PREFIX}/bin --mandir=${MANPREFIX}/man --with-rundir=/var/run .include <bsd.port.pre.mk> diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index c17b42a2b746..d178b2e542da 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -36,8 +36,7 @@ GNU_CONFIGURE= yes USE_OPENSSL= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-SDPS \ - --with-hesiod=no --enable-fallback=no \ - --mandir=${PREFIX}/man + --with-hesiod=no --enable-fallback=no # bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV: LDFLAGS= -L${LOCALBASE}/lib CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile index 2572c9927cff..155452b11db2 100644 --- a/mail/gnubiff/Makefile +++ b/mail/gnubiff/Makefile @@ -26,7 +26,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ # CXXFLAGS needed to work round issue with gcc and openssl 0.9.8a # /usr/local/include/openssl/sha.h:173: error: ISO C++ does not support `long long' -CONFIGURE_ARGS+= --infodir=${PREFIX}/info --mandir=${PREFIX}/man MAN1= gnubiff.1 INFO= gnubiff diff --git a/mail/isync/Makefile b/mail/isync/Makefile index fc6f27a9c846..cd6eca282c05 100644 --- a/mail/isync/Makefile +++ b/mail/isync/Makefile @@ -21,7 +21,6 @@ USE_BDB= 42+ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man MAN1= isync.1 mbsync.1 mdconvert.1 PORTDOCS= AUTHORS ChangeLog NEWS README TODO diff --git a/mail/masqmail/Makefile b/mail/masqmail/Makefile index 2d1e43d4764a..1e391824a2a4 100644 --- a/mail/masqmail/Makefile +++ b/mail/masqmail/Makefile @@ -19,7 +19,7 @@ MAN8= masqmail.8 mservdetect.8 GNU_CONFIGURE= yes CFLAGS+= -Wno-trigraphs -CONFIGURE_ARGS+= --mandir=${PREFIX}/man --with-user=mailnull --with-group=mail \ +CONFIGURE_ARGS+= --with-user=mailnull --with-group=mail \ --with-confdir=${PREFIX}/etc/masqmail --with-logdir=/var/log/masqmail CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile index c44e35e08492..725c21dbbfdc 100644 --- a/mail/msmtp/Makefile +++ b/mail/msmtp/Makefile @@ -22,7 +22,6 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --infodir="${PREFIX}/info" --mandir="${PREFIX}/man" MAN1= msmtp.1 INFO= msmtp diff --git a/mail/nullpop/Makefile b/mail/nullpop/Makefile index 05892dfb31da..aefa3dafdce3 100644 --- a/mail/nullpop/Makefile +++ b/mail/nullpop/Makefile @@ -14,7 +14,7 @@ MAINTAINER= pankov_p@mail.ru COMMENT= A POP3 server that allows logins, but never returns any email GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--libexecdir="${TARGETDIR}/bin" --mandir="${TARGETDIR}/man" +CONFIGURE_ARGS+=--libexecdir="${TARGETDIR}/bin" PLIST_FILES= bin/nullpop MAN8= nullpop.8 diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile index 4f4b88dfc990..9878f7a959af 100644 --- a/mail/pfqueue/Makefile +++ b/mail/pfqueue/Makefile @@ -18,7 +18,6 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= pfqueue.1 diff --git a/mail/proxsmtp/Makefile b/mail/proxsmtp/Makefile index 4e4d2d0f2cc2..e8e67b91c314 100644 --- a/mail/proxsmtp/Makefile +++ b/mail/proxsmtp/Makefile @@ -15,7 +15,7 @@ COMMENT= A flexible SMTP filter which can act also as transparent proxy USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} --mandir=${MANPREFIX}/man +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" USE_RC_SUBR= proxsmtpd.sh diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 8008344f0a12..d814c72a7ee2 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -71,7 +71,6 @@ CONFIGURE_ARGS= --enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \ --enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \ --localstatedir=${PREFIX}/var/sqwebmail \ --sysconfdir=${PREFIX}/etc/sqwebmail \ - --mandir=${PREFIX}/man \ --enable-imageurl=/${IMAGEURL} \ --with-locking-method=fcntl \ --with-libintl-prefix=${LOCALBASE} \ diff --git a/mail/surblhost/Makefile b/mail/surblhost/Makefile index 2bef92f73ef8..040787f7f50f 100644 --- a/mail/surblhost/Makefile +++ b/mail/surblhost/Makefile @@ -17,6 +17,5 @@ USE_BZIP2= yes GNU_CONFIGURE= yes PLIST_FILES= bin/${PORTNAME} MAN1= ${PORTNAME}.1 -CONFIGURE_ARGS= --mandir=${MAN1PREFIX}/man .include <bsd.port.mk> diff --git a/mail/sympa5/Makefile b/mail/sympa5/Makefile index d7dad2359d37..e3e298ee129b 100644 --- a/mail/sympa5/Makefile +++ b/mail/sympa5/Makefile @@ -86,7 +86,6 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --with-lockdir=/var/spool/lock \ --with-piddir=/var/run \ --with-localedir=${PREFIX}/share/locale \ - --with-mandir=${PREFIX}/man \ --with-docdir=${DOCSDIR} \ --with-sampledir=${EXAMPLESDIR} \ --with-spooldir=${PREFIX}/sympa/spool diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile index 8c559dd8dac8..65f048d161b3 100644 --- a/mail/zmailer/Makefile +++ b/mail/zmailer/Makefile @@ -45,7 +45,6 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}/ \ --with-vacationpath=${PREFIX}/bin/vacation \ --includedir=${PREFIX}/include \ --libdir=${PREFIX}/lib \ - --mandir=${PREFIX}/man \ --with-ta-mmap MAN1= rmail.1zm vacation.1zm zmailer.1zm zmsh.1zm mboxpath.1zm mailq.1zm \ diff --git a/math/R/Makefile b/math/R/Makefile index 93fbe9595ce9..487ce8f63ff7 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -56,7 +56,6 @@ USE_PERL5= yes CONFIGURE_ENV= INSTALL_DATA="${INSTALL} ${COPY} ${_SHROWNGRP} -m 644" F77="${F77}" FC="${FC}" CONFIGURE_ARGS= --enable-R-shlib --with-system-bzlib --with-system-zlib \ - --mandir=${MANPREFIX}/man \ rdocdir=${DOCSDIR} .include <bsd.port.pre.mk> diff --git a/math/cln/Makefile b/math/cln/Makefile index 27fbb18d85a9..c0fa76c5775f 100644 --- a/math/cln/Makefile +++ b/math/cln/Makefile @@ -25,8 +25,7 @@ USE_GNOME= gnomehack gnometarget pkgconfig USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --infodir=${PREFIX}/info --mandir=${MANPREFIX}/man \ - --with-gmp +CONFIGURE_ARGS= --with-gmp MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index 0807e1396d33..cbd4ab3caaad 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -95,10 +95,6 @@ PLIST_SUB+= DEF="@comment " PLIST_SUB+= FFTW3_SUFX="${FFTW3_SUFX}" post-patch: - @${REINPLACE_CMD} -e 's|@infodir@|${PREFIX}/info|; \ - s|@mandir@|${PREFIX}/man|' \ - ${WRKSRC}/doc/Makefile.in \ - ${WRKSRC}/tools/Makefile.in @${REINPLACE_CMD} -e \ 's|/etc/fftw|${PREFIX}/etc/fftw|' \ ${WRKSRC}/Makefile.in \ diff --git a/math/fityk/Makefile b/math/fityk/Makefile index e0c434a3c310..8f8d8e500613 100644 --- a/math/fityk/Makefile +++ b/math/fityk/Makefile @@ -26,7 +26,6 @@ WX_CONF_ARGS= absolute USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man USE_LDCONFIG= yes MAN1= fityk.1 diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index a494485ca7e5..d8aa47468924 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -31,8 +31,7 @@ USE_PYTHON= yes INSTALLS_OMF= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-guile --with-bonobo \ - --mandir=${PREFIX}/man +CONFIGURE_ARGS= --without-guile --with-bonobo CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \ python_prog=${PYTHON_VERSION} diff --git a/math/gri/Makefile b/math/gri/Makefile index 2c5790c671d9..53a359c836bc 100644 --- a/math/gri/Makefile +++ b/math/gri/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick \ .endif GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-FreeBSD --infodir=${PREFIX}/info +CONFIGURE_ARGS= --enable-FreeBSD USE_GMAKE= yes REINPLACE_ARGS= -Ei.bak MAKE_ENV+= MAKEINFOFLAGS=--no-split diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile index dda848098c5c..a5300df95a13 100644 --- a/math/mpfr/Makefile +++ b/math/mpfr/Makefile @@ -19,7 +19,6 @@ LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gmp=${LOCALBASE} \ - --infodir=${PREFIX}/info \ --enable-shared USE_LDCONFIG= yes diff --git a/math/numdiff/Makefile b/math/numdiff/Makefile index 4f67588bff29..70d7bdfb7003 100644 --- a/math/numdiff/Makefile +++ b/math/numdiff/Makefile @@ -14,7 +14,7 @@ MAINTAINER= clsung@FreeBSD.org COMMENT= Compare putatively similar files, ignoring small numeric differences HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} --exec-prefix=${PREFIX} --infodir=${PREFIX}/info LIBS=-lm +CONFIGURE_ARGS+= --prefix=${PREFIX} --exec-prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} LIBS=-lm WRKSRC= ${WRKDIR}/${PORTNAME} INFO= numdiff diff --git a/math/tvmet/Makefile b/math/tvmet/Makefile index da183fe9fe2c..0955a95f36c8 100644 --- a/math/tvmet/Makefile +++ b/math/tvmet/Makefile @@ -18,7 +18,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MAN1= tvmet-config.1 diff --git a/misc/clpbar/Makefile b/misc/clpbar/Makefile index 651fe936980c..09f8fe1d5189 100644 --- a/misc/clpbar/Makefile +++ b/misc/clpbar/Makefile @@ -19,7 +19,6 @@ COMMENT= Command Line Progress Bar WRKSRC= ${WRKDIR}/bar-${PORTVERSION} GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAKE_ARGS+= CFLAGS+="${CFLAGS}" MAN1= bar.1 diff --git a/misc/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile index f4a8def1ae24..612bbc305264 100644 --- a/misc/e2fsprogs-libuuid/Makefile +++ b/misc/e2fsprogs-libuuid/Makefile @@ -13,7 +13,7 @@ MAINTAINER= matthias.andree@gmx.de COMMENT= UUID library from e2fsprogs package CONFIGURE_ARGS= --enable-elf-shlibs --disable-fsck \ - --disable-e2initrd-helper --mandir=${MANPREFIX}/man + --disable-e2initrd-helper CONFLICTS= ossp-uuid-[0-9]* diff --git a/misc/findutils/Makefile b/misc/findutils/Makefile index c4e1b2fce0ac..80051d06abeb 100644 --- a/misc/findutils/Makefile +++ b/misc/findutils/Makefile @@ -20,7 +20,6 @@ SIG_FILES= ${DISTNAME}${EXTRACT_SUFX}.sig GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${PREFIX}/man --infodir=${PREFIX}/info USE_GMAKE= yes USE_GCC= 3.4+ diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile index f587621052fb..afe3b1c97bfb 100644 --- a/misc/gnome-osd/Makefile +++ b/misc/gnome-osd/Makefile @@ -20,7 +20,6 @@ USE_PYTHON= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${PREFIX}/man GCONF_SCHEMAS= gnome-osd.schemas PORTDOCS= AUTHORS NEWS README MAN1= gnome-osd-client.1 diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile index 0fa42d9039ce..aa32d638fc0d 100644 --- a/misc/ossp-uuid/Makefile +++ b/misc/ossp-uuid/Makefile @@ -21,7 +21,7 @@ USE_GCC= 3.2+ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --disable-shared --enable-static --mandir=${PREFIX}/man +CONFIGURE_ARGS= --disable-shared --enable-static MAN1= uuid-config.1 uuid.1 MAN3= uuid.3 diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile index 299dbb6baf0a..31bd7c99a578 100644 --- a/misc/shared-mime-info/Makefile +++ b/misc/shared-mime-info/Makefile @@ -18,7 +18,6 @@ GNU_CONFIGURE= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= glib20 libxml2 intltool gnomehack intlhack -CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile index 2b2400f7672c..82231b75f065 100644 --- a/misc/tkman/Makefile +++ b/misc/tkman/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= rman:${PORTSDIR}/textproc/rman \ USE_GMAKE= yes MAKE_ARGS= WISH="${PREFIX}/bin/wish8.4" \ - texinfodir="${PREFIX}/info" \ + texinfodir="${PREFIX}/${INFO_PATH}" \ gzgrep="\"/usr/bin/zgrep -E\"" \ mastermen="\"/usr/share/man ${PREFIX}/man ${X11BASE}/man\"" \ masterbin="\"/usr/bin ${PREFIX}/bin ${X11BASE}/bin\"" \ diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile index 7825cdac73df..f261dda1f70e 100644 --- a/multimedia/dvdauthor/Makefile +++ b/multimedia/dvdauthor/Makefile @@ -22,7 +22,6 @@ USE_GETOPT_LONG=yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN1= dvdauthor.1 dvddirdel.1 dvdunauthor.1 mpeg2desc.1 spumux.1 spuunmux.1 .include <bsd.port.pre.mk> diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index af6f1a30325f..cc37d5b0cfa4 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -55,7 +55,6 @@ USE_GNOME+= gnomehack gnometarget pkgconfig ltverhack USE_AUTOTOOLS= libtool:15 GST_PLUGIN?= base -CONFIGURE_ARGS+=--mandir=${PREFIX}/man CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}" diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 9cee2135440b..cb2286acb3b1 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -31,8 +31,7 @@ CONFIGURE_ARGS= --disable-tests \ --disable-examples \ --disable-docs-build \ --disable-failing-tests \ - --disable-gtk-doc \ - --mandir=${PREFIX}/man + --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ ac_cv_func_register_printf_function="no" diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile index dbceeee35285..c21218083400 100644 --- a/multimedia/gxine/Makefile +++ b/multimedia/gxine/Makefile @@ -23,7 +23,7 @@ USE_GNOME= gtk20 gnomehier USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -I${X11BASE}/lib" -CONFIGURE_ARGS+=--mandir=${PREFIX}/man --x-includes=${X11BASE}/include \ +CONFIGURE_ARGS+=--x-includes=${X11BASE}/include \ --x-libraries=${X11BASE}/lib CFLAGS= -O2 -fno-strict-aliasing -pipe INSTALLS_ICONS= yes diff --git a/multimedia/libdca/Makefile b/multimedia/libdca/Makefile index 40583f5c239d..e8e73c039a06 100644 --- a/multimedia/libdca/Makefile +++ b/multimedia/libdca/Makefile @@ -14,7 +14,6 @@ MAINTAINER= pav@FreeBSD.org COMMENT= Free DTS Coherent Acoustics decoder GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man USE_BZIP2= yes USE_GNOME= pkgconfig gnomehack USE_LDCONFIG= yes diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 47f43f59c7ea..5722d4539d6e 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -49,7 +49,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCA THREAD_LIBS="${PTHREAD_LIBS}" \ EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm" CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 --enable-ipv6 \ - --mandir=${PREFIX}/man --with-external-libmad \ + --with-external-libmad \ --with-external-libdts --with-libflac --disable-v4l OPTIONS= ARTS "Enable aRts support" off \ diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 4cf40eaa1be0..7b788bd411bf 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -30,7 +30,7 @@ GNU_CONFIGURE= yes CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib -lmagic -lz CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man --enable-lzo --enable-bz2 --disable-qt +CONFIGURE_ARGS= --enable-lzo --enable-bz2 --disable-qt MAN1= base64tool.1 mkvextract.1 mkvinfo.1 mkvmerge.1 PLIST_FILES= bin/base64tool bin/mkvextract bin/mkvinfo bin/mkvmerge diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile index 257a9c6cfdb5..527e8ddf9c15 100644 --- a/multimedia/subtitleeditor/Makefile +++ b/multimedia/subtitleeditor/Makefile @@ -25,7 +25,6 @@ USE_GNOME= gtk20 USE_GSTREAMER= good USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile index 3df0ddce20b3..4f6117f87430 100644 --- a/multimedia/tovid/Makefile +++ b/multimedia/tovid/Makefile @@ -43,7 +43,6 @@ USE_PYTHON= yes USE_CDRTOOLS= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man MAN1= idvid.1 makedvd.1 makemenu.1 makeslides.1 makevcd.1 makexml.1 \ postproc.1 pymakexml.1 todisc.1 tovid-stats.1 tovid.1 diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 880fdbc81998..928a2c6d0b74 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -39,8 +39,7 @@ CONFIGURE_ARGS+= --with-libavcodec-includes=${LOCALBASE}/include/ffmpeg \ --with-libdvdread-prefix=${LOCALBASE} \ --with-libiconv-prefix=${LOCALBASE} \ --enable-oss \ - --enable-gtk=no \ - --mandir=${PREFIX}/man + --enable-gtk=no MAN1= avifix.1 aviindex.1 avimerge.1 avisplit.1 avisync.1 tccat.1 tcdemux.1 \ tcprobe.1 tcscan.1 transcode.1 tcextract.1 tcdecode.1 tcmodinfo.1 \ diff --git a/net-im/centerim-devel/Makefile b/net-im/centerim-devel/Makefile index 33462ec95401..13f96678a7d2 100644 --- a/net-im/centerim-devel/Makefile +++ b/net-im/centerim-devel/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}" -CONFIGURE_ARGS= --with-ssl --with-openssl --disable-konst --mandir="${MANPREFIX}/man" +CONFIGURE_ARGS= --with-ssl --with-openssl --disable-konst WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CONFLICTS= centericq-[0-9]* diff --git a/net-im/centerim/Makefile b/net-im/centerim/Makefile index 33462ec95401..13f96678a7d2 100644 --- a/net-im/centerim/Makefile +++ b/net-im/centerim/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}" -CONFIGURE_ARGS= --with-ssl --with-openssl --disable-konst --mandir="${MANPREFIX}/man" +CONFIGURE_ARGS= --with-ssl --with-openssl --disable-konst WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CONFLICTS= centericq-[0-9]* diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile index 0bab6a423571..2160f873ddb4 100644 --- a/net-im/gajim-devel/Makefile +++ b/net-im/gajim-devel/Makefile @@ -25,7 +25,6 @@ USE_GNOME= pygtk2 USE_PYTHON= 2.4+ USE_XLIB= yes -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I ${X11BASE}/include" PYTHON=${PYTHON_CMD} .if !defined(WITHOUT_NLS) diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile index 066ca70f3834..caf451da7d87 100644 --- a/net-im/gajim/Makefile +++ b/net-im/gajim/Makefile @@ -25,7 +25,6 @@ USE_GNOME= pygtk2 USE_PYTHON= 2.4+ USE_XLIB= yes -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I ${X11BASE}/include" PYTHON=${PYTHON_CMD} .if !defined(WITHOUT_NLS) diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile index bbe7eb0331f0..eb4ce08111de 100644 --- a/net-im/jabber/Makefile +++ b/net-im/jabber/Makefile @@ -49,7 +49,7 @@ JABBER_SPOOLDIR="/var/spool/jabberd" JABBER_LOGDIR= "/var/log/jabberd" CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man --localstatedir=/var \ +CONFIGURE_ARGS= --localstatedir=/var \ --sysconfdir=${JABBER_ETCDIR} \ --includedir=${TARGETDIR}/include/jabber \ --libdir=${TARGETDIR}/lib/jabber diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile index a286c677cf72..c19ef23c084f 100644 --- a/net-im/mcabber/Makefile +++ b/net-im/mcabber/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme \ USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man --with-ssl --enable-aspell=yes +CONFIGURE_ARGS= --with-ssl --enable-aspell=yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_OPENSSL= yes USE_ICONV= yes diff --git a/net-im/naim/Makefile b/net-im/naim/Makefile index 608e095e1a65..0a58246159d6 100644 --- a/net-im/naim/Makefile +++ b/net-im/naim/Makefile @@ -16,7 +16,6 @@ COMMENT= Console ncurses-based AIM, ICQ, IRC, and Lily client GNU_CONFIGURE= yes USE_BZIP2= yes -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= naim.1 diff --git a/net-im/tmsnc/Makefile b/net-im/tmsnc/Makefile index 28e7970f13c1..dbfb547aef97 100644 --- a/net-im/tmsnc/Makefile +++ b/net-im/tmsnc/Makefile @@ -15,7 +15,6 @@ MAINTAINER= snowfly@yuntech.edu.tw COMMENT= A textbased (console) MSN client GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man PLIST_FILES= bin/tmsnc diff --git a/net-mgmt/arpalert/Makefile b/net-mgmt/arpalert/Makefile index 46a2a4b6bbb8..aa646adae0da 100644 --- a/net-mgmt/arpalert/Makefile +++ b/net-mgmt/arpalert/Makefile @@ -14,7 +14,7 @@ MAINTAINER= leeym@FreeBSD.org COMMENT= ARP traffic monitoring GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=/var --mandir=${PREFIX}/man +CONFIGURE_ARGS= --localstatedir=/var ALL_TARGET= ${PORTNAME} USE_GETOPT_LONG=yes diff --git a/net-mgmt/bwm-ng/Makefile b/net-mgmt/bwm-ng/Makefile index e30b6ed0cbb8..062e9d99bb62 100644 --- a/net-mgmt/bwm-ng/Makefile +++ b/net-mgmt/bwm-ng/Makefile @@ -21,6 +21,5 @@ MAN1= bwm-ng.1 PLIST_FILES= bin/bwm-ng CONFIGURE_ENV= LIBS="`pkg-config --libs libstatgrab`" -CONFIGURE_ARGS+= --mandir=${PREFIX}/man .include <bsd.port.mk> diff --git a/net-mgmt/darkstat/Makefile b/net-mgmt/darkstat/Makefile index 8497eff8fe33..a9b77f1812fb 100644 --- a/net-mgmt/darkstat/Makefile +++ b/net-mgmt/darkstat/Makefile @@ -16,7 +16,6 @@ COMMENT= Network statistics gatherer and reporter USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${PREFIX}/man MAN1= darkstat.1 DOCS= AUTHORS INSTALL README THANKS diff --git a/net-mgmt/gsnmp/Makefile b/net-mgmt/gsnmp/Makefile index 7a2eea9f7080..d5cd047ab74b 100644 --- a/net-mgmt/gsnmp/Makefile +++ b/net-mgmt/gsnmp/Makefile @@ -19,7 +19,6 @@ LIB_DEPENDS= gnet:${PORTSDIR}/net/gnet2 USE_GNOME= gnomehack glib20 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man USE_LDCONFIG= yes MAN1= gsnmp-get.1 diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile index c09c4bf160b9..561dda9dbba2 100644 --- a/net-mgmt/kismet/Makefile +++ b/net-mgmt/kismet/Makefile @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS+= --enable-syspcap --mandir=${MANPREFIX}/man +CONFIGURE_ARGS+= --enable-syspcap OPTIONS= CURSES "libcurses interface" on \ PANEL "libpanels interface" on \ diff --git a/net-mgmt/pktstat/Makefile b/net-mgmt/pktstat/Makefile index 926aaba3b822..2df09374183c 100644 --- a/net-mgmt/pktstat/Makefile +++ b/net-mgmt/pktstat/Makefile @@ -14,7 +14,6 @@ MAINTAINER= infofarmer@FreeBSD.org COMMENT= Network traffic viewer GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN1= ${PORTNAME}.1 PLIST_FILES= bin/${PORTNAME} diff --git a/net-mgmt/rancid-devel/Makefile b/net-mgmt/rancid-devel/Makefile index 5a74a103b725..034a6f746eaf 100644 --- a/net-mgmt/rancid-devel/Makefile +++ b/net-mgmt/rancid-devel/Makefile @@ -23,13 +23,11 @@ RUN_DEPENDS= expect:${PORTSDIR}/lang/expect \ USE_PERL5= yes PKGMESSAGE= ${WRKDIR}/pkg-message USE_GMAKE= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= \ - --prefix=${PREFIX}/ \ +GNU_CONFIGURE= yes +CONFIGURE_ARGS= \ --localstatedir=${PREFIX}/var/${PORTNAME}/ \ --bindir=${PREFIX}/libexec/${PORTNAME}/ \ - --sysconfdir=${PREFIX}/etc/${PORTNAME}/ \ - --mandir=${PREFIX}/man + --sysconfdir=${PREFIX}/etc/${PORTNAME}/ MAN1= alogin.1 blogin.1 cat5rancid.1 clogin.1 control_rancid.1 \ cssrancid.1 elogin.1 erancid.1 f10rancid.1 flogin.1 fnrancid.1 \ diff --git a/net-mgmt/scli/Makefile b/net-mgmt/scli/Makefile index 605f2fdec223..6367411ac088 100644 --- a/net-mgmt/scli/Makefile +++ b/net-mgmt/scli/Makefile @@ -17,7 +17,6 @@ COMMENT= A collection of SNMP command line management tools LIB_DEPENDS= gsnmp:${PORTSDIR}/net-mgmt/gsnmp GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man --infodir=${PREFIX}/info USE_GMAKE= yes USE_GNOME= libxml2 diff --git a/net-mgmt/sipcalc/Makefile b/net-mgmt/sipcalc/Makefile index c1d9e8bfee98..cf4dbf9ed617 100644 --- a/net-mgmt/sipcalc/Makefile +++ b/net-mgmt/sipcalc/Makefile @@ -16,7 +16,6 @@ COMMENT= Sipcalc is an IP subnet calculator with IPv6 support USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= "--mandir=${PREFIX}/man" MAN1= sipcalc.1 DOC_FILES= doc/sipcalc.txt ChangeLog README diff --git a/net-mgmt/softflowd/Makefile b/net-mgmt/softflowd/Makefile index 892ba6f10eb0..5fcee6d889e7 100644 --- a/net-mgmt/softflowd/Makefile +++ b/net-mgmt/softflowd/Makefile @@ -14,7 +14,6 @@ MAINTAINER= janos.mohacsi@bsd.hu COMMENT= Softflowd is flow-based network traffic analyser with export GNU_CONFIGURE= yes -CONFIGURE_ARGS+= "--mandir=${PREFIX}/man" USE_GMAKE= yes PLIST_FILES= sbin/softflowd sbin/softflowctl MAN8= softflowd.8 softflowctl.8 diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile index cfdfee3b316d..d3f8c5b150a0 100644 --- a/net-p2p/amule-devel/Makefile +++ b/net-p2p/amule-devel/Makefile @@ -31,7 +31,6 @@ WX_CONF_ARGS= absolute GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-debug \ - --mandir=${MANPREFIX}/man \ --without-included-gettext \ --with-libintl-prefix=${LOCALBASE} \ --with-libiconv-prefix=${LOCALBASE} \ diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile index cfdfee3b316d..d3f8c5b150a0 100644 --- a/net-p2p/amule/Makefile +++ b/net-p2p/amule/Makefile @@ -31,7 +31,6 @@ WX_CONF_ARGS= absolute GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-debug \ - --mandir=${MANPREFIX}/man \ --without-included-gettext \ --with-libintl-prefix=${LOCALBASE} \ --with-libiconv-prefix=${LOCALBASE} \ diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile index cfdfee3b316d..d3f8c5b150a0 100644 --- a/net-p2p/amule2/Makefile +++ b/net-p2p/amule2/Makefile @@ -31,7 +31,6 @@ WX_CONF_ARGS= absolute GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-debug \ - --mandir=${MANPREFIX}/man \ --without-included-gettext \ --with-libintl-prefix=${LOCALBASE} \ --with-libiconv-prefix=${LOCALBASE} \ diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile index 72a620ef669c..7244539f00f5 100644 --- a/net-p2p/rtorrent/Makefile +++ b/net-p2p/rtorrent/Makefile @@ -29,7 +29,7 @@ MAN1= rtorrent.1 USE_GCC= 3.4+ USE_GETOPT_LONG=yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-debug --mandir="${PREFIX}/man" +CONFIGURE_ARGS= --disable-debug CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} SUB_FILES= pkg-message diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index cdd82c4b3d52..732667320e8b 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -23,7 +23,6 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${LOCALBASE}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile index cdd82c4b3d52..732667320e8b 100644 --- a/net/asterisk10/Makefile +++ b/net/asterisk10/Makefile @@ -23,7 +23,6 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${LOCALBASE}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile index cdd82c4b3d52..732667320e8b 100644 --- a/net/asterisk14/Makefile +++ b/net/asterisk14/Makefile @@ -23,7 +23,6 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${LOCALBASE}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index cdd82c4b3d52..732667320e8b 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -23,7 +23,6 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${LOCALBASE}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 diff --git a/net/avahi/Makefile b/net/avahi/Makefile index 84f4212f736d..d660c1baacb8 100644 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -37,8 +37,7 @@ CONFIGURE_ARGS?=--with-distro=freebsd \ --disable-doxygen-dot \ --localstatedir=/var \ --enable-compat-howl \ - --disable-autoipd \ - --mandir=${PREFIX}/man + --disable-autoipd CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" \ LDFLAGS="-L${LOCALBASE}/lib" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile index d751a18e6957..5dc61c9a197e 100644 --- a/net/coda6_server/Makefile +++ b/net/coda6_server/Makefile @@ -25,7 +25,6 @@ LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp \ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${PREFIX}/man ALL_TARGET= coda INSTALL_TARGET= ${CODA_SUITE}-install diff --git a/net/dictd/Makefile b/net/dictd/Makefile index 14d02d73cc8f..15aab43cefc9 100644 --- a/net/dictd/Makefile +++ b/net/dictd/Makefile @@ -23,7 +23,7 @@ USE_BISON= yes USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \ - --without-local-zlib --mandir="${PREFIX}/man" + --without-local-zlib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/echoping/Makefile b/net/echoping/Makefile index d2a3648c1c52..75a68fdcf6ce 100644 --- a/net/echoping/Makefile +++ b/net/echoping/Makefile @@ -19,8 +19,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-http --enable-icp --enable-smtp --with-ssl \ - --enable-ttcp --enable-tos --with-libidn=${LOCALBASE} \ - --mandir=${LOCALBASE}/man + --enable-ttcp --enable-tos --with-libidn=${LOCALBASE} PING_PLUGINS= dns random whois diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 711248e6d578..2c85454b4db5 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -70,7 +70,6 @@ WITH_MYSQL= yes CONFIGURE_ARGS= --quiet \ --prefix=${PREFIX} \ --localstatedir=/var \ - --mandir=${PREFIX}/man \ --with-system-libtool .ifdef(NOPORTDOCS) CONFIGURE_ARGS+=--without-docdir diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile index 711248e6d578..2c85454b4db5 100644 --- a/net/freeradius2/Makefile +++ b/net/freeradius2/Makefile @@ -70,7 +70,6 @@ WITH_MYSQL= yes CONFIGURE_ARGS= --quiet \ --prefix=${PREFIX} \ --localstatedir=/var \ - --mandir=${PREFIX}/man \ --with-system-libtool .ifdef(NOPORTDOCS) CONFIGURE_ARGS+=--without-docdir diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile index c6803d1c79a3..c6b54ce6d708 100644 --- a/net/honeyd/Makefile +++ b/net/honeyd/Makefile @@ -22,8 +22,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-libdnet=${LOCALBASE} \ - --with-libevent=${LOCALBASE} \ - --mandir=${MANPREFIX}/man + --with-libevent=${LOCALBASE} .if defined(WITH_PYTHON) USE_PYTHON= 2.4 diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile index 83783c9b09b8..7c9b83273047 100644 --- a/net/keepalived/Makefile +++ b/net/keepalived/Makefile @@ -24,8 +24,7 @@ USE_RC_SUBR= keepalived.sh LDFLAGS+= -lipvs -L${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-kernel-dir=${LOCALBASE} \ - --mandir=${PREFIX} +CONFIGURE_ARGS+= --with-kernel-dir=${LOCALBASE} CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" MAN1= genhash.1 diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile index 1e9279504018..773ec1a53287 100644 --- a/net/libpcap/Makefile +++ b/net/libpcap/Makefile @@ -27,7 +27,6 @@ USE_LDCONFIG= yes PREFIX= /usr PKGNAMESUFFIX= -overwrite-base MANPREFIX= ${TARGETDIR}/share -CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man PLIST_SUB+= NOTBASE="@comment " PLIST_SUB+= BASE="" EXTRA_PATCHES+= ${FILESDIR}/patchbase-Makefile.in diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile index 38b8a7a777f4..f3c9db27ec82 100644 --- a/net/mediatomb/Makefile +++ b/net/mediatomb/Makefile @@ -19,7 +19,6 @@ GNU_CONFIGURE= yes LDFLAGS+= ${PTHREAD_LIBS} CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --with-search="${LOCALBASE}" \ - --mandir="${MANPREFIX}/man" \ --disable-inotify CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/net/minisapserver/Makefile b/net/minisapserver/Makefile index fdf1aee02f5b..94dc41303fdf 100644 --- a/net/minisapserver/Makefile +++ b/net/minisapserver/Makefile @@ -16,7 +16,6 @@ COMMENT= SAP and SLP announcement for the VLC Media Player USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man USE_GMAKE= yes MAN1= sapserver.1 PLIST_FILES= bin/sapserver etc/sap.cfg-dist etc/rc.d/sapserver.sh diff --git a/net/miredo/Makefile b/net/miredo/Makefile index ce85267218c8..3a29b8b7001b 100644 --- a/net/miredo/Makefile +++ b/net/miredo/Makefile @@ -15,7 +15,6 @@ COMMENT= Opensource Teredo (IPv6 tunneling) implementation USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man USE_LDCONFIG= yes MAN1= teredo-mire.1 diff --git a/net/nbd-server/Makefile b/net/nbd-server/Makefile index 821b897c08b6..f455192b1433 100644 --- a/net/nbd-server/Makefile +++ b/net/nbd-server/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_GNOME= glib20 USE_GETOPT_LONG=yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man --enable-lfs --enable-syslog +CONFIGURE_ARGS= --prefix=${PREFIX} --enable-lfs --enable-syslog PLIST_FILES= bin/nbd-server MAN1= nbd-server.1 diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile index 28da2cf42ef7..37fa878eb213 100644 --- a/net/ndisc6/Makefile +++ b/net/ndisc6/Makefile @@ -18,7 +18,7 @@ USE_BZIP2= yes USE_GETOPT_LONG=yes USE_GCC= 3.2+ GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-suid-install --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --disable-suid-install MAN1= tcpspray6.1 addrinfo.1 dnssort.1 MAN8= ndisc6.8 rdisc6.8 rltraceroute6.8 diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile index 61de4c31c55d..a71aa99ad53b 100644 --- a/net/nepenthes/Makefile +++ b/net/nepenthes/Makefile @@ -33,7 +33,6 @@ CONFIGURE_ARGS+= --enable-debug-logging USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --mandir=${PREFIX}/man --infodir=${PREFIX}/info DOCS= README README.VFS logo-shaded.svg MAN8= nepenthes.8 diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile index 16d4a36342ba..6fbc00c21c3a 100644 --- a/net/ngrep/Makefile +++ b/net/ngrep/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes ALL_TARGET= ngrep GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man/ --disable-pcap-restart +CONFIGURE_ARGS= --disable-pcap-restart OPTIONS= PCRE "Use PCRE instead of GNU regex" on \ PORTS_PCAP "Use ports PCAP instead of system PCAP" off \ diff --git a/net/openpbx.org/Makefile b/net/openpbx.org/Makefile index 696494f43eea..2139b12f9e46 100644 --- a/net/openpbx.org/Makefile +++ b/net/openpbx.org/Makefile @@ -23,8 +23,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tiff-includes=${LOCALBASE}/include \ --with-tiff-libs=${LOCALBASE}/lib \ --with-directory-layout=lsb \ - --localstatedir=/var \ - --mandir=${LOCALBASE}/man + --localstatedir=/var CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/poptop/Makefile b/net/poptop/Makefile index b4565a6cd8bd..d497fd6175c6 100644 --- a/net/poptop/Makefile +++ b/net/poptop/Makefile @@ -17,7 +17,6 @@ COMMENT= Windows 9x compatible PPTP (VPN) server USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 30a12f5bb5b9..60c49cb58afd 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -23,7 +23,7 @@ USE_RC_SUBR= rsyncd.sh SUB_LIST= NAME=rsyncd GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-debug --enable-ipv6 --mandir=${PREFIX}/man \ +CONFIGURE_ARGS= --disable-debug --enable-ipv6 \ --with-rsyncd-conf=${PREFIX}/etc/rsyncd.conf CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PATCH_STRIP= -p1 diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile index b3e4e3c2a5f4..996f5a19aef0 100644 --- a/net/silc-client/Makefile +++ b/net/silc-client/Makefile @@ -33,7 +33,6 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GNOME= glib12 USE_GMAKE= yes CONFIGURE_ARGS= --docdir=${DOCSDIR} \ - --mandir=${MANPREFIX}/man \ --with-perl=no \ --without-libtoolfix MAN1= silc.1 diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile index d58bc317d8d7..543f1b60a6d5 100644 --- a/net/tcpdump/Makefile +++ b/net/tcpdump/Makefile @@ -32,7 +32,6 @@ GNU_CONFIGURE= yes PREFIX= /usr PKGNAMESUFFIX= -overwrite-base MANPREFIX= ${TARGETDIR}/share -CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man PLIST_SUB+= NOTBASE="@comment " PLIST_SUB+= BASE="" PKGMESSAGE= ${FILESDIR}/pkg-message-base diff --git a/net/tramp/Makefile b/net/tramp/Makefile index e2a187ec0398..53b4b5fdfca4 100644 --- a/net/tramp/Makefile +++ b/net/tramp/Makefile @@ -27,7 +27,6 @@ PLIST_SUB+= TRAMP_LISPDIR=${TRAMP_LISPDIR} CONFIGURE_ENV= TEXI2DVI=no CONFIGURE_ARGS= --with-contrib --prefix=${PREFIX} \ --with-lispdir=${PREFIX}/${TRAMP_LISPDIR} \ - --infodir=${PREFIX}/info \ --with-emacs=${EMACS_CMD} INFO= tramp diff --git a/net/ushare/Makefile b/net/ushare/Makefile index 000c6b4eff28..bbff9aca1796 100644 --- a/net/ushare/Makefile +++ b/net/ushare/Makefile @@ -25,7 +25,6 @@ GNU_CONFIGURE= yes USE_GNOME= pkgconfig CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE}/lib \ --with-libintl-prefix=${LOCALBASE}/lib \ - --mandir=${MANPREFIX}/man \ --with-libupnp-prefix=${LOCALBASE} .include <bsd.port.pre.mk> diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 864527b7d78b..6485ab693428 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -30,8 +30,7 @@ CONFIGURE_ENV= MIBDIRS="/dev/null" \ LIBS="${WIRESHARK_LIBS}" CONFIGURE_ARGS+= --program-transform-name="" \ --with-ssl=${OPENSSLBASE} \ - --disable-warnings-as-errors \ - --mandir=${MANPREFIX}/man + --disable-warnings-as-errors MAKE_ENV= MIBDIRS="/dev/null" USE_LDCONFIG= yes DATADIR= ${PREFIX}/share/${DATADIR_NAME} diff --git a/news/gnus-emacs20/Makefile b/news/gnus-emacs20/Makefile index 574c0590486c..e84527f172ef 100644 --- a/news/gnus-emacs20/Makefile +++ b/news/gnus-emacs20/Makefile @@ -26,8 +26,7 @@ USE_EMACS= yes EMACS_PORT_NAME?=emacs20 CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \ - --with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/gnus \ - --infodir=${INFODIR} + --with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/gnus INFODIR= ${PREFIX}/info INFO= emacs-mime gnus gnus-1 gnus-2 gnus-3 message diff --git a/news/inn/Makefile b/news/inn/Makefile index 2e5ed31ccbed..45f4b7bb94ae 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -43,7 +43,7 @@ VARBASE?= /var HAS_CONFIGURE= yes CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} -CONFIGURE_ARGS+= --mandir=${PREFIX}/man \ +CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ --prefix=${INN_NEWSBASE} \ --with-spool-dir=${INN_NEWSSPOOL} \ --with-log-dir=${INN_LOGDIR} \ diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile index 23e8474e86f3..5c022398ade4 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -36,7 +36,7 @@ PLIST_SUB= SPOOLDIR=${LEAFNODE_SPOOLDIR} CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/leafnode \ --with-spooldir=${LEAFNODE_SPOOLDIR} --with-ipv6 \ - --exec-prefix=${PREFIX} --mandir=${MANPREFIX}/man + --exec-prefix=${PREFIX} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} SUB_FILES= pkg-message pkg-install SUB_LIST= SPOOLDIR=${LEAFNODE_SPOOLDIR} diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile index 746954d55b17..09fdc74ca0cb 100644 --- a/palm/gnome-pilot/Makefile +++ b/palm/gnome-pilot/Makefile @@ -27,8 +27,7 @@ USE_GETTEXT= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-pisock=${LOCALBASE} \ - --mandir=${PREFIX}/man +CONFIGURE_ARGS= --with-pisock=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile index f3d24ffbb1a5..e6a51cef91cb 100644 --- a/palm/pilot-link/Makefile +++ b/palm/pilot-link/Makefile @@ -21,8 +21,7 @@ USE_GETOPT_LONG=yes USE_GNOME= gnometarget gnomehack pkgconfig GNU_CONFIGURE= yes CFLAGS+= -I${WRKSRC}/popt -I${LOCALBASE}/include -CONFIGURE_ARGS+=--with-libiconv=${LOCALBASE} --with-included-popt --enable-conduits \ - --mandir=${MANPREFIX}/man +CONFIGURE_ARGS+=--with-libiconv=${LOCALBASE} --with-included-popt --enable-conduits CONFIGURE_ENV+= CFLAGS="${CFLAGS:S/-Werror//}" # clear -Werror from CFLAGS USE_LDCONFIG= yes diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile index b664e460e791..92a65dd1f68a 100644 --- a/palm/synce-librapi2/Makefile +++ b/palm/synce-librapi2/Makefile @@ -26,8 +26,7 @@ USE_ICONV= yes WRKSRC= ${WRKDIR}/librapi-${PORTVERSION} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE} \ - --with-libsynce=${LOCALBASE} \ - --mandir=${MANPREFIX}/man + --with-libsynce=${LOCALBASE} USE_LDCONFIG= yes diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile index 46d937b02576..0e6b69eedb67 100644 --- a/palm/synce-libsynce/Makefile +++ b/palm/synce-libsynce/Makefile @@ -19,8 +19,7 @@ USE_ICONV= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/libsynce-${PORTVERSION} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE} \ - --mandir=${MANPREFIX}/man +CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE} USE_LDCONFIG= yes diff --git a/polish/ekg/Makefile b/polish/ekg/Makefile index 1c0eb7ec1b19..824df485a323 100644 --- a/polish/ekg/Makefile +++ b/polish/ekg/Makefile @@ -25,7 +25,6 @@ CONFIGURE_ARGS+= --disable-shared \ --without-openssl \ --disable-libgadu-openssl \ --without-libungif \ - --mandir=${MANPREFIX}/man \ --without-libjpeg CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ diff --git a/print/auctex/Makefile b/print/auctex/Makefile index 56b8b484e15d..39784bfe686c 100644 --- a/print/auctex/Makefile +++ b/print/auctex/Makefile @@ -22,8 +22,7 @@ USE_GHOSTSCRIPT=yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-lispdir=${PREFIX}/${LISPDIR} \ --with-auto-dir=${PREFIX}/${LISPDIR}/auctex/auto \ - --with-texmf-dir=${PREFIX}/${TEXMFDIR} \ - --infodir=${PREFIX}/info + --with-texmf-dir=${PREFIX}/${TEXMFDIR} USE_EMACS= yes EMACS_PORT_NAME?= emacs21 diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile index 5cd9b49f83ce..8f14791c47db 100644 --- a/print/gtklp/Makefile +++ b/print/gtklp/Makefile @@ -26,7 +26,6 @@ CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN1= gtklp.1 gtklpq.1 diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile index 5370a4234c12..fe617dc96b6f 100644 --- a/print/gutenprint-base/Makefile +++ b/print/gutenprint-base/Makefile @@ -26,8 +26,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack gnometarget gtk20 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS=--with-gimp=no --with-gimp2=no \ - --with-mandir=${PREFIX}/man +CONFIGURE_ARGS=--with-gimp=no --with-gimp2=no USE_LDCONFIG= yes CPPFLAGS= -I${LOCALBASE}/include -I${PREFIX}/include @@ -107,7 +106,6 @@ post-patch: ${WRKSRC}/src/gimp2/Makefile.in @${REINPLACE_CMD} -e 's|$$libdir/gimp/1.2/plug-ins||g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|@mandir@|${PREFIX}/man|' ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e 's|= $$(pkglibdir)|= ${PREFIX}/libexec/cups|' \ ${WRKSRC}/src/cups/Makefile.in diff --git a/print/gv/Makefile b/print/gv/Makefile index 7348d6d1e0b5..f32bf3a05b26 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -25,9 +25,7 @@ USE_GETOPT_LONG= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --libdir=${PREFIX}/lib/X11 \ - --mandir=${MANPREFIX}/man \ - --infodir=${PREFIX}/${INFO_PATH} +CONFIGURE_ARGS= --libdir=${PREFIX}/lib/X11 MAN1= gv.1 INFO= gv diff --git a/print/libpaper/Makefile b/print/libpaper/Makefile index d8bf8a4a061e..575992b6af8c 100644 --- a/print/libpaper/Makefile +++ b/print/libpaper/Makefile @@ -19,7 +19,7 @@ COMMENT= A library providing routines for paper size management USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --build=${CONFIGURE_TARGET} --mandir=${PREFIX}/man +CONFIGURE_ARGS= --build=${CONFIGURE_TARGET} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index db854a243e82..c1853a9b3d80 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -41,8 +41,7 @@ MAKEFILE= GNUmakefile PKGINSTALL= ${WRKDIR}/pkg-install CONFIGURE_ARGS+= --with-kpathsea-include=${LOCALBASE}/include \ - --with-kpathsea-lib=${LOCALBASE}/lib \ - --infodir=${PREFIX}/info + --with-kpathsea-lib=${LOCALBASE}/lib CONFIGURE_ENV+= "CPPFLAGS=${CPPFLAGS}" .if defined(WITH_SELFBUILT_FONTS) diff --git a/print/pslib/Makefile b/print/pslib/Makefile index d2a1ea1a3547..12ca6d4b42a4 100644 --- a/print/pslib/Makefile +++ b/print/pslib/Makefile @@ -24,7 +24,6 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man USE_LDCONFIG= yes OPTIONS= EXAMPLES "Install additional examples" On \ diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile index d81d240b3724..55642c2f5ae3 100644 --- a/print/texinfo/Makefile +++ b/print/texinfo/Makefile @@ -25,7 +25,6 @@ PKGDEINSTALL= ${PKGINSTALL} MAKE_ARGS= TEXMF=${PREFIX}/${TEXMFLOCAL} CONFIGURE_ARGS= \ - --infodir=${PREFIX}/${INFO_PATH} \ --without-included-gettext CONFIGURE_ENV= \ CPPFLAGS="-I${LOCALBASE}/lib" \ diff --git a/print/typetools/Makefile b/print/typetools/Makefile index eb38213dbdb0..bb5c764c0735 100644 --- a/print/typetools/Makefile +++ b/print/typetools/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX-base GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-kpathsea=${LOCALBASE} --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --with-kpathsea=${LOCALBASE} MAN1= cfftot1.1 mmafm.1 mmpfb.1 otfinfo.1 otftotfm.1 t1dotlessj.1 \ t1lint.1 t1reencode.1 t1testpage.1 ttftotype42.1 diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile index e156938d3232..2304a9ed8382 100644 --- a/science/gchemutils/Makefile +++ b/science/gchemutils/Makefile @@ -28,7 +28,6 @@ USE_GNOME= gnomehack intlhack libglade2 libgnomeprintui libgnomeui gnomedocutils USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" INSTALLS_ICONS= yes GCONF_SCHEMAS= gcrystal.schemas diff --git a/science/gramps/Makefile b/science/gramps/Makefile index 5f5b6a808648..4221772bf002 100644 --- a/science/gramps/Makefile +++ b/science/gramps/Makefile @@ -25,7 +25,6 @@ USE_GNOME= gnomehack pygnome2 pygnomeextras desktopfileutils gnomedocutils GNU_CONFIGURE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN1= gramps.1 MANLANG= "" fr diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile index 059d451baeeb..3a4c44fca5e3 100644 --- a/science/gwyddion/Makefile +++ b/science/gwyddion/Makefile @@ -26,8 +26,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ - --disable-pascal --disable-pygwy \ - --mandir=${MANPREFIX}/man + --disable-pascal --disable-pygwy MAKE_ARGS= pkgconfigdatadir=${PREFIX}/libdata/pkgconfig diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile index e93513e47bbb..f800c436ba23 100644 --- a/science/netcdf/Makefile +++ b/science/netcdf/Makefile @@ -17,7 +17,7 @@ COMMENT= Library for machine-independent, array-oriented data access CONFLICTS= hdf-4.* -CONFIGURE_ARGS= --enable-shared --mandir=${PREFIX}/man --disable-f77 +CONFIGURE_ARGS= --enable-shared --disable-f77 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran" USE_BZIP2= YES diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile index e93513e47bbb..f800c436ba23 100644 --- a/science/netcdf4/Makefile +++ b/science/netcdf4/Makefile @@ -17,7 +17,7 @@ COMMENT= Library for machine-independent, array-oriented data access CONFLICTS= hdf-4.* -CONFIGURE_ARGS= --enable-shared --mandir=${PREFIX}/man --disable-f77 +CONFIGURE_ARGS= --enable-shared --disable-f77 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran" USE_BZIP2= YES diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile index 8e84c71b867f..0dc11ec0c506 100644 --- a/science/openbabel/Makefile +++ b/science/openbabel/Makefile @@ -18,7 +18,6 @@ COMMENT= Chemistry file translation program USE_GCC= 3.4+ USE_GNOME= gnomehack gnometarget libxml2 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man USE_LDCONFIG= yes MAN1= obchiral.1 obfit.1 obgrep.1 obprop.1 obrotate.1 openbabel.1 diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile index f869386bd0b4..38c6962325d8 100644 --- a/science/pnetcdf/Makefile +++ b/science/pnetcdf/Makefile @@ -38,12 +38,12 @@ MAN3= pnetcdf.3 .if defined(WITH_OPENMPI) BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi -CONFIGURE_ARGS= --enable-shared --mandir=${PREFIX}/man --disable-f77 --with-mpi=${PREFIX}/mpi/openmpi +CONFIGURE_ARGS= --enable-shared --disable-f77 --with-mpi=${PREFIX}/mpi/openmpi CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran" .else BUILD_DEPENDS+= ${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2 RUN_DEPENDS+= ${LOCALBASE}/mpich2/lib/libmpich.so:${PORTSDIR}/net/mpich2 -CONFIGURE_ARGS= --enable-shared --mandir=${PREFIX}/man --disable-f77 --with-mpi=${PREFIX}/mpich2 +CONFIGURE_ARGS= --enable-shared --disable-f77 --with-mpi=${PREFIX}/mpich2 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran" .endif diff --git a/security/aespipe/Makefile b/security/aespipe/Makefile index 2e94cb0ec44d..1e45846b4a67 100644 --- a/security/aespipe/Makefile +++ b/security/aespipe/Makefile @@ -20,8 +20,7 @@ MAN1= aespipe.1 USE_BZIP2= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS+=--mandir="${MANPREFIX}/man" +GNU_CONFIGURE= yes PLIST_FILES= bin/aespipe .include <bsd.port.pre.mk> diff --git a/security/cksfv/Makefile b/security/cksfv/Makefile index 335df4f92592..394f858c077b 100644 --- a/security/cksfv/Makefile +++ b/security/cksfv/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ehaupt@FreeBSD.org COMMENT= Create or manipulate Simple File Verification (SFV) checksum files HAS_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man --prefix=${PREFIX} +CONFIGURE_ARGS= --manir=${PREFIX}/man --prefix=${PREFIX} MAN1= cksfv.1 PLIST_FILES= bin/cksfv diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile index dff0c84005e0..a2e5b9ad47f3 100644 --- a/security/clamav-devel/Makefile +++ b/security/clamav-devel/Makefile @@ -43,7 +43,6 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-dbdir=${DBDIR} \ --with-zlib=/usr \ - --mandir=${MANPREFIX}/man \ --disable-zlib-vcheck \ --disable-clamuko \ --disable-clamav \ diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 531c69b8cb6a..9de0fae5b013 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -39,7 +39,6 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-dbdir=${DBDIR} \ --with-zlib=/usr \ - --mandir=${MANPREFIX}/man \ --disable-zlib-vcheck \ --disable-clamuko \ --disable-clamav \ diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile index f540a240467e..67d3a0f5af8d 100644 --- a/security/clamsmtp/Makefile +++ b/security/clamsmtp/Makefile @@ -20,7 +20,6 @@ SUB_LIST= CLAMAV_PID_DIR=${CLAMAV_PID_DIR} SUB_FILES+= pkg-message CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man CLAMAV_PID_DIR?= /var/run/clamav diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile index 8bfdc44a7817..0776a5fc6226 100644 --- a/security/cyrus-sasl2-ldapdb/Makefile +++ b/security/cyrus-sasl2-ldapdb/Makefile @@ -44,7 +44,6 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-plugindir=${PREFIX}/lib/sasl2 \ --with-dbpath=${PREFIX}/etc/sasldb2 \ --includedir=${PREFIX}/include \ - --mandir=${MANPREFIX}/man \ --enable-static \ --with-rc4=openssl diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile index 2b76567cdadd..3e3c25a7177e 100644 --- a/security/cyrus-sasl2-saslauthd/Makefile +++ b/security/cyrus-sasl2-saslauthd/Makefile @@ -36,7 +36,6 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-plugindir=${PREFIX}/lib/sasl2 \ --with-dbpath=${PREFIX}/etc/sasldb2 \ --includedir=${PREFIX}/include \ - --mandir=${MANPREFIX}/man \ --enable-static \ --enable-login \ --enable-auth-sasldb \ diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 3722a3e7202f..3e7126c70ca5 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -49,7 +49,6 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-plugindir=${PREFIX}/lib/sasl2 \ --with-dbpath=${PREFIX}/etc/sasldb2 \ --includedir=${PREFIX}/include \ - --mandir=${MANPREFIX}/man \ --enable-static \ --enable-auth-sasldb \ --with-rc4=openssl \ diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index 8769af1af77d..d24cb2048a4c 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -29,7 +29,6 @@ USE_GMAKE= yes INFO= dirmngr MAN1= dirmngr-client.1 dirmngr.1 -CONFIGURE_ARGS+=--infodir=${PREFIX}/${INFO_PATH} --mandir=${MANPREFIX}/man CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" .if defined(WITHOUT_NLS) diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 5c46bdbe1d0f..2548213a0747 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -31,7 +31,6 @@ USE_ICONV= YES USE_LDCONFIG= YES USE_GETTEXT= YES CONFIGURE_TARGET=# empty -CONFIGURE_ARGS+= --infodir=${PREFIX}/info --mandir=${PREFIX}/man CONFIGURE_ARGS+= --enable-nls MAN1= gpg2.1 gpgsm.1 gpgv2.1 gpg-agent.1 scdaemon.1 watchgnupg.1 \ gpgconf.1 gpg-preset-passphrase.1 gpg-connect-agent.1 \ diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile index ec300cf98b0e..0be7a4e64422 100644 --- a/security/gnupg1/Makefile +++ b/security/gnupg1/Makefile @@ -21,7 +21,6 @@ USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES CONFIGURE_TARGET= --build ${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --infodir=${PREFIX}/info --mandir=${PREFIX}/man .if ${MACHINE_CPU:Mi586} MACHINE_ARCH= i586 .endif diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile index 566494f2a088..fd521e59c725 100644 --- a/security/gnutls-devel/Makefile +++ b/security/gnutls-devel/Makefile @@ -34,8 +34,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --with-included-lzo \ - --infodir="${PREFIX}/info" --mandir="${PREFIX}/man/" +CONFIGURE_ARGS+= --with-included-lzo MANCOMPRESSED= no .include <bsd.port.pre.mk> diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index c7b017e84985..8abf5a8d080a 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -34,8 +34,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --with-included-lzo \ - --infodir="${PREFIX}/info" --mandir="${PREFIX}/man/" +CONFIGURE_ARGS+= --with-included-lzo MANCOMPRESSED= no .include <bsd.port.pre.mk> diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index afe6d6fde17c..58d0f1db39f7 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -24,8 +24,7 @@ INSTALLS_SHLIB= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-gpg=${LOCALBASE}/bin/gpg \ --with-gpgsm=${LOCALBASE}/bin/gpgsm \ - --includedir=${PREFIX}/include/gpgme \ - --infodir=${PREFIX}/${INFO_PATH} + --includedir=${PREFIX}/include/gpgme INFO= gpgme diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile index 3c123cf1a739..75f8e866e35f 100644 --- a/security/gsasl/Makefile +++ b/security/gsasl/Makefile @@ -24,8 +24,6 @@ USE_GNOME= gnomehack gnometarget pkgconfig USE_GETOPT_LONG= yes USE_PERL5_BUILD= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man \ - --infodir=${PREFIX}/info CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/security/gss/Makefile b/security/gss/Makefile index 7f507ae97fdc..332ecee732f5 100644 --- a/security/gss/Makefile +++ b/security/gss/Makefile @@ -26,8 +26,7 @@ USE_GNOME= gnomehack gnometarget pkgconfig USE_GETOPT_LONG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --disable-kerberos5 \ - --infodir=${PREFIX}/${INFO_PATH} --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --disable-kerberos5 USE_LDCONFIG= yes INFO= gss diff --git a/security/libassuan/Makefile b/security/libassuan/Makefile index 945c184df766..35523191cd30 100644 --- a/security/libassuan/Makefile +++ b/security/libassuan/Makefile @@ -20,8 +20,6 @@ USE_BZIP2= yes GNU_CONFIGURE= yes INFO= assuan -CONFIGURE_ARGS+=--infodir=${PREFIX}/info - CFLAGS+= -I${LOCALBASE}/include/pth .include <bsd.port.mk> diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index 481f2ed4412b..32c721d94613 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -20,7 +20,6 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --infodir=${PREFIX}/info INSTALLS_SHLIB= yes INFO= gcrypt diff --git a/security/libksba/Makefile b/security/libksba/Makefile index b2983f64ed28..b5edf37f12a2 100644 --- a/security/libksba/Makefile +++ b/security/libksba/Makefile @@ -23,8 +23,7 @@ INSTALLS_SHLIB= yes USE_GETTEXT= yes USE_LDCONFIG= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --infodir=${PREFIX}/${INFO_PATH} +CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_PERL5_BUILD=yes INFO= ksba diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile index 0beedf56d5ee..f62bf6271672 100644 --- a/security/libssh2/Makefile +++ b/security/libssh2/Makefile @@ -17,7 +17,6 @@ COMMENT= A library implementing the SSH2 protocol USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man USE_LDCONFIG= yes PLIST_FILES= include/libssh2.h \ diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile index 759cfd23c3f6..2a75eb73ed11 100644 --- a/security/libtasn1/Makefile +++ b/security/libtasn1/Makefile @@ -20,7 +20,6 @@ USE_GNOME= pkgconfig GNU_CONFIGURE= yes USE_GETOPT_LONG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --infodir="${PREFIX}/info" --mandir="${PREFIX}/man/" DOCS= AUTHORS NEWS README THANKS doc/TODO \ doc/libtasn1.html doc/libtasn1.pdf doc/libtasn1.ps diff --git a/security/openct/Makefile b/security/openct/Makefile index a14fe9c7524c..8f4585cb89d0 100644 --- a/security/openct/Makefile +++ b/security/openct/Makefile @@ -28,8 +28,6 @@ SUB_FILES= etoken.conf CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${PREFIX}/man - MAN1= openct-tool.1 DOC_FILES= README export-wiki.sh export-wiki.xsl trac.css *.html api diff --git a/security/opensc/Makefile b/security/opensc/Makefile index 36ab220e9d8e..b7a53db4b792 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -33,8 +33,6 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" -CONFIGURE_ARGS= --mandir=${PREFIX}/man - DOC_FILES= README *.sh *.xsl *.css *.html api html tools PORTDOCS= * diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index ced66efdfb70..8e57e2c36dcb 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -41,7 +41,7 @@ USE_OPENSSL= yes USE_PERL5_BUILD= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man \ +CONFIGURE_ARGS= --prefix=${PREFIX} \ --with-md5-passwords --without-zlib-version-check PRECIOUS= ssh_config sshd_config ssh_host_key ssh_host_key.pub \ ssh_host_rsa_key ssh_host_rsa_key.pub ssh_host_dsa_key \ diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile index 3f5c12b8f60b..682f89ac4b6c 100644 --- a/security/pam_krb5/Makefile +++ b/security/pam_krb5/Makefile @@ -55,7 +55,6 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS}" CONFIGURE_ARGS= --with-krb5="${KRB5_DIR}" \ --with-pamdir="${PREFIX}/lib" \ --with-man-sect=8 \ - --mandir=${MANDIR} \ --without-krbafs post-install: diff --git a/security/pkcs11-helper/Makefile b/security/pkcs11-helper/Makefile index 96a984d15e15..fd06b96ff951 100644 --- a/security/pkcs11-helper/Makefile +++ b/security/pkcs11-helper/Makefile @@ -22,8 +22,7 @@ USE_LDCONFIG= yes CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" -CONFIGURE_ARGS= --mandir=${PREFIX}/man \ - --disable-crypto-engine-gnutls +CONFIGURE_ARGS= --disable-crypto-engine-gnutls MAN8= pkcs11-helper-1.8 diff --git a/security/samhain/Makefile b/security/samhain/Makefile index 971d2e2751c0..e27cd804ce5c 100644 --- a/security/samhain/Makefile +++ b/security/samhain/Makefile @@ -36,7 +36,7 @@ BUILD_DEPENDS+= gpg:${PORTSDIR}/security/gnupg GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-login-watch --localstatedir=/var \ - --mandir=${PREFIX}/man --enable-suidcheck + --enable-suidcheck .if !defined(WITHOUT_XML_LOGS) CONFIGURE_ARGS+= --enable-xml-log diff --git a/security/silktools/Makefile b/security/silktools/Makefile index 702843f365d8..bf29b1a7ff32 100644 --- a/security/silktools/Makefile +++ b/security/silktools/Makefile @@ -18,8 +18,7 @@ COMMENT= Tools for large-scale network capture analysis LIB_DEPENDS= lzo:${PORTSDIR}/archivers/lzo GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-lzo=${LOCALBASE} --enable-packing-tools \ - --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --with-lzo=${LOCALBASE} --enable-packing-tools USE_GMAKE= yes MAKE_ARGS= CC="${CC}" GCC_FLAGS="" CFLAGS_RELEASE="" USE_LDCONFIG= yes diff --git a/security/tinc/Makefile b/security/tinc/Makefile index 0c5a9a78ddc2..7904fb91f476 100644 --- a/security/tinc/Makefile +++ b/security/tinc/Makefile @@ -24,8 +24,7 @@ USE_GCC= 3.4+ CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --localstatedir=/var --infodir=${PREFIX}/${INFO_PATH} \ - --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --localstatedir=/var CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN5= tinc.conf.5 diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index db996f84d9be..c46b5c89ec94 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -36,7 +36,6 @@ MAN1= tor.1 tor-resolve.1 torify.1 .include <bsd.port.pre.mk> -CONFIGURE_ARGS+= --mandir=${PREFIX}/man CONFIGURE_ENV+= CPPFLAGS+=-I{LOCALBASE}/include \ LDFLAGS+=-L{LOCALBASE}/lib diff --git a/security/tor/Makefile b/security/tor/Makefile index ffb535c74065..e431ec16dab5 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -36,7 +36,6 @@ MAN1= tor.1 tor-resolve.1 torify.1 .include <bsd.port.pre.mk> -CONFIGURE_ARGS+= --mandir=${PREFIX}/man CONFIGURE_ENV+= CPPFLAGS+=-I{LOCALBASE}/include \ LDFLAGS+=-L{LOCALBASE}/lib diff --git a/security/zzuf/Makefile b/security/zzuf/Makefile index 1f4c25bbee87..91e20d0f0f2a 100644 --- a/security/zzuf/Makefile +++ b/security/zzuf/Makefile @@ -16,7 +16,6 @@ COMMENT= Transparent application input fuzzer GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man USE_LDCONFIG= yes MAN1= zzuf.1 diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile index 5f717fd87749..3e8e0e69782c 100644 --- a/sysutils/LPRng/Makefile +++ b/sysutils/LPRng/Makefile @@ -65,10 +65,6 @@ MAN8= lpc.8 checkpc.8 lpd.8 .include <bsd.port.pre.mk> -.if ${PREFIX} == "/usr" -CONFIGURE_ARGS+= --mandir="${PREFIX}/share/man" -.endif - pre-everything:: @${ECHO_MSG} "If you want to replace the default printing system with LPRng, use:" @${ECHO_MSG} " make PORT_REPLACES_BASE_LPR=yes clean all install" diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index ee19bda2ed9e..1cdd5ed66a72 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -24,9 +24,8 @@ COMMENT= A daemon for controlling APC UPS USE_GETTEXT= yes USE_RC_SUBR= apcupsd -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --sbindir=${PREFIX}/sbin \ - --mandir=${MANPREFIX}/man \ +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --sbindir=${PREFIX}/sbin \ --with-nologin=/var/run \ --disable-install-distdir \ --sysconfdir=${PREFIX}/etc/apcupsd \ diff --git a/sysutils/bacula-server-devel/Makefile b/sysutils/bacula-server-devel/Makefile index 60e4904972f8..90d669cb7f81 100644 --- a/sysutils/bacula-server-devel/Makefile +++ b/sysutils/bacula-server-devel/Makefile @@ -37,7 +37,6 @@ CONFIGURE_ARGS= --with-tcp-wrappers=/usr/lib \ --enable-smartalloc \ --with-working-dir=${BACULA_DIR} \ --with-scriptdir=${PREFIX}/share/${PORTNAME} \ - --mandir=${PREFIX}/man \ --with-readline=yes \ --disable-conio diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile index b885eccf6aec..91aaaec18bcc 100644 --- a/sysutils/bacula-server/Makefile +++ b/sysutils/bacula-server/Makefile @@ -41,7 +41,6 @@ CONFIGURE_ARGS= --with-tcp-wrappers=/usr/lib \ --enable-smartalloc \ --with-working-dir=${BACULA_DIR} \ --with-scriptdir=${PREFIX}/share/${PORTNAME} \ - --mandir=${PREFIX}/man \ --with-readline=yes \ --disable-conio diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile index b8c142a56fac..e174bd79f4fc 100644 --- a/sysutils/cfengine/Makefile +++ b/sysutils/cfengine/Makefile @@ -22,9 +22,7 @@ USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-docs \ - --docdir=${DOCSDIR} \ - --infodir=${PREFIX}/info \ - --mandir=${MANPREFIX}/man + --docdir=${DOCSDIR} CONFIGURE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \ BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \ BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \ diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile index b8c142a56fac..e174bd79f4fc 100644 --- a/sysutils/cfengine3-legacy/Makefile +++ b/sysutils/cfengine3-legacy/Makefile @@ -22,9 +22,7 @@ USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-docs \ - --docdir=${DOCSDIR} \ - --infodir=${PREFIX}/info \ - --mandir=${MANPREFIX}/man + --docdir=${DOCSDIR} CONFIGURE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \ BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \ BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \ diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile index b8c142a56fac..e174bd79f4fc 100644 --- a/sysutils/cfengine3/Makefile +++ b/sysutils/cfengine3/Makefile @@ -22,9 +22,7 @@ USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-docs \ - --docdir=${DOCSDIR} \ - --infodir=${PREFIX}/info \ - --mandir=${MANPREFIX}/man + --docdir=${DOCSDIR} CONFIGURE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \ BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \ BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \ diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index e132735fd83a..55b1089266bf 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -22,7 +22,7 @@ USE_GCC= 3.4+ USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --program-prefix=g --infodir=${PREFIX}/info --mandir=${PREFIX}/man +CONFIGURE_ARGS= --program-prefix=g CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" USE_GMAKE= yes diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile index 27ebf9f86934..d62c4c824a89 100644 --- a/sysutils/dar/Makefile +++ b/sysutils/dar/Makefile @@ -18,7 +18,7 @@ USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man --disable-build-html --datadir=${DATADIR} --disable-upx +CONFIGURE_ARGS= --disable-build-html --datadir=${DATADIR} --disable-upx CPPFLAGS= -DHAVE_DECL_GETOPT=0 diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index afc2a6c2156e..3d891452e2a7 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -25,9 +25,7 @@ CONFIGURE_ARGS?= --disable-fsck --disable-e2initrd-helper \ '--with-ldopts=-L${LOCALBASE}/lib' \ --with-cc='${CC}' --with-linker='${LD}' \ --with-ccopts='${CFLAGS}' \ - --with-root-prefix='${PREFIX}'\ - --infodir=${PREFIX}/info \ - --mandir=${MANPREFIX}/man + --with-root-prefix='${PREFIX}' # for unknown reasons, the assembly bitops cause SIGSEGV. # _EXT2_USE_C_VERSIONS_ uses C bitops, these appear to work fine. CONFIGURE_ENV+= CPPFLAGS='${CPPFLAGS} -I${WRKSRC}/lib -I${LOCALBASE}/include -D_EXT2_USE_C_VERSIONS_' diff --git a/sysutils/fusefs-funionfs/Makefile b/sysutils/fusefs-funionfs/Makefile index 8b3575186cbe..8eebdda6c71d 100644 --- a/sysutils/fusefs-funionfs/Makefile +++ b/sysutils/fusefs-funionfs/Makefile @@ -17,7 +17,6 @@ COMMENT= Union filesystem for the FUSE driver BUILD_DEPENDS= ${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man CONFIGURE_ENV= CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" GNU_CONFIGURE= yes diff --git a/sysutils/ipa/Makefile b/sysutils/ipa/Makefile index f1fa564d6109..cb3a3e14f069 100644 --- a/sysutils/ipa/Makefile +++ b/sysutils/ipa/Makefile @@ -32,8 +32,6 @@ OPTIONS= AUTORULES "Enable dynamic rules support" on \ .include <bsd.port.pre.mk> -CONFIGURE_ARGS+= --mandir=${PREFIX}/man - .if defined(WITHOUT_AUTORULES) CONFIGURE_ARGS+= --disable-autorules .endif diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile index 00eaa429dc20..4190827c9208 100644 --- a/sysutils/ipmitool/Makefile +++ b/sysutils/ipmitool/Makefile @@ -20,8 +20,7 @@ USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --enable-intf-lan --enable-intf-lanplus \ - --disable-intf-imb --disable-intf-lipmi --disable-intf-bmc \ - --mandir=${MANPREFIX}/man + --disable-intf-imb --disable-intf-lipmi --disable-intf-bmc CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/ipmitool sbin/ipmievd diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile index fc269f67e947..ac12f3bab51e 100644 --- a/sysutils/lcdproc/Makefile +++ b/sysutils/lcdproc/Makefile @@ -24,9 +24,7 @@ USE_RC_SUBR= LCDd lcdproc CONFIGURE_ARGS= --enable-drivers=all \ --disable-ldap \ - --disable-doxygen \ - --mandir=${PREFIX}/man \ - --infodir=${PREFIX}/info + --disable-doxygen CONFIGURE_ENV= CFLAGS="${CFLAGS}" MAN1= lcdexec.1 lcdproc.1 diff --git a/sysutils/lire/Makefile b/sysutils/lire/Makefile index f9cba3379b00..61644f4cdf96 100644 --- a/sysutils/lire/Makefile +++ b/sysutils/lire/Makefile @@ -41,7 +41,6 @@ USE_PERL5= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= "--with-docbookdir=${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd" -CONFIGURE_ARGS+="--mandir=${PREFIX}/man" CONFIGURE_ENV= POD2MAN=${LOCALBASE}/bin/pod2man MAN1= \ diff --git a/sysutils/modules/Makefile b/sysutils/modules/Makefile index 72932c86715d..ae50d5c84f84 100644 --- a/sysutils/modules/Makefile +++ b/sysutils/modules/Makefile @@ -27,7 +27,7 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX}/Modules/@VERSION@ \ --without-x \ --with-version-path=${PREFIX}/Modules/versions \ - --mandir=${PREFIX}/man \ + --mandir=${MANPREFIX}/man \ --with-tcl-version=${TCL_VER} \ --with-tcl-include=${LOCALBASE}/include/tcl${TCL_DVER} \ --with-tcl-libraries=${LOCALBASE}/lib/ diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile index 2181600694b6..5fa0e9aa7f2d 100644 --- a/sysutils/monit/Makefile +++ b/sysutils/monit/Makefile @@ -20,7 +20,6 @@ USE_GMAKE= yes USE_BISON= yes USE_RC_SUBR= monit.sh -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" \ CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \ diff --git a/sysutils/ncdu/Makefile b/sysutils/ncdu/Makefile index 7037bc6de15c..c087a7fba6b2 100644 --- a/sysutils/ncdu/Makefile +++ b/sysutils/ncdu/Makefile @@ -14,7 +14,6 @@ MAINTAINER= infofarmer@FreeBSD.org COMMENT= Ncurses du(1) GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man PLIST_FILES= bin/${PORTNAME} MAN1= ${PORTNAME}.1 diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 44221c04776f..5b844e639101 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -26,7 +26,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --localstatedir=${STATEDIR} \ --datadir=${PREFIX}/etc/nut \ - --mandir=${PREFIX}/man \ --with-drvpath=${PREFIX}/libexec/nut \ --with-statepath=${STATEDIR} \ --with-altpidpath=${STATEDIR} \ diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile index 44221c04776f..5b844e639101 100644 --- a/sysutils/nut22/Makefile +++ b/sysutils/nut22/Makefile @@ -26,7 +26,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --localstatedir=${STATEDIR} \ --datadir=${PREFIX}/etc/nut \ - --mandir=${PREFIX}/man \ --with-drvpath=${PREFIX}/libexec/nut \ --with-statepath=${STATEDIR} \ --with-altpidpath=${STATEDIR} \ diff --git a/sysutils/smartmontools-devel/Makefile b/sysutils/smartmontools-devel/Makefile index 130b29c884d0..ff734bcf9dfe 100644 --- a/sysutils/smartmontools-devel/Makefile +++ b/sysutils/smartmontools-devel/Makefile @@ -17,7 +17,7 @@ COMMENT= S.M.A.R.T. disk monitoring tools USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --mandir=${PREFIX}/man --enable-sample +CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --enable-sample CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} SUB_FILES= pkg-message diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 130b29c884d0..ff734bcf9dfe 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -17,7 +17,7 @@ COMMENT= S.M.A.R.T. disk monitoring tools USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --mandir=${PREFIX}/man --enable-sample +CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --enable-sample CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} SUB_FILES= pkg-message diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile index 934df4b430f6..80db879aa2a8 100644 --- a/sysutils/syslog-ng-devel/Makefile +++ b/sysutils/syslog-ng-devel/Makefile @@ -26,7 +26,7 @@ NO_LATEST_LINK= yes SUB_FILES= pkg-message SUB_LIST= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} -CONFIGURE_ARGS= --enable-dynamic-linking --mandir=${PREFIX}/man +CONFIGURE_ARGS= --enable-dynamic-linking .if defined(WITH_TCP_WRAPPERS) CONFIGURE_ARGS+=--enable-tcp-wrapper diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index ef4f794d4f12..3d36ef5a8460 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -13,7 +13,6 @@ MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/ MAINTAINER= lme@FreeBSD.org COMMENT= A powerful syslogd replacement -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man GNU_CONFIGURE= yes PKGMESSAGE= ${WRKDIR}/MESSAGE USE_GCC= 3.3+ diff --git a/sysutils/syslog-ng1/Makefile b/sysutils/syslog-ng1/Makefile index ef4f794d4f12..3d36ef5a8460 100644 --- a/sysutils/syslog-ng1/Makefile +++ b/sysutils/syslog-ng1/Makefile @@ -13,7 +13,6 @@ MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/ MAINTAINER= lme@FreeBSD.org COMMENT= A powerful syslogd replacement -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man GNU_CONFIGURE= yes PKGMESSAGE= ${WRKDIR}/MESSAGE USE_GCC= 3.3+ diff --git a/sysutils/syslog-ng2/Makefile b/sysutils/syslog-ng2/Makefile index 934df4b430f6..80db879aa2a8 100644 --- a/sysutils/syslog-ng2/Makefile +++ b/sysutils/syslog-ng2/Makefile @@ -26,7 +26,7 @@ NO_LATEST_LINK= yes SUB_FILES= pkg-message SUB_LIST= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} -CONFIGURE_ARGS= --enable-dynamic-linking --mandir=${PREFIX}/man +CONFIGURE_ARGS= --enable-dynamic-linking .if defined(WITH_TCP_WRAPPERS) CONFIGURE_ARGS+=--enable-tcp-wrapper diff --git a/sysutils/syslog-ng3-devel/Makefile b/sysutils/syslog-ng3-devel/Makefile index 934df4b430f6..80db879aa2a8 100644 --- a/sysutils/syslog-ng3-devel/Makefile +++ b/sysutils/syslog-ng3-devel/Makefile @@ -26,7 +26,7 @@ NO_LATEST_LINK= yes SUB_FILES= pkg-message SUB_LIST= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} -CONFIGURE_ARGS= --enable-dynamic-linking --mandir=${PREFIX}/man +CONFIGURE_ARGS= --enable-dynamic-linking .if defined(WITH_TCP_WRAPPERS) CONFIGURE_ARGS+=--enable-tcp-wrapper diff --git a/sysutils/syslog-ng3/Makefile b/sysutils/syslog-ng3/Makefile index 934df4b430f6..80db879aa2a8 100644 --- a/sysutils/syslog-ng3/Makefile +++ b/sysutils/syslog-ng3/Makefile @@ -26,7 +26,7 @@ NO_LATEST_LINK= yes SUB_FILES= pkg-message SUB_LIST= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} -CONFIGURE_ARGS= --enable-dynamic-linking --mandir=${PREFIX}/man +CONFIGURE_ARGS= --enable-dynamic-linking .if defined(WITH_TCP_WRAPPERS) CONFIGURE_ARGS+=--enable-tcp-wrapper diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile index 0ae78f6a21c2..95b5c35ad013 100644 --- a/sysutils/unieject/Makefile +++ b/sysutils/unieject/Makefile @@ -30,7 +30,7 @@ CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib -lcdio -lconfuse CONFIGURE_ENV= PKG_CONFIG="${TRUE}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} \ - --with-libpopt-prefix=${LOCALBASE} --mandir=${MANPREFIX}/man + --with-libpopt-prefix=${LOCALBASE} post-patch: ${REINPLACE_CMD} -e 's#if.*<<<$$DOXYFORMATS#if false#' ${WRKSRC}/configure diff --git a/sysutils/userinfo/Makefile b/sysutils/userinfo/Makefile index d77fcea4486e..8f265ab4d06e 100644 --- a/sysutils/userinfo/Makefile +++ b/sysutils/userinfo/Makefile @@ -17,7 +17,6 @@ COMMENT= Show information about local users USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${TARGETDIR}/man MAN1= ui.1 MLINKS= ui.1 userinfo.1 diff --git a/sysutils/xsi/Makefile b/sysutils/xsi/Makefile index 7b4cbc9c8b1d..c5948cf24296 100644 --- a/sysutils/xsi/Makefile +++ b/sysutils/xsi/Makefile @@ -18,8 +18,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 USE_GNOME= gnometarget GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ - --enable-user=_xsi +CONFIGURE_ARGS+= --enable-user=_xsi USE_RC_SUBR= xsi diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile index ddcc84371ce2..b992de8fc002 100644 --- a/textproc/aspell/Makefile +++ b/textproc/aspell/Makefile @@ -24,9 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-dict-dir=${DATADIR} \ --enable-docdir=${DOCSDIR} \ - --enable-static \ - --mandir=${MANPREFIX}/man \ - --infodir=${PREFIX}/${INFO_PATH} + --enable-static PTHREAD_CFLAGS= # Disable threading PTHREAD_LIBS= # libaspell may be used by unthreaded apps. CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile index 4d246c909d88..f31a3875ade9 100644 --- a/textproc/dict/Makefile +++ b/textproc/dict/Makefile @@ -19,7 +19,7 @@ COMMENT= Dictionary Server Protocol (RFC2229) client USE_BISON= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-local-zlib --with-cflags="${CFLAGS}" \ - --with-etcdir=${PREFIX}/etc --mandir="${PREFIX}/man" + --with-etcdir=${PREFIX}/etc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile index 68f59247ac24..95291f9faa2b 100644 --- a/textproc/dictfmt/Makefile +++ b/textproc/dictfmt/Makefile @@ -20,7 +20,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --with-cflags="${CFLAGS}" --mandir="${MANPREFIX}/man" +CONFIGURE_ARGS= --with-cflags="${CFLAGS}" ALL_TARGET= dictfmt INSTALL_TARGET= install.dictfmt USE_AUTOTOOLS= libtool:15 diff --git a/textproc/ffe/Makefile b/textproc/ffe/Makefile index e23bb84d1360..40aeb54f1dbb 100644 --- a/textproc/ffe/Makefile +++ b/textproc/ffe/Makefile @@ -14,7 +14,6 @@ MAINTAINER= infofarmer@FreeBSD.org COMMENT= Flat file extractor GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MAN1PREFIX}/man PLIST_FILES= bin/${PORTNAME} MAN1= ${PORTNAME}.1 PORTDOCS= ${PORTNAME}.html diff --git a/textproc/filepp/Makefile b/textproc/filepp/Makefile index 7615bc303337..af8947fd4ee3 100644 --- a/textproc/filepp/Makefile +++ b/textproc/filepp/Makefile @@ -16,8 +16,7 @@ COMMENT= A generic file preprocessor USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --mandir=${PREFIX}/man +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} NO_BUILD= yes MAN1= filepp.1 diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile index 21b9c73f84ec..e48edd9b40de 100644 --- a/textproc/intltool/Makefile +++ b/textproc/intltool/Makefile @@ -25,7 +25,7 @@ USE_ICONV= yes USE_PERL5= yes USE_GNOME= gnometarget GNU_CONFIGURE= yes -CONFIGURE_ARGS= --libdir="${PREFIX}/libdata" --mandir="${PREFIX}/man" +CONFIGURE_ARGS= --libdir="${PREFIX}/libdata" MAN8= intltool-extract.8 intltool-merge.8 intltool-prepare.8 \ intltool-update.8 intltoolize.8 diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile index 3b75755e95a5..162de253c3b6 100644 --- a/textproc/kdiff3/Makefile +++ b/textproc/kdiff3/Makefile @@ -21,7 +21,6 @@ INSTALLS_ICONS= yes USE_LDCONFIG= ${PREFIX}/lib/kde3 CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" -CONFIGURE_ARGS= --mandir="${MANPREFIX}/man" MAN1= kdiff3.1 diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile index 14269f14d7cd..4b615ec1af45 100644 --- a/textproc/libextractor/Makefile +++ b/textproc/libextractor/Makefile @@ -25,7 +25,7 @@ USE_AUTOTOOLS= libltdl:15 USE_DOS2UNIX= yes GNU_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/libextractor -CONFIGURE_ARGS= --disable-ltdl-install --mandir=${PREFIX}/man --enable-exiv2 +CONFIGURE_ARGS= --disable-ltdl-install --enable-exiv2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile index eae26890d0cd..dfd54a2c7e37 100644 --- a/textproc/raptor/Makefile +++ b/textproc/raptor/Makefile @@ -24,8 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \ --with-curl-config=${LOCALBASE}/bin/curl-config \ --with-pkg-config=${LOCALBASE}/bin/pkg-config \ - --with-xml-parser=libxml --with-www=curl \ - --mandir=${PREFIX}/man + --with-xml-parser=libxml --with-www=curl USE_LDCONFIG= yes diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile index eae26890d0cd..dfd54a2c7e37 100644 --- a/textproc/raptor2/Makefile +++ b/textproc/raptor2/Makefile @@ -24,8 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \ --with-curl-config=${LOCALBASE}/bin/curl-config \ --with-pkg-config=${LOCALBASE}/bin/pkg-config \ - --with-xml-parser=libxml --with-www=curl \ - --mandir=${PREFIX}/man + --with-xml-parser=libxml --with-www=curl USE_LDCONFIG= yes diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile index 3d7a73a3d882..899655fc1e94 100644 --- a/textproc/rasqal/Makefile +++ b/textproc/rasqal/Makefile @@ -31,8 +31,7 @@ LDFLAGS= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-raptor=system \ --with-rasqal=internal \ - --with-threestore=no \ - --mandir=${PREFIX}/man + --with-threestore=no USE_LDCONFIG= yes diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile index 3d7a73a3d882..899655fc1e94 100644 --- a/textproc/redland/Makefile +++ b/textproc/redland/Makefile @@ -31,8 +31,7 @@ LDFLAGS= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-raptor=system \ --with-rasqal=internal \ - --with-threestore=no \ - --mandir=${PREFIX}/man + --with-threestore=no USE_LDCONFIG= yes diff --git a/textproc/rl/Makefile b/textproc/rl/Makefile index adef25dd1c96..150ecc9ae96c 100644 --- a/textproc/rl/Makefile +++ b/textproc/rl/Makefile @@ -14,7 +14,6 @@ MAINTAINER= pav@FreeBSD.org COMMENT= Randomizes lines from a specified input file GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man MAN1= rl.1 PLIST_FILES= bin/rl diff --git a/textproc/rotix/Makefile b/textproc/rotix/Makefile index d35a44f19a57..71d079f20c7f 100644 --- a/textproc/rotix/Makefile +++ b/textproc/rotix/Makefile @@ -18,7 +18,7 @@ COMMENT= A program to generate rotational obfuscations USE_GETTEXT= yes USE_GMAKE= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man --i18n=1 +CONFIGURE_ARGS= --prefix=${PREFIX} --i18n=1 CONFIGURE_ENV= EXPR_COMPAT=1 MAN1= rotix.1 diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 12c2855b00f6..36cf5050c23c 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -25,7 +25,6 @@ USE_AUTOTOOLS= libtool:15 USE_GETTEXT= yes USE_ICONV= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --mandir=${PREFIX}/man .if !defined(WITHOUT_X11) LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft diff --git a/www/aria2/Makefile b/www/aria2/Makefile index da0db092de9f..1114657a0ef6 100644 --- a/www/aria2/Makefile +++ b/www/aria2/Makefile @@ -17,7 +17,7 @@ COMMENT= Yet another download tool #DONTSTRIP= yes #CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" #MAKE_ENV= DONTSTRIP= -CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --mandir=${MANPREFIX}/man --with-openssl \ +CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --with-openssl \ --with-libxml2 --without-gnutls --without-libares --without-libcares USE_GCC= 3.4+ diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index 31c679e75595..7d180a9fb107 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -37,8 +37,7 @@ CONFIGURE_ARGS= --with-freedesktop_org-menu=${PREFIX}/share/gnome/applications \ --with-freedesktop_org-mime=${PREFIX}/share/mime \ --without-gnome2_4-mime \ --without-gnome2_4-appreg \ - --with-icon-path=${PREFIX}/share/gnome/pixmaps \ - --mandir=${MANPREFIX}/man + --with-icon-path=${PREFIX}/share/gnome/pixmaps # Turns debugging output on .if defined(WITH_DEBUG) diff --git a/www/castget/Makefile b/www/castget/Makefile index f4219b6a4000..fb44e189918b 100644 --- a/www/castget/Makefile +++ b/www/castget/Makefile @@ -21,7 +21,7 @@ USE_GNOME= glib20 libxml2 CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man --disable-static +CONFIGURE_ARGS= --disable-static GNU_CONFIGURE= yes PLIST_FILES= bin/castget include/libcastget.h lib/libcastget.la lib/libcastget.so lib/libcastget.so.0 diff --git a/www/cherokee-devel/Makefile b/www/cherokee-devel/Makefile index 7bacce02ceca..79dad87ba9b5 100644 --- a/www/cherokee-devel/Makefile +++ b/www/cherokee-devel/Makefile @@ -30,8 +30,7 @@ GNU_CONFIGURE= yes CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --with-wwwroot=${PREFIX}/www/cherokee \ +CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www/cherokee \ --enable-readdir_r \ --disable-static DEFCONFS= cherokee.conf mime.compression.types mime.types diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile index 6a61636bab04..430f04e0cdf2 100644 --- a/www/cherokee/Makefile +++ b/www/cherokee/Makefile @@ -27,8 +27,7 @@ GNU_CONFIGURE= yes CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --with-wwwroot=${PREFIX}/www/cherokee \ +CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www/cherokee \ --enable-readdir_r \ --disable-static DEFCONFS= advanced.conf cherokee.conf icons.conf mime.compression.types mime.types diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile index b357bc7d59b7..ee510132907a 100644 --- a/www/dansguardian-devel/Makefile +++ b/www/dansguardian-devel/Makefile @@ -27,7 +27,6 @@ LATEST_LINK= dansguardian-devel GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ - --mandir=/usr/local/man \ --with-logdir=/var/log \ --with-piddir=/var/run diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile index 198890c42af3..f52381dbf2d0 100644 --- a/www/dansguardian/Makefile +++ b/www/dansguardian/Makefile @@ -27,7 +27,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --bindir=/sbin/ \ --sysconfdir=/etc/dansguardian/ \ --sysvdir=/etc/rc.d/ \ - --mandir=/man/ \ --logdir=/var/log/ \ --cgidir=/www/cgi-bin/ \ --piddir=/var/run/ \ @@ -55,6 +54,10 @@ USE_APACHE= 1.3+ IGNORE="Commercial source download is restricted. Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make" .endif +post-configure: + @${REINPLACE_CMD} -e 's,^MANUALFILES = .*,MANUALFILES = ${MANPREFIX}/man/,' \ + ${WRKSRC}/Makefile + pre-install: # Configure pkg-plist based on whether phraselists are to be installed or not .if defined(WITH_DG_PHRASELISTS) diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 4bf3edde4e0f..7ec7bb1671b6 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -32,7 +32,7 @@ WANT_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_OMF= yes -CONFIGURE_ARGS= --with-mozilla=${GECKO} --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --with-mozilla=${GECKO} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile index 00f1ba14fd81..a23a4e33de39 100644 --- a/www/hiawatha/Makefile +++ b/www/hiawatha/Makefile @@ -20,7 +20,7 @@ USE_RC_SUBR= hiawatha SUB_FILES= pkg-message GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=/var --mandir=${MANPREFIX}/man webrootdir=${PREFIX}/www/hiawatha +CONFIGURE_ARGS= --localstatedir=/var webrootdir=${PREFIX}/www/hiawatha OPTIONS= SSL "Support for Secure Sockets Layer (SSL)?" On OPTIONS+= CACHE "Internal file caching support?" On diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index 079f0e5b4e80..b96ca2588c2a 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -21,7 +21,7 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes USE_GNOME= lthack USE_RC_SUBR= lighttpd.sh -CONFIGURE_ARGS= --libdir=${PREFIX}/lib/lighttpd --mandir=${PREFIX}/man +CONFIGURE_ARGS= --libdir=${PREFIX}/lib/lighttpd CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/www/mod_dav/Makefile b/www/mod_dav/Makefile index 463e09b1dad2..6f50613b7ea2 100644 --- a/www/mod_dav/Makefile +++ b/www/mod_dav/Makefile @@ -29,7 +29,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --bindir=${PREFIX}/bin \ --sbindir=${PREFIX}/sbin \ --libexecdir=${PREFIX}/libexec/apache \ - --mandir=${PREFIX}/man \ --sysconfdir=${PREFIX}/etc/apache \ --datadir=${PREFIX}/share/apache \ --includedir=${PREFIX}/include/apache \ diff --git a/www/mod_encoding/Makefile b/www/mod_encoding/Makefile index 7b53fcb1e686..9efacc3af43c 100644 --- a/www/mod_encoding/Makefile +++ b/www/mod_encoding/Makefile @@ -27,7 +27,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --bindir=${PREFIX}/bin \ --sbindir=${PREFIX}/sbin \ --libexecdir=${PREFIX}/libexec/apache \ - --mandir=${PREFIX}/man \ --sysconfdir=${PREFIX}/etc/apache \ --datadir=${PREFIX}/share/apache \ --includedir=${PREFIX}/include/apache \ diff --git a/www/netrik/Makefile b/www/netrik/Makefile index 56496278d029..1069c803f7e3 100644 --- a/www/netrik/Makefile +++ b/www/netrik/Makefile @@ -22,7 +22,6 @@ USE_GMAKE= yes USE_GETOPT_LONG=yes GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${PREFIX}/man PLIST_FILES= bin/netrik diff --git a/www/pound/Makefile b/www/pound/Makefile index 4a2db50c1b0d..9606bc8c760a 100644 --- a/www/pound/Makefile +++ b/www/pound/Makefile @@ -25,7 +25,6 @@ SUB_LIST= NAME=${PORTNAME} CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" MAKE_ARGS+= F_CONF=${PREFIX}/etc/pound.cfg -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man MAN8= pound.8 poundctl.8 diff --git a/www/sarg/Makefile b/www/sarg/Makefile index 2f0ec6ea53b9..55f1b96323ae 100644 --- a/www/sarg/Makefile +++ b/www/sarg/Makefile @@ -24,8 +24,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CC=gcc CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-bindir="${PREFIX}/bin" \ --enable-sysconfdir="${PREFIX}/etc/${PORTNAME}" \ - --enable-htmldir="${PREFIX}/www/${PORTNAME}" \ - --enable-mandir="${MAN1PREFIX}/man/man1" + --enable-htmldir="${PREFIX}/www/${PORTNAME}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= sarg.1 diff --git a/www/varnish/Makefile b/www/varnish/Makefile index 6e9b39533d96..6fe3b1320c30 100644 --- a/www/varnish/Makefile +++ b/www/varnish/Makefile @@ -17,7 +17,6 @@ COMMENT= The Varnish high-performance HTTP accelerator GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${PREFIX}/man USE_LDCONFIG= yes MAN1= varnishd.1 varnishhist.1 varnishlog.1 varnishncsa.1 \ diff --git a/www/varnish2/Makefile b/www/varnish2/Makefile index 6e9b39533d96..6fe3b1320c30 100644 --- a/www/varnish2/Makefile +++ b/www/varnish2/Makefile @@ -17,7 +17,6 @@ COMMENT= The Varnish high-performance HTTP accelerator GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --mandir=${PREFIX}/man USE_LDCONFIG= yes MAN1= varnishd.1 varnishhist.1 varnishlog.1 varnishncsa.1 \ diff --git a/www/w3m/Makefile b/www/w3m/Makefile index 56c5d9c95102..ac9bb4930b4c 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -25,7 +25,7 @@ W3M_VERSION= 0.5.2 CONFLICTS?= ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-m17n-0.5.* w3m-img-0.5.* w3m-m17n-img-0.5.* GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gc=${LOCALBASE} --mandir=${PREFIX}/man +CONFIGURE_ARGS= --with-gc=${LOCALBASE} MAN1= w3m.1 w3mman.1 MANLANG= "" ja diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile index 5ee8e4b26cbc..0192996d9bda 100644 --- a/www/xshttpd-devel/Makefile +++ b/www/xshttpd-devel/Makefile @@ -43,7 +43,7 @@ PORTDOCS= README COPYING ChangeLog .include <bsd.port.pre.mk> # By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd WWWDIR?= ${PREFIX}/www/${PORTNAME} -CONFIGURE_ARGS+=--with-rootdir=${WWWDIR} --mandir=${MANPREFIX}/man +CONFIGURE_ARGS+=--with-rootdir=${WWWDIR} .if !defined(WITHOUT_SSL) .include <${PORTSDIR}/Mk/bsd.openssl.mk> diff --git a/www/xshttpd/Makefile b/www/xshttpd/Makefile index ee4767f8e2a2..fdb619ce13ed 100644 --- a/www/xshttpd/Makefile +++ b/www/xshttpd/Makefile @@ -39,7 +39,7 @@ PORTDOCS= README BUGS COPYING ChangeLog # By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd WWWDIR?= ${PREFIX}/www -CONFIGURE_ARGS+=--with-rootdir=${WWWDIR} --mandir=${MANPREFIX}/man +CONFIGURE_ARGS+=--with-rootdir=${WWWDIR} .include <bsd.port.pre.mk> diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile index cbcb754e390c..9e348743d36f 100644 --- a/x11-clocks/xdaliclock/Makefile +++ b/x11-clocks/xdaliclock/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/X11 USE_XLIB= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} --mandir=${PREFIX}/man +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= xdaliclock.1 PLIST_FILES= bin/xdaliclock diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile index fa9c51b241cd..23b4045e543b 100644 --- a/x11-fm/worker/Makefile +++ b/x11-fm/worker/Makefile @@ -24,7 +24,7 @@ MANLANG= "" fr it MAN1= worker.1 CFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ARGS= --disable-libxpkmaster --mandir=${MANPREFIX}/man +CONFIGURE_ARGS= --disable-libxpkmaster .include <bsd.port.pre.mk> diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile index 7b01073f63b2..9543e21c5b34 100644 --- a/x11-fm/xfe/Makefile +++ b/x11-fm/xfe/Makefile @@ -22,8 +22,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \ - --x-includes=${X11BASE}/include \ +CONFIGURE_ARGS+=--x-includes=${X11BASE}/include \ --x-libraries=${X11BASE}/lib \ --with-x USE_GETTEXT= yes diff --git a/x11-fonts/fntsample/Makefile b/x11-fonts/fntsample/Makefile index 1836008611ea..ffdee723808b 100644 --- a/x11-fonts/fntsample/Makefile +++ b/x11-fonts/fntsample/Makefile @@ -22,7 +22,6 @@ RUN_DEPENDS= pdfoutline:${PORTSDIR}/textproc/pdfoutline USE_GNOME= glib20 pkgconfig pango USE_PERL5_RUN= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man PLIST_FILES= bin/${PORTNAME} MAN1= ${PORTNAME}.1 diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index ecdfd5e5b37f..1757094fcb9e 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -32,7 +32,6 @@ CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \ --with-default-fonts=${X11BASE}/lib/X11/fonts \ --with-cache-dir=/var/db/fontconfig \ --without-add-fonts \ - --mandir=${PREFIX}/man \ --disable-docs MAKE_ENV= LC_ALL=C PKGINSTALL= ${WRKDIR}/pkg-install diff --git a/x11-toolkits/tktreectrl/Makefile b/x11-toolkits/tktreectrl/Makefile index 8dbca91e3684..ad7238d97361 100644 --- a/x11-toolkits/tktreectrl/Makefile +++ b/x11-toolkits/tktreectrl/Makefile @@ -19,7 +19,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ --with-tk=${TK_LIBDIR} \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ - --mandir=${MANPREFIX}/man \ --exec-prefix=${PREFIX} --enable-shared CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}" TCL_INCLUDES= -I${TCL_INCLUDEDIR} -I${TCL_INCLUDEDIR}/generic diff --git a/x11-wm/beryl-core/Makefile b/x11-wm/beryl-core/Makefile index 89729140662f..2826f03a2bbf 100644 --- a/x11-wm/beryl-core/Makefile +++ b/x11-wm/beryl-core/Makefile @@ -30,7 +30,7 @@ USE_GETTEXT= yes USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --mandir="${PREFIX}/man/" --disable-berylmesa +CONFIGURE_ARGS+= --disable-berylmesa CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" diff --git a/x11-wm/beryl-manager/Makefile b/x11-wm/beryl-manager/Makefile index 6c7c6188ae30..d69a6b98967b 100644 --- a/x11-wm/beryl-manager/Makefile +++ b/x11-wm/beryl-manager/Makefile @@ -25,7 +25,6 @@ USE_GNOME= glib20 gtk20 INSTALLS_ICONS= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --mandir="${PREFIX}/man" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" diff --git a/x11-wm/beryl-settings/Makefile b/x11-wm/beryl-settings/Makefile index 621631c4800a..80b29ebf1cc8 100644 --- a/x11-wm/beryl-settings/Makefile +++ b/x11-wm/beryl-settings/Makefile @@ -31,7 +31,6 @@ USE_PYTHON= 2.4+ INSTALLS_ICONS= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --mandir="${PREFIX}/man" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile index f768de275e8d..19fa599394ae 100644 --- a/x11-wm/devilspie/Makefile +++ b/x11-wm/devilspie/Makefile @@ -19,7 +19,6 @@ USE_GNOME= libwnck GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir="${PREFIX}/man" MAN1= devilspie.1 PORTDOCS= AUTHORS NEWS README TODO diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile index 0aa06b018402..d70da1c322c4 100644 --- a/x11-wm/emerald/Makefile +++ b/x11-wm/emerald/Makefile @@ -33,7 +33,6 @@ MAN1= emerald.1 \ emerald-theme-manager.1 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --mandir="${PREFIX}/man" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index 896a4fceea07..90eda67410da 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -24,7 +24,6 @@ USE_GMAKE= yes USE_GNOME= gnometarget WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man DOCS= AUTHORS COPYING ChangeLog NEWS README TODO MAN1= fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox.1 fluxstyle.1 \ diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile index f4411d92abad..550369a9045f 100644 --- a/x11-wm/fvwm2-devel/Makefile +++ b/x11-wm/fvwm2-devel/Makefile @@ -25,8 +25,7 @@ CONFLICTS?= fvwm-1.* fvwm-2.4.* NO_LATEST_LINK= yes GNU_CONFIGURE= yes CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include -CONFIGURE_ARGS= --mandir=${PREFIX}/man \ - --with-png-library=${LOCALBASE}/lib +CONFIGURE_ARGS= --with-png-library=${LOCALBASE}/lib USE_GMAKE= yes USE_XPM= yes USE_BZIP2= yes diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index f9a72c9faa6a..ed0949133cc2 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -41,7 +41,6 @@ WANT_GNOME= yes .include <bsd.port.pre.mk> GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man .if defined(WITH_STROKE) CONFIGURE_ARGS+= --with-stroke --with-stroke-library=${LOCALBASE}/lib \ diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile index f9a72c9faa6a..ed0949133cc2 100644 --- a/x11-wm/fvwm24/Makefile +++ b/x11-wm/fvwm24/Makefile @@ -41,7 +41,6 @@ WANT_GNOME= yes .include <bsd.port.pre.mk> GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man .if defined(WITH_STROKE) CONFIGURE_ARGS+= --with-stroke --with-stroke-library=${LOCALBASE}/lib \ diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile index 0616af300155..c6fbb78d2519 100644 --- a/x11-wm/fvwm95-i18n/Makefile +++ b/x11-wm/fvwm95-i18n/Makefile @@ -31,7 +31,6 @@ USE_XPM= yes USE_XORG= xbitmaps GNU_CONFIGURE= yes CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ - --mandir=${MANPREFIX}/man \ --includedir=${LOCALBASE}/include --libdir=${LOCALBASE}/lib CONFIGURE_ENV= INSTALL_MAN="${INSTALL_MAN}" MAN1= fvwm95.1 xpmroot.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \ diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile index ee707116a02b..c661b44f1334 100644 --- a/x11-wm/openbox/Makefile +++ b/x11-wm/openbox/Makefile @@ -24,7 +24,6 @@ USE_XLIB= yes USE_LDCONFIG= yes CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+= --mandir="${PREFIX}/man/" MAN1= openbox.1 openbox-session.1 \ openbox-gnome-session.1 openbox-kde-session.1 diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index b89c1ff97ad7..20d088b5401f 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -32,8 +32,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \ gnomeprefix GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man \ - --with-console-kit=no +CONFIGURE_ARGS= --with-console-kit=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile index ef788af1e779..c184a4af3224 100644 --- a/x11/gsynaptics/Makefile +++ b/x11/gsynaptics/Makefile @@ -22,8 +22,6 @@ USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man - CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib diff --git a/x11/stalonetray/Makefile b/x11/stalonetray/Makefile index 5b3fc974ae77..9c21e24cfebb 100644 --- a/x11/stalonetray/Makefile +++ b/x11/stalonetray/Makefile @@ -17,8 +17,7 @@ USE_BZIP2= yes USE_XPM= yes USE_GNOME= gnometarget GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --disable-native-kde \ +CONFIGURE_ARGS= --disable-native-kde \ --disable-debug MAN1= stalonetray.1 diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile index 5f7597d5bc2e..14e648607e63 100644 --- a/x11/xbindkeys/Makefile +++ b/x11/xbindkeys/Makefile @@ -23,7 +23,6 @@ USE_GNOME= gnometarget GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAN1= xbindkeys.1 PLIST_FILES= bin/xbindkeys %%EXAMPLESDIR%%/xbindkeysrc diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile index e26130a48ddb..a02fdca6a91f 100644 --- a/x11/xnee/Makefile +++ b/x11/xnee/Makefile @@ -22,7 +22,7 @@ USE_XLIB= yes USE_GNOME= gnomehack gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man --enable-cli --disable-doc +CONFIGURE_ARGS= --enable-cli --disable-doc MAN1= cnee.1 INFO= cnee xnee diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index ea4ee9766cc9..0182dc861001 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -31,7 +31,6 @@ CONFIGURE_ARGS= --with-gl --with-gle --with-xpm --with-xml \ --with-hackdir=${PREFIX}/bin/xscreensaver-hacks \ --with-configdir=${PREFIX}/share/xscreensaver/config \ --with-jpeg=${LOCALBASE} --without-motif \ - --mandir=${PREFIX}/man \ --without-kerberos CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index bbaaea940c2a..368b2eab367a 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --with-xml \ --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \ --with-configdir=${PREFIX}/share/xscreensaver/config/ \ --with-jpeg=${LOCALBASE} --without-gnome --without-kerberos \ - --without-motif --mandir=${PREFIX}/man + --without-motif OPTIONS= ALL_FORTUNES "Run fortune with -sa argument" off \ SETUID_HACKS "Install sonar hack suid so it can ping" off diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 68a07cda9583..c8727ca30603 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -26,7 +26,6 @@ USE_BZIP2= yes USE_GETTEXT= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" |