diff options
author | wxs <wxs@FreeBSD.org> | 2009-01-06 03:42:29 +0800 |
---|---|---|
committer | wxs <wxs@FreeBSD.org> | 2009-01-06 03:42:29 +0800 |
commit | 5ae596207dc0bd85ca28a43d715d82bc6b358b81 (patch) | |
tree | 429d1cbf81dc725269224bf70d9d438fa18e5dd3 /x11 | |
parent | aa020b736f5c57adddbd7c17d2197f70d6420a72 (diff) | |
download | freebsd-ports-gnome-5ae596207dc0bd85ca28a43d715d82bc6b358b81.tar.gz freebsd-ports-gnome-5ae596207dc0bd85ca28a43d715d82bc6b358b81.tar.zst freebsd-ports-gnome-5ae596207dc0bd85ca28a43d715d82bc6b358b81.zip |
- Remove conditional checks for FreeBSD 5.x and older
Approved by: pav
Diffstat (limited to 'x11')
-rw-r--r-- | x11/decurs/Makefile | 2 | ||||
-rw-r--r-- | x11/gdm/Makefile | 6 | ||||
-rw-r--r-- | x11/gnome-panel/Makefile | 6 | ||||
-rw-r--r-- | x11/kdebase3/Makefile | 2 | ||||
-rw-r--r-- | x11/libcapplet/Makefile | 2 | ||||
-rw-r--r-- | x11/mlterm/Makefile | 4 | ||||
-rw-r--r-- | x11/nvidia-driver/Makefile | 5 | ||||
-rw-r--r-- | x11/rxvt-unicode/Makefile | 4 | ||||
-rw-r--r-- | x11/wdm/Makefile | 7 | ||||
-rw-r--r-- | x11/xidle/Makefile | 5 |
10 files changed, 2 insertions, 41 deletions
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile index d3167f326027..9d0699c2cd10 100644 --- a/x11/decurs/Makefile +++ b/x11/decurs/Makefile @@ -29,13 +29,11 @@ BROKEN= Does not compile on !i386 post-patch: @${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \ ${FILESDIR}/decurs.exec > ${WRKSRC}/decurs.exec -.if ${OSVERSION} > 500035 # Hack for contemporary GCC @${REINPLACE_CMD} -e 's/CppString \&str/const &/' \ ${WRKSRC}/src/cppstring.cc ${WRKSRC}/src/cppstring.hh @${REINPLACE_CMD} -E 's/^\/\/ friend//; s/([^:])ostream/\1std::ostream/g' \ ${WRKSRC}/src/cppstring.hh -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/decurs ${PREFIX}/bin/decurs.bin diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 637d3629c05a..2daced2d3639 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -71,12 +71,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-daemon_slave.c .endif post-patch: -.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ - ( ${OSVERSION} < 503101 ) -.for po in zh_CN.po - @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} -.endfor -.endif @${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \ ${WRKSRC}/config/Makefile.in @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index cde5853ff9fb..a534f3c5c3c8 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -67,12 +67,6 @@ post-patch: @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -e \ 's|"applications.menu"|"gnome-applications.menu"|' -.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ - ( ${OSVERSION} < 503101 ) -.for po in da.po it.po zh_CN.po zh_TW.po - @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} -.endfor -.endif post-install: ${MKDIR} ${PREFIX}/share/gnome-panel diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 1ead83c1d92a..eb8b7f5785f8 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -67,7 +67,7 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig .endif -.if !defined(WITHOUT_HAL) && ${OSVERSION} > 500035 +.if !defined(WITHOUT_HAL) EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \ ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile index b76f39b6936e..eff45a137248 100644 --- a/x11/libcapplet/Makefile +++ b/x11/libcapplet/Makefile @@ -23,10 +23,8 @@ MAKE_ENV= LDFLAGS="${LDFLAGS}" .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500041 post-build: @${REINPLACE_CMD} -e 's/-lgnugetopt //' ${WRKSRC}/cappletConf.sh -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/libcapplet.so.5 ${PREFIX}/lib diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index cb9605d4ceb8..ed2c2d552ddb 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -64,10 +64,6 @@ PLIST_SUB+= M17NLIB="@comment " .endif .if defined(WITH_IIIMF) -.if ${OSVERSION} < 500043 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-inputmethod:iiimf:im_iiimf.c -.endif - CONFIGURE_ARGS+= --enable-iiimf LIB_DEPENDS+= iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib PLIST_SUB+= IIIMF="" diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index f5db68da77c8..784e73c427b1 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -72,12 +72,7 @@ PLIST_SUB+= LINUX="@comment " MAKE_ENV+= WITHOUT_LINUX=yes .endif -.if ${OSVERSION} < 503000 -IGNORE= supports FreeBSD-STABLE (5.3 or later), or FreeBSD-CURRENT -.endif -.if ${OSVERSION} >= 600033 LIB_DEPENDS+= m.3:${PORTSDIR}/misc/compat5x -.endif post-patch: .SILENT # We should support -CURRENT: kill the check diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index 6ac38469609c..2b49c920e7b4 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -139,10 +139,6 @@ CONFIGURE_ENV+= LIBS="-lutil" .include <bsd.port.pre.mk> -.if ${OSVERSION} < 502110 -RUN_DEPENDS+= ${LOCALBASE}/share/locale/fr_FR.UTF-8/LC_TIME:${PORTSDIR}/misc/utf8locale -.endif - # compile in support for additional codeset groups .if defined(WITH_ENCODING) AVAIL_ENC= jp jp_ext kr zh zh_ext all diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 631ed3005e4a..37698c05d5cc 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -55,7 +55,7 @@ WDMDIR= ${PREFIX}/lib/X11/wdm .include <bsd.port.pre.mk> -.if ( ${OSVERSION} >= 500028 ) && !defined(WITHOUT_PAM) +.if !defined(WITHOUT_PAM) WITH_PAM= yes CONFIGURE_ARGS+= --with-pamdir=${LOCALBASE}/etc/pam.d/ PLIST_SUB+= PAM="" @@ -114,12 +114,7 @@ post-install: @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WDMDIR}/pixmaps .endfor .if defined(WITH_PAM) -.if ( ${OSVERSION} >= 500028 ) ${INSTALL_DATA} ${FILESDIR}/wdm.pam ${LOCALBASE}/etc/pam.d/wdm -.else - @${ECHO_MSG} "To finish installing this port, append the contents of" - @${ECHO_MSG} "${FILESDIR}/wdm.pam to your /etc/pam.conf file" -.endif .endif .include <bsd.port.post.mk> diff --git a/x11/xidle/Makefile b/x11/xidle/Makefile index 2229b5483fd7..2dd56bcb36ca 100644 --- a/x11/xidle/Makefile +++ b/x11/xidle/Makefile @@ -26,11 +26,6 @@ MAN1= xidle.1 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 502104 -post-extract: - @${REINPLACE_CMD} -e 's|getopt_long_only|getopt_long|' ${WRKSRC}/xidle.c -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xidle ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/xidle.1 ${PREFIX}/man/man1 |