Date: Fri, 15 Nov 2013 14:59:00 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333873 - in head/sysutils: ldapenter lfm lineak-defaultplugin lineak-defaultplugin/files lineak-xosdplugin lineakd lineakd/files linrename logmon logmon/files lxsplit Message-ID: <201311151459.rAFEx0CW051505@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Fri Nov 15 14:58:59 2013 New Revision: 333873 URL: http://svnweb.freebsd.org/changeset/ports/333873 Log: Support STAGEDIR. Added: head/sysutils/lineak-defaultplugin/files/patch-Makefile.in (contents, props changed) head/sysutils/lineak-defaultplugin/files/patch-defaultplugin.cpp (contents, props changed) head/sysutils/logmon/files/ head/sysutils/logmon/files/patch-LineManip.cc (contents, props changed) head/sysutils/logmon/pkg-plist (contents, props changed) Modified: head/sysutils/ldapenter/Makefile head/sysutils/lfm/Makefile head/sysutils/lfm/pkg-plist head/sysutils/lineak-defaultplugin/Makefile head/sysutils/lineak-xosdplugin/Makefile head/sysutils/lineakd/Makefile head/sysutils/lineakd/files/patch-lineakd__Makefile.in head/sysutils/lineakd/pkg-plist head/sysutils/linrename/Makefile head/sysutils/logmon/Makefile head/sysutils/lxsplit/Makefile Modified: head/sysutils/ldapenter/Makefile ============================================================================== --- head/sysutils/ldapenter/Makefile Fri Nov 15 14:48:13 2013 (r333872) +++ head/sysutils/ldapenter/Makefile Fri Nov 15 14:58:59 2013 (r333873) @@ -16,11 +16,9 @@ USE_BZIP2= yes USE_OPENLDAP= 24 LDFLAGS+= -L${LOCALBASE}/lib -llber-2.4 -MANCOMPRESSED= yes -MAN1= ldapform.1 ldapedit.1 - PLIST_FILES= bin/ldapform \ - bin/ldapedit + bin/ldapedit \ + man/man1/ldapform.1.gz \ + man/man1/ldapedit.1.gz -NO_STAGE= yes .include <bsd.port.mk> Modified: head/sysutils/lfm/Makefile ============================================================================== --- head/sysutils/lfm/Makefile Fri Nov 15 14:48:13 2013 (r333872) +++ head/sysutils/lfm/Makefile Fri Nov 15 14:58:59 2013 (r333873) @@ -18,10 +18,8 @@ OPTIONS_DEFINE= DOCS USE_PYTHON= yes USE_PYDISTUTILS= yes -MAN1= lfm.1 pyview.1 -PORTDOCS= ChangeLog NEWS README README.pyview TODO +DOCS= ChangeLog NEWS README README.pyview TODO -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ '/DOC_FILES/d ; \ @@ -31,11 +29,9 @@ post-patch: post-install: .for f in lfm pyview - (cd ${WRKSRC} && ${INSTALL_MAN} ${f}.1 ${MAN1PREFIX}/man/man1) + (cd ${WRKSRC} && ${INSTALL_MAN} ${f}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1) .endfor -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/sysutils/lfm/pkg-plist ============================================================================== --- head/sysutils/lfm/pkg-plist Fri Nov 15 14:48:13 2013 (r333872) +++ head/sysutils/lfm/pkg-plist Fri Nov 15 14:58:59 2013 (r333873) @@ -1,5 +1,7 @@ bin/lfm bin/pyview +man/man1/lfm.1.gz +man/man1/pyview.1.gz %%PYTHON_SITELIBDIR%%/lfm/__init__.py %%PYTHON_SITELIBDIR%%/lfm/__init__.pyc %%PYTHON_SITELIBDIR%%/lfm/__init__.pyo @@ -30,4 +32,10 @@ bin/pyview %%PYTHON_SITELIBDIR%%/lfm/vfs.py %%PYTHON_SITELIBDIR%%/lfm/vfs.pyc %%PYTHON_SITELIBDIR%%/lfm/vfs.pyo +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.pyview +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%PYTHON_SITELIBDIR%%/lfm Modified: head/sysutils/lineak-defaultplugin/Makefile ============================================================================== --- head/sysutils/lineak-defaultplugin/Makefile Fri Nov 15 14:48:13 2013 (r333872) +++ head/sysutils/lineak-defaultplugin/Makefile Fri Nov 15 14:58:59 2013 (r333873) @@ -23,17 +23,15 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --program-prefix='' -MAN1= lineak_defaultplugin.1 -MAN_COMPRESSED= yes PLIST_FILES= lib/lineakd/plugins/defaultplugin.a \ lib/lineakd/plugins/defaultplugin.la \ lib/lineakd/plugins/defaultplugin.so \ lib/lineakd/plugins/mediadetectplugin.a \ lib/lineakd/plugins/mediadetectplugin.la \ lib/lineakd/plugins/mediadetectplugin.so \ + man/man1/lineak_defaultplugin.1.gz \ etc/media-detect.conf -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure Added: head/sysutils/lineak-defaultplugin/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/lineak-defaultplugin/files/patch-Makefile.in Fri Nov 15 14:58:59 2013 (r333873) @@ -0,0 +1,21 @@ +--- default_plugin/Makefile.in.orig 2006-05-24 23:27:15.000000000 +0800 ++++ default_plugin/Makefile.in 2013-11-15 21:46:25.000000000 +0800 +@@ -616,15 +616,15 @@ uninstall-man: uninstall-man1 + install-data-local: + #>- $(mkinstalldirs) ${DESTDIR}$(sysconfdir)/ + #>+ 1 +- $(mkinstalldirs) $(DESTDIR)${DESTDIR}$(sysconfdir)/ ++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/ + #>- $(INSTALL_DATA) $(top_srcdir)/media-detect.conf ${DESTDIR}$(sysconfdir)/media-detect.conf + #>+ 1 +- $(INSTALL_DATA) $(top_srcdir)/media-detect.conf $(DESTDIR)${DESTDIR}$(sysconfdir)/media-detect.conf ++ $(INSTALL_DATA) $(top_srcdir)/media-detect.conf $(DESTDIR)$(sysconfdir)/media-detect.conf + + uninstall-local: + #>- -rm -f ${DESTDIR}$(sysconfdir)/media-detect.conf + #>+ 1 +- -rm -f $(DESTDIR)${DESTDIR}$(sysconfdir)/media-detect.conf ++ -rm -f $(DESTDIR)$(sysconfdir)/media-detect.conf + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: Added: head/sysutils/lineak-defaultplugin/files/patch-defaultplugin.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/lineak-defaultplugin/files/patch-defaultplugin.cpp Fri Nov 15 14:58:59 2013 (r333873) @@ -0,0 +1,10 @@ +--- default_plugin/defaultplugin.cpp.orig 2013-11-15 21:38:08.000000000 +0800 ++++ default_plugin/defaultplugin.cpp 2013-11-15 21:38:26.000000000 +0800 +@@ -16,6 +16,7 @@ + ***************************************************************************/ + + #include <config.h> ++#include <unistd.h> + #include <lineak/lconfig.h> + #include <lineak/lkbd.h> + #include <lineak/lkey.h> Modified: head/sysutils/lineak-xosdplugin/Makefile ============================================================================== --- head/sysutils/lineak-xosdplugin/Makefile Fri Nov 15 14:48:13 2013 (r333872) +++ head/sysutils/lineak-xosdplugin/Makefile Fri Nov 15 14:58:59 2013 (r333873) @@ -13,8 +13,8 @@ COMMENT= Xosd-plugin for lineakd LICENSE= GPLv2 -LIB_DEPENDS= xosd:${PORTSDIR}/misc/xosd \ - lineak:${PORTSDIR}/sysutils/lineakd +LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc/xosd \ + liblineak.so:${PORTSDIR}/sysutils/lineakd USE_XORG= x11 xext xt USE_GMAKE= yes @@ -28,9 +28,9 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= lineak_xosdplugin.1 PLIST_FILES= lib/lineakd/plugins/xosdplugin.la \ - lib/lineakd/plugins/xosdplugin.so + lib/lineakd/plugins/xosdplugin.so \ + man/man1/lineak_xosdplugin.1.gz -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's|"-O2 $$CXXFLAGS"|"$$CXXFLAGS"| ; \ Modified: head/sysutils/lineakd/Makefile ============================================================================== --- head/sysutils/lineakd/Makefile Fri Nov 15 14:48:13 2013 (r333872) +++ head/sysutils/lineakd/Makefile Fri Nov 15 14:58:59 2013 (r333873) @@ -20,25 +20,19 @@ USE_LDCONFIG= yes CONFIGURE_ARGS+=--program-prefix='' -PORTDOCS= README TODO AUTHORS +DOCS= README TODO AUTHORS -MAN1= lineakd.1 -#MANCOMPRESSED= yes - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|-ldl||' \ ${WRKSRC}/lineak/Makefile.in ${WRKSRC}/lineakd/Makefile.in @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/lineakd.conf.example ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/lineakd.conf.example ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> Modified: head/sysutils/lineakd/files/patch-lineakd__Makefile.in ============================================================================== --- head/sysutils/lineakd/files/patch-lineakd__Makefile.in Fri Nov 15 14:48:13 2013 (r333872) +++ head/sysutils/lineakd/files/patch-lineakd__Makefile.in Fri Nov 15 14:58:59 2013 (r333873) @@ -1,6 +1,6 @@ ---- lineakd/Makefile.in.orig 2006-05-24 17:26:52.000000000 +0200 -+++ lineakd/Makefile.in 2013-02-18 16:29:24.000000000 +0100 -@@ -239,9 +239,9 @@ +--- lineakd/Makefile.in.orig 2006-05-24 23:26:52.000000000 +0800 ++++ lineakd/Makefile.in 2013-11-15 21:28:05.000000000 +0800 +@@ -239,9 +239,9 @@ target_vendor = @target_vendor@ unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ lineakd_SOURCES = lineakd_core_functions.cpp cmdprefs.cpp main.cpp @@ -12,7 +12,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/lineak -I. -I.. AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lineak -I$(top_srcdir)/lineakd -I. -I.. $(all_includes) #>- all: all-am -@@ -544,10 +544,10 @@ +@@ -544,25 +544,25 @@ uninstall-am: uninstall-binPROGRAMS unin #man_MANS = lineakd.1.gz @@ -25,17 +25,28 @@ +install-data-local: lineakd.1.gz #>- $(mkinstalldirs) ${DESTDIR}$(sysconfdir)/ #>+ 1 - $(mkinstalldirs) $(DESTDIR)${DESTDIR}$(sysconfdir)/ -@@ -562,7 +562,7 @@ - $(INSTALL_DATA) $(srcdir)/lineakkb.def $(DESTDIR)${DESTDIR}$(sysconfdir)/lineakkb.def +- $(mkinstalldirs) $(DESTDIR)${DESTDIR}$(sysconfdir)/ ++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/ + #>- $(mkinstalldirs) ${DESTDIR}$(mandir)/man1/ + #>+ 1 +- $(mkinstalldirs) $(DESTDIR)${DESTDIR}$(mandir)/man1/ ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1/ + #>- $(mkinstalldirs) ${DESTDIR}$(pkglibdir)/plugins/ + #>+ 1 +- $(mkinstalldirs) $(DESTDIR)${DESTDIR}$(pkglibdir)/plugins/ ++ $(mkinstalldirs) $(DESTDIR)$(pkglibdir)/plugins/ + #>- $(INSTALL_DATA) $(srcdir)/lineakkb.def ${DESTDIR}$(sysconfdir)/lineakkb.def + #>+ 1 +- $(INSTALL_DATA) $(srcdir)/lineakkb.def $(DESTDIR)${DESTDIR}$(sysconfdir)/lineakkb.def ++ $(INSTALL_DATA) $(srcdir)/lineakkb.def $(DESTDIR)$(sysconfdir)/lineakkb.def #>- $(INSTALL_DATA) $(srcdir)/lineakd.1.bz2 ${DESTDIR}$(mandir)/man1/lineakd.1.bz2 #>+ 1 - $(INSTALL_DATA) $(srcdir)/lineakd.1.bz2 $(DESTDIR)${DESTDIR}$(mandir)/man1/lineakd.1.bz2 -+ $(INSTALL_DATA) $(srcdir)/lineakd.1.gz $(DESTDIR)${DESTDIR}$(mandir)/man1/lineakd.1.gz ++ $(INSTALL_DATA) $(srcdir)/lineakd.1.gz $(DESTDIR)$(mandir)/man1/lineakd.1.gz if test "$(SETKEYCODES_SUID)" != "no" ; then \ chown root `which setkeycodes` ; \ chmod +s `which setkeycodes` ; \ -@@ -574,7 +574,7 @@ +@@ -574,7 +574,7 @@ uninstall-local: -rm -f $(DESTDIR)${DESTDIR}$(sysconfdir)/lineakkb.def #>- -rm -f ${DESTDIR}$(mandir)/man1/lineakd.1.bz2 #>+ 1 Modified: head/sysutils/lineakd/pkg-plist ============================================================================== --- head/sysutils/lineakd/pkg-plist Fri Nov 15 14:48:13 2013 (r333872) +++ head/sysutils/lineakd/pkg-plist Fri Nov 15 14:58:59 2013 (r333873) @@ -1,36 +1,40 @@ bin/lineakd etc/lineakkb.def +include/lineak/cdromctrl.h +include/lineak/commandexec.h include/lineak/configdirectives.h include/lineak/configloader.h include/lineak/definitions.h include/lineak/defloader.h +include/lineak/displayctrl.h +include/lineak/lbutton.h +include/lineak/lcommand.h include/lineak/lconfig.h include/lineak/lconfigdata.h include/lineak/ldef.h -include/lineak/lobject.h +include/lineak/lineak_core_functions.h +include/lineak/lineak_util_functions.h include/lineak/lkbd.h include/lineak/lkey.h -include/lineak/lbutton.h include/lineak/loader.h -include/lineak/msgpasser.h -include/lineak/saver.h -include/lineak/lcommand.h +include/lineak/lobject.h include/lineak/lockctrl.h -include/lineak/lineak_util_functions.h -include/lineak/lineak_core_functions.h -include/lineak/cdromctrl.h -include/lineak/xmgr.h -include/lineak/displayctrl.h +include/lineak/msgpasser.h include/lineak/plugin_definitions.h -include/lineak/commandexec.h include/lineak/pluginmanager.h -lib/liblineak.so.8 -lib/liblineak.so +include/lineak/saver.h +include/lineak/xmgr.h lib/liblineak.a lib/liblineak.la -@exec mkdir -p %D/lib/lineakd/plugins -%%EXAMPLESDIR%%/lineakd.conf.example -@dirrm %%EXAMPLESDIR%% -@dirrm include/lineak -@dirrm lib/lineakd/plugins -@dirrm lib/lineakd +lib/liblineak.so +lib/liblineak.so.8 +man/man1/lineakd.1.gz +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lineakd.conf.example +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrmtry lib/lineakd/plugins +@dirrmtry lib/lineakd +@dirrmtry include/lineak Modified: head/sysutils/linrename/Makefile ============================================================================== --- head/sysutils/linrename/Makefile Fri Nov 15 14:48:13 2013 (r333872) +++ head/sysutils/linrename/Makefile Fri Nov 15 14:58:59 2013 (r333873) @@ -24,10 +24,8 @@ CPPFLAGS+= -I../include \ -DHAVE_DIRFD -DHAVE_ERR_H -DHAVE_LANGINFO_H -DHAVE_LOCALE_H \ -DPACKAGE_STRING=\"util-linux\ ${PORTVERSION}\" -MAN1= ${PORTNAME}.1 -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz -NO_STAGE= yes post-patch: ${LN} -sf rename.1 ${BUILD_WRKSRC}/${PORTNAME}.1 @@ -37,7 +35,7 @@ do-build: do-install: (cd ${INSTALL_WRKSRC} \ - && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin \ - && ${INSTALL_MAN} ${PORTNAME}.1 ${MANPREFIX}/man/man1) + && ${INSTALL_PROGRAM} ${PORTNAME} ${STAGEDIR}${PREFIX}/bin \ + && ${INSTALL_MAN} ${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1) .include <bsd.port.mk> Modified: head/sysutils/logmon/Makefile ============================================================================== --- head/sysutils/logmon/Makefile Fri Nov 15 14:48:13 2013 (r333872) +++ head/sysutils/logmon/Makefile Fri Nov 15 14:58:59 2013 (r333873) @@ -17,16 +17,10 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -PORTEXAMPLES= logmon.conf.example -PLIST_FILES= bin/logmon - -NO_STAGE= yes .include <bsd.port.options.mk> post-install: -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/logmon.conf.example ${EXAMPLESDIR} -.endif + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/logmon.conf.example ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> Added: head/sysutils/logmon/files/patch-LineManip.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/logmon/files/patch-LineManip.cc Fri Nov 15 14:58:59 2013 (r333873) @@ -0,0 +1,10 @@ +--- LineManip.cc.orig 2013-11-15 21:52:28.000000000 +0800 ++++ LineManip.cc 2013-11-15 21:52:51.000000000 +0800 +@@ -2,6 +2,7 @@ + // $Id: LineManip.cc 72 2005-07-12 00:46:02Z amackenz $ + // + ++#include <stdlib.h> + #include <unistd.h> + #include <ncurses.h> + #include <ctype.h> Added: head/sysutils/logmon/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/logmon/pkg-plist Fri Nov 15 14:58:59 2013 (r333873) @@ -0,0 +1,3 @@ +bin/logmon +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logmon.conf.example +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% Modified: head/sysutils/lxsplit/Makefile ============================================================================== --- head/sysutils/lxsplit/Makefile Fri Nov 15 14:48:13 2013 (r333872) +++ head/sysutils/lxsplit/Makefile Fri Nov 15 14:58:59 2013 (r333873) @@ -12,19 +12,15 @@ COMMENT= Simple program to split or join LICENSE= GPLv2 -PLIST_FILES= bin/lxsplit -PORTDOCS= ChangeLog README +DOCS= ChangeLog README OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/lxsplit ${PREFIX}/bin/ -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/lxsplit ${STAGEDIR}${PREFIX}/bin/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311151459.rAFEx0CW051505>