diff options
| author | mat <mat@FreeBSD.org> | 2015-04-03 19:26:48 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2015-04-03 19:26:48 +0800 |
| commit | 0691688a506fc2dffc574eeeb80dc0d876378fed (patch) | |
| tree | 204c01c7973e83331fc29d8b09e59b3e9f219bd6 /x11 | |
| parent | 33639ffbb666f12097ddeff5ef7da2226febf15b (diff) | |
| download | freebsd-ports-graphics-0691688a506fc2dffc574eeeb80dc0d876378fed.tar.gz freebsd-ports-graphics-0691688a506fc2dffc574eeeb80dc0d876378fed.tar.zst freebsd-ports-graphics-0691688a506fc2dffc574eeeb80dc0d876378fed.zip | |
Remove OSVERSION checks that do not make sense any more.
For example (${OSVERSION} >= 900000 && ${OSVERSION} < 900021) is always true,
as is (${OSVERSION} > 900002 || ${OSVERSION} < 900000 && ${OSVERSION} > 800107).
Regarding patches, when an EXTRA_PATCHES is no longer needed, I remove it, when
it is always needed, I renamed it, in one case, I merged two patches.
Differential Revision: https://reviews.freebsd.org/D2209
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gmrun/Makefile | 9 | ||||
| -rw-r--r-- | x11/yelp/Makefile | 8 |
2 files changed, 2 insertions, 15 deletions
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile index c523bcb3b24..da160e8ec9f 100644 --- a/x11/gmrun/Makefile +++ b/x11/gmrun/Makefile @@ -24,19 +24,12 @@ CONFIGURE_ARGS= --disable-stlport PORTDOCS= README PLIST_FILES= bin/gmrun %%DATADIR%%/gmrunrc -.include <bsd.port.pre.mk> - post-patch: -.if ( ${OSVERSION} >= 800501 && ${OSVERSION} < 900000 ) || ( ${OSVERSION} >= 900006 ) @${REINPLACE_CMD} -e '/my_alphasort/s#const void\*#const struct dirent**#g' \ ${WRKSRC}/src/gtkcompletionline.cc -.else - @${REINPLACE_CMD} -e '/select_executables_only(const /s#const ##' \ - ${WRKSRC}/src/gtkcompletionline.cc -.endif post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 2f2d44f303d..a1ae4bc2ddc 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -31,13 +31,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector GLIB_SCHEMAS= org.gnome.yelp.gschema.xml INSTALL_TARGET= install-strip -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 900012 || (${OSVERSION} >= 800505 && ${OSVERSION} < 900000) CONFIGURE_ENV+= YELP_LZMA_CFLAGS="-I/usr/include" \ YELP_LZMA_LIBS="-L/usr/lib -llzma" -.else -LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> |