svn commit: r334137 - in head/comms: bforce-kst bpl+ callsign cdr_read dfu-util gkermit gpredict grig gsmlib nokryptia nokryptia/files serialoverip seyon sredird tkscanfax xdx yaps yaps/files zssh ...
Vanilla I. Shu
vanilla at FreeBSD.org
Mon Nov 18 00:37:22 UTC 2013
Author: vanilla
Date: Mon Nov 18 00:37:15 2013
New Revision: 334137
URL: http://svnweb.freebsd.org/changeset/ports/334137
Log:
Support STAGEDIR.
Added:
head/comms/cdr_read/pkg-plist (contents, props changed)
head/comms/gkermit/pkg-plist (contents, props changed)
head/comms/nokryptia/files/
head/comms/nokryptia/files/patch-nokryptia.cc (contents, props changed)
head/comms/sredird/pkg-plist (contents, props changed)
head/comms/yaps/files/patch-Makefile (contents, props changed)
head/comms/yaps/pkg-plist (contents, props changed)
head/comms/zssh/files/patch-Makefile.in (contents, props changed)
Deleted:
head/comms/bpl+/pkg-plist
Modified:
head/comms/bforce-kst/Makefile
head/comms/bforce-kst/pkg-plist
head/comms/bpl+/Makefile
head/comms/callsign/Makefile
head/comms/cdr_read/Makefile
head/comms/dfu-util/Makefile
head/comms/gkermit/Makefile
head/comms/gpredict/Makefile
head/comms/gpredict/pkg-plist
head/comms/grig/Makefile
head/comms/grig/pkg-plist
head/comms/gsmlib/Makefile
head/comms/gsmlib/pkg-plist
head/comms/nokryptia/Makefile
head/comms/serialoverip/Makefile
head/comms/seyon/Makefile
head/comms/sredird/Makefile
head/comms/tkscanfax/Makefile
head/comms/tkscanfax/pkg-plist
head/comms/xdx/Makefile
head/comms/xdx/pkg-plist
head/comms/yaps/Makefile
head/comms/zssh/Makefile
Modified: head/comms/bforce-kst/Makefile
==============================================================================
--- head/comms/bforce-kst/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/bforce-kst/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -38,11 +38,10 @@ FIXME= include/bforce.h include/util.h
WRKSRC= ${WRKDIR}/${DISTNAME}/source
-PORTDOCS= CHANGES CHANGES.kst COPYING README README.kst
+DOCS= CHANGES CHANGES.kst COPYING README README.kst
OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
pre-configure:
@${MKDIR} ${WRKSRC}/bin
@@ -55,25 +54,23 @@ post-patch:
.include <bsd.port.options.mk>
do-install:
- @${MKDIR} ${PREFIX}/etc/fido/bforce
- ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.conf ${PREFIX}/etc/fido/bforce/bforce.conf.sample
- ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.passwd ${PREFIX}/etc/fido/bforce/bforce.passwd.sample
- ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.subst ${PREFIX}/etc/fido/bforce/bforce.subst.sample
- ${INSTALL_DATA} ${WRKSRC}/../examples/freq.aliases ${PREFIX}/etc/fido/bforce/freq.aliases.sample
- ${INSTALL_DATA} ${WRKSRC}/../examples/freq.dirs ${PREFIX}/etc/fido/bforce/freq.dirs.sample
+ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/fido/bforce
+ ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.conf ${STAGEDIR}${PREFIX}/etc/fido/bforce/bforce.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.passwd ${STAGEDIR}${PREFIX}/etc/fido/bforce/bforce.passwd.sample
+ ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.subst ${STAGEDIR}${PREFIX}/etc/fido/bforce/bforce.subst.sample
+ ${INSTALL_DATA} ${WRKSRC}/../examples/freq.aliases ${STAGEDIR}${PREFIX}/etc/fido/bforce/freq.aliases.sample
+ ${INSTALL_DATA} ${WRKSRC}/../examples/freq.dirs ${STAGEDIR}${PREFIX}/etc/fido/bforce/freq.dirs.sample
- ${MKDIR} ${DATADIR} ${DATADIR}/bfha ${DATADIR}/u-srif/conf ${DATADIR}/u-srif/lib
+ ${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${DATADIR}/bfha ${STAGEDIR}${DATADIR}/u-srif/conf ${STAGEDIR}${DATADIR}/u-srif/lib
.for i in ${CONTRIBS}
- ${INSTALL_DATA} ${WRKSRC}/../contrib/${i} ${DATADIR}/${i}
+ ${INSTALL_DATA} ${WRKSRC}/../contrib/${i} ${STAGEDIR}${DATADIR}/${i}
.endfor
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/../,} ${DOCSDIR}
-.endif
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/bforce ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/bfindex ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/bfstat ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/nlookup ${PREFIX}/bin
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/../,} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/bforce ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/bfindex ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/bfstat ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/nlookup ${STAGEDIR}${PREFIX}/bin
@${SED} -e 's|%%PREFIX%%|${PREFIX}|' -e 's|%%CONFIGDIR%%|etc/fido/bforce|' ${PKGMESSAGE}
.include <bsd.port.mk>
Modified: head/comms/bforce-kst/pkg-plist
==============================================================================
--- head/comms/bforce-kst/pkg-plist Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/bforce-kst/pkg-plist Mon Nov 18 00:37:15 2013 (r334137)
@@ -1,5 +1,5 @@
-bin/bforce
bin/bfindex
+bin/bforce
bin/bfstat
bin/nlookup
etc/fido/bforce/bforce.conf.sample
@@ -27,10 +27,16 @@ etc/fido/bforce/freq.dirs.sample
%%DATADIR%%/u-srif/u-srif-index.py
%%DATADIR%%/u-srif/u-srif-lookup.py
%%DATADIR%%/u-srif/u-srif.py
- at dirrm etc/fido/bforce
- at dirrm etc/fido
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.kst
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.kst
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/u-srif/lib
@dirrm %%DATADIR%%/u-srif/conf
@dirrm %%DATADIR%%/u-srif
@dirrm %%DATADIR%%/bfha
@dirrm %%DATADIR%%
+ at dirrm etc/fido/bforce
+ at dirrm etc/fido
Modified: head/comms/bpl+/Makefile
==============================================================================
--- head/comms/bpl+/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/bpl+/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -12,9 +12,10 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports at FreeBSD.org
COMMENT= B Plus file transfer protocol
-NO_STAGE= yes
+PLIST_FILES= bin/bp bin/bpl
+
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bpl ${PREFIX}/bin
- @${LN} -fs ${PREFIX}/bin/bpl ${PREFIX}/bin/bp
+ ${INSTALL_PROGRAM} ${WRKSRC}/bpl ${STAGEDIR}${PREFIX}/bin
+ (cd ${STAGEDIR}${PREFIX}/bin; ${LN} -sf bpl bp)
.include <bsd.port.mk>
Modified: head/comms/callsign/Makefile
==============================================================================
--- head/comms/callsign/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/callsign/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -15,8 +15,7 @@ WRKSRC= ${WRKDIR}
NO_BUILD= YES
PLIST_FILES= bin/callsign
-NO_STAGE= yes
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/callsign ${LOCALBASE}/bin/
+ ${INSTALL_SCRIPT} ${WRKSRC}/callsign ${STAGEDIR}${PREFIX}/bin/
.include <bsd.port.mk>
Modified: head/comms/cdr_read/Makefile
==============================================================================
--- head/comms/cdr_read/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/cdr_read/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -14,19 +14,13 @@ USE_DOS2UNIX= readme_eng.txt
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
NO_WRKSUBDIR= yes
-PLIST_FILES= sbin/cdr_read
-PORTDOCS= *
-
OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
.include <bsd.port.options.mk>
do-install:
- ${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${PREFIX}/sbin
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKDIR}/readme_eng.txt ${DOCSDIR}/readme.txt
-.endif
+ ${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKDIR}/readme_eng.txt ${STAGEDIR}${DOCSDIR}/readme.txt
.include <bsd.port.mk>
Added: head/comms/cdr_read/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/cdr_read/pkg-plist Mon Nov 18 00:37:15 2013 (r334137)
@@ -0,0 +1,3 @@
+sbin/cdr_read
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Modified: head/comms/dfu-util/Makefile
==============================================================================
--- head/comms/dfu-util/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/dfu-util/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -16,8 +16,6 @@ CONFIGURE_ENV= USE_LIBS="-lusb" \
ac_cv_lib_usbpath_usb_path2devnum=no
CONFIGURE_ARGS= --disable-silent-rules
-MAN1= dfu-util.1
-PLIST_FILES= bin/dfu-suffix bin/dfu-util
+PLIST_FILES= bin/dfu-suffix bin/dfu-util man/man1/${PORTNAME}.1.gz
-NO_STAGE= yes
.include <bsd.port.mk>
Modified: head/comms/gkermit/Makefile
==============================================================================
--- head/comms/gkermit/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/gkermit/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -11,20 +11,16 @@ MAINTAINER= ports at FreeBSD.org
COMMENT= File transfer utility using the kermit protocol
NO_WRKSUBDIR= yes
-MAN1= gkermit.1
-PORTDOCS= gkermit.txt
-PLIST_FILES= bin/gkermit
ALL_TARGET= posix
-NO_STAGE= yes
post-extract:
cd ${WRKSRC} && ${MV} makefile Makefile
do-install:
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/gkermit ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/gkermit.nr ${PREFIX}/man/man1/gkermit.1
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/gkermit.txt
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/gkermit ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/gkermit.nr ${STAGEDIR}${PREFIX}/man/man1/gkermit.1
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/gkermit.txt
.include <bsd.port.mk>
Added: head/comms/gkermit/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/gkermit/pkg-plist Mon Nov 18 00:37:15 2013 (r334137)
@@ -0,0 +1,4 @@
+bin/gkermit
+man/man1/gkermit.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/gkermit.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Modified: head/comms/gpredict/Makefile
==============================================================================
--- head/comms/gpredict/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/gpredict/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -11,17 +11,14 @@ COMMENT= Amateur Radio satellite trackin
LICENSE= GPLv2 # (or later)
-LIB_DEPENDS= hamlib:${PORTSDIR}/comms/hamlib \
- curl:${PORTSDIR}/ftp/curl \
- goocanvas:${PORTSDIR}/graphics/goocanvas
+LIB_DEPENDS= libhamlib.so:${PORTSDIR}/comms/hamlib \
+ libcurl.so:${PORTSDIR}/ftp/curl \
+ libgoocanvas.so:${PORTSDIR}/graphics/goocanvas
USES= gettext pathfix gmake pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-MAN1= gpredict.1
-
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e \
'/^Icon/s|=.*|=${PREFIX}/share/pixmaps/gpredict-icon.png|' \
Modified: head/comms/gpredict/pkg-plist
==============================================================================
--- head/comms/gpredict/pkg-plist Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/gpredict/pkg-plist Mon Nov 18 00:37:15 2013 (r334137)
@@ -1,4 +1,5 @@
bin/gpredict
+man/man1/gpredict.1.gz
share/applications/gpredict.desktop
%%DATADIR%%/AUTHORS
%%DATADIR%%/COPYING
Modified: head/comms/grig/Makefile
==============================================================================
--- head/comms/grig/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/grig/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -12,15 +12,12 @@ COMMENT= Amateur Radio control front-end
LICENSE= GPLv2
-LIB_DEPENDS= hamlib:${PORTSDIR}/comms/hamlib
+LIB_DEPENDS= libhamlib.so:${PORTSDIR}/comms/hamlib
USE_GNOME= gtk20
GNU_CONFIGURE= yes
USES= gettext gmake pkgconfig
-MAN1= grig.1
-
-NO_STAGE= yes
post-patch:
@${FIND} ${WRKSRC} -name Makefile.* | ${XARGS} ${REINPLACE_CMD} -e \
's|-D.*_DISABLE_DEPRECATED||g'
Modified: head/comms/grig/pkg-plist
==============================================================================
--- head/comms/grig/pkg-plist Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/grig/pkg-plist Mon Nov 18 00:37:15 2013 (r334137)
@@ -1,17 +1,18 @@
bin/grig
+lib/locale/fr/LC_MESSAGES/grig.mo
+man/man1/grig.1.gz
%%DATADIR%%/AUTHORS
%%DATADIR%%/COPYING
%%DATADIR%%/ChangeLog
%%DATADIR%%/NEWS
%%DATADIR%%/README
-lib/locale/fr/LC_MESSAGES/grig.mo
share/pixmaps/grig/digits_normal.png
share/pixmaps/grig/digits_small.png
share/pixmaps/grig/grig-logo.png
share/pixmaps/grig/ic910.png
share/pixmaps/grig/smeter.png
+ at dirrm share/pixmaps/grig
+ at dirrm %%DATADIR%%
@dirrmtry lib/locale/fr/LC_MESSAGES
@dirrmtry lib/locale/fr
@dirrmtry lib/locale
- at dirrm share/pixmaps/grig
- at dirrm %%DATADIR%%
Modified: head/comms/gsmlib/Makefile
==============================================================================
--- head/comms/gsmlib/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/gsmlib/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -18,15 +18,10 @@ USES= gmake
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-MAN1= gsmctl.1 gsmpb.1 gsmsendsms.1 gsmsmsstore.1
-MAN7= gsminfo.7
-MAN8= gsmsmsd.8
-
CPPFLAGS+= -I${LOCALBASE}/include -DBROKEN_STRFTIME -DHAVE_DECL_GETOPT \
${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
Modified: head/comms/gsmlib/pkg-plist
==============================================================================
--- head/comms/gsmlib/pkg-plist Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/gsmlib/pkg-plist Mon Nov 18 00:37:15 2013 (r334137)
@@ -31,5 +31,11 @@ lib/libgsmme.a
lib/libgsmme.la
lib/libgsmme.so
lib/libgsmme.so.1
+man/man1/gsmctl.1.gz
+man/man1/gsmpb.1.gz
+man/man1/gsmsendsms.1.gz
+man/man1/gsmsmsstore.1.gz
+man/man7/gsminfo.7.gz
+man/man8/gsmsmsd.8.gz
%%NLS%%share/locale/de/LC_MESSAGES/gsmlib.mo
@dirrm include/gsmlib
Modified: head/comms/nokryptia/Makefile
==============================================================================
--- head/comms/nokryptia/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/nokryptia/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -10,15 +10,13 @@ MASTER_SITES= http://tuxmobil.org/softwa
MAINTAINER= ports at FreeBSD.org
COMMENT= Tool for fast loading mp3s into Nokia 5510
-LIB_DEPENDS= id3-3.8:${PORTSDIR}/audio/id3lib
+LIB_DEPENDS= libid3-3.so:${PORTSDIR}/audio/id3lib
GNU_CONFIGURE= yes
USE_BZIP2= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
-MAN1= nokryptia.1
-PLIST_FILES= bin/nokryptia
+PLIST_FILES= bin/nokryptia man/man1/${PORTNAME}.1.gz
-NO_STAGE= yes
.include <bsd.port.mk>
Added: head/comms/nokryptia/files/patch-nokryptia.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/nokryptia/files/patch-nokryptia.cc Mon Nov 18 00:37:15 2013 (r334137)
@@ -0,0 +1,174 @@
+--- src/nokryptia.cc.orig 2013-11-17 23:12:21.000000000 +0800
++++ src/nokryptia.cc 2013-11-17 23:14:38.000000000 +0800
+@@ -20,7 +20,7 @@
+ */
+
+ #include <stdio.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <string.h>
+ #include <getopt.h>
+ #include "config.h"
+@@ -40,21 +40,21 @@ int verbose;
+ int action; /* 1 for upload, 2 for download */
+
+ void writeHelpMessage(const char * progname) {
+- cout << PACKAGE << " version " << VERSION
+- << " copyright by Roel Derickx" << endl
++ std::cout << PACKAGE << " version " << VERSION
++ << " copyright by Roel Derickx" << std::endl
+ << "THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY! "
+- << "USE AT YOUR OWN RISK!" << endl << endl
+- << "Usage:" << endl
+- << " " << progname << " [options] file" << endl
+- << "Options:" << endl
+- << " -u convert mp3 into lse for upload" << endl
+- << " -d convert lse into mp3 for download" << endl
+- << " -a <artistname> set artist to artistname" << endl
+- << " -t <songtitle> set title to songtitle" << endl
+- << " -o <directory> directory to where output files should be written" << endl
+- << " -v be verbose" << endl
+- << " -h print this help screen" << endl
+- << "See the man page for more information" << endl;
++ << "USE AT YOUR OWN RISK!" << std::endl << std::endl
++ << "Usage:" << std::endl
++ << " " << progname << " [options] file" << std::endl
++ << "Options:" << std::endl
++ << " -u convert mp3 into lse for upload" << std::endl
++ << " -d convert lse into mp3 for download" << std::endl
++ << " -a <artistname> set artist to artistname" << std::endl
++ << " -t <songtitle> set title to songtitle" << std::endl
++ << " -o <directory> directory to where output files should be written" << std::endl
++ << " -v be verbose" << std::endl
++ << " -h print this help screen" << std::endl
++ << "See the man page for more information" << std::endl;
+ }
+
+ /*
+@@ -83,7 +83,7 @@ int parseInputFiles(int argc, char *argv
+ /* also remove the path from infilename */
+
+ if (optind >= argc) {
+- cout << "No input file given!" << endl;
++ std::cout << "No input file given!" << std::endl;
+ return 1;
+ }
+ strcpy(infilename, argv[optind++]);
+@@ -104,15 +104,15 @@ int parseInputFiles(int argc, char *argv
+ switch (action) {
+ case 1:
+ if (looknchange(outfilename,".mp3",".lse") != 0) {
+- cout << "Input file must have mp3 "
+- << "extension!" << endl;
++ std::cout << "Input file must have mp3 "
++ << "extension!" << std::endl;
+ return 1;
+ }
+ break;
+ case 2:
+ if (looknchange(outfilename,".lse",".mp3") != 0) {
+- cout << "Input file must have lse "
+- << "extension!" << endl;
++ std::cout << "Input file must have lse "
++ << "extension!" << std::endl;
+ return 1;
+ }
+ break;
+@@ -167,7 +167,7 @@ int parseOptions(int argc, char * argv[]
+ strcat(outfilename,"\0");
+ break;
+ default:
+- cout << "Unknown option " << optopt << endl;
++ std::cout << "Unknown option " << optopt << std::endl;
+ } /* end of switch */
+ } /* end of while */
+
+@@ -198,9 +198,9 @@ void makeTag(char * artist, char * title
+ int lengthTitle = strlen(title);
+
+ if (verbose) {
+- cout << "Writing tag to output :" << endl;
+- cout << "artistname = " << artist << endl;
+- cout << "songtitle = " << title << endl;
++ std::cout << "Writing tag to output :" << std::endl;
++ std::cout << "artistname = " << artist << std::endl;
++ std::cout << "songtitle = " << title << std::endl;
+ }
+
+ /* allocate memory */
+@@ -235,7 +235,7 @@ void makeHeader() {
+ char * buf;
+ int i;
+
+- if (verbose) cout << "Writing LockStream key to output" << endl;
++ if (verbose) std::cout << "Writing LockStream key to output" << std::endl;
+
+ /* allocate memory */
+ buf = new char[512];
+@@ -266,8 +266,8 @@ int readAndTestHeader() {
+ char * buf;
+
+ if (verbose) {
+- cout << "Testing if the lse file is not written by "
+- << "the Nokia Audio Manager" << endl;
++ std::cout << "Testing if the lse file is not written by "
++ << "the Nokia Audio Manager" << std::endl;
+ }
+
+ /* allocate memory */
+@@ -276,7 +276,7 @@ int readAndTestHeader() {
+
+ bread = fread(buf,1,896,infile);
+ if (bread != 896) {
+- cout << "Input file is too small!" << endl;
++ std::cout << "Input file is too small!" << std::endl;
+ return 0;
+ }
+
+@@ -301,7 +301,7 @@ void copyData() {
+ int bread, bwritten;
+ char * buf;
+
+- if (verbose) cout << "Writing data to output" << endl;
++ if (verbose) std::cout << "Writing data to output" << std::endl;
+
+ /* allocate memory */
+ buf = new char[COPYBUFSIZE];
+@@ -347,8 +347,8 @@ int main(int argc, char * argv[]) {
+
+ /* open the infile */
+ if ((infile = fopen(infilename,"rb")) == NULL) {
+- cout << infilename
+- << ": No such file or directory" << endl;
++ std::cout << infilename
++ << ": No such file or directory" << std::endl;
+
+ cleanUpMemory();
+
+@@ -358,10 +358,10 @@ int main(int argc, char * argv[]) {
+
+ /* open the outfile */
+ if ((outfile = fopen(outfilename,"wb")) == NULL) {
+- cout << "An error occured while opening "
+- << outfilename << " for writing." << endl
++ std::cout << "An error occured while opening "
++ << outfilename << " for writing." << std::endl
+ << "Do you have write permission "
+- << "in this directory?" << endl;
++ << "in this directory?" << std::endl;
+
+ cleanUpMemory();
+
+@@ -383,9 +383,9 @@ int main(int argc, char * argv[]) {
+ copyData();
+ }
+ else {
+- cout << "This file was encrypted by the "
+- << "official nokia program." << endl
+- << "Unable to decrypt!" << endl;
++ std::cout << "This file was encrypted by the "
++ << "official nokia program." << std::endl
++ << "Unable to decrypt!" << std::endl;
+ }
+ }
+
Modified: head/comms/serialoverip/Makefile
==============================================================================
--- head/comms/serialoverip/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/serialoverip/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -11,11 +11,10 @@ COMMENT= Transport of serial interfaces
PLIST_FILES= sbin/${PORTNAME}
-NO_STAGE= yes
do-build:
@cd ${WRKSRC}; ${CC} ${CFLAGS} ${PORTNAME}.c -o ${PORTNAME}
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin/
+ @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin/
.include <bsd.port.mk>
Modified: head/comms/seyon/Makefile
==============================================================================
--- head/comms/seyon/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/seyon/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -17,9 +17,8 @@ USES= imake
USE_XORG= x11 xext xpm xmu xaw xt sm ice
MAKE_JOBS_UNSAFE= yes
-MAN1= seyon.1
PLIST_FILES= bin/seyon lib/X11/app-defaults/Seyon \
- lib/X11/app-defaults/Seyon-color lib/X11/seyon.help
+ lib/X11/app-defaults/Seyon-color lib/X11/seyon.help \
+ man/man1/${PORTNAME}.1.gz
-NO_STAGE= yes
.include <bsd.port.mk>
Modified: head/comms/sredird/Makefile
==============================================================================
--- head/comms/sredird/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/sredird/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -13,22 +13,14 @@ COMMENT= RFC 2217 compliant serial port
LICENSE= GPLv2
-PLIST_FILES= libexec/sredird
-PORTDOCS= README
-
OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
do-build:
${CC} ${CFLAGS} -Wall -o ${WRKSRC}/sredird ${WRKSRC}/sredird.c
-.include <bsd.port.options.mk>
-
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/sredird ${PREFIX}/libexec
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
-.endif
+ ${INSTALL_PROGRAM} ${WRKSRC}/sredird ${STAGEDIR}${PREFIX}/libexec
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Added: head/comms/sredird/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/sredird/pkg-plist Mon Nov 18 00:37:15 2013 (r334137)
@@ -0,0 +1,3 @@
+libexec/sredird
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Modified: head/comms/tkscanfax/Makefile
==============================================================================
--- head/comms/tkscanfax/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/tkscanfax/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -20,18 +20,17 @@ PLIST_SUB= TKSCANFAXDIR="${TKSCANFAXDIR:
TKSCANFAXDIR= ${PREFIX}/lib/tkscanfax1
-NO_STAGE= yes
post-patch:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -i '' -e \
's|/usr/local/lib|${PREFIX}/lib|g'
do-install:
- @${MKDIR} ${TKSCANFAXDIR}
- @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${TKSCANFAXDIR})
+ @${MKDIR} ${STAGEDIR}${TKSCANFAXDIR}
+ @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${TKSCANFAXDIR})
.for file in tkfax tkscan
- ${CHMOD} ${BINMODE} ${TKSCANFAXDIR}/${file}
- ${CHOWN} ${BINOWN}:${BINGRP} ${TKSCANFAXDIR}/${file}
- ${LN} -sf ${TKSCANFAXDIR}/${file} ${PREFIX}/bin
+ ${CHMOD} ${BINMODE} ${STAGEDIR}${TKSCANFAXDIR}/${file}
+ ${CHOWN} ${BINOWN}:${BINGRP} ${STAGEDIR}${TKSCANFAXDIR}/${file}
+ ${LN} -sf ${TKSCANFAXDIR}/${file} ${STAGEDIR}${PREFIX}/bin
.endfor
.include <bsd.port.mk>
Modified: head/comms/tkscanfax/pkg-plist
==============================================================================
--- head/comms/tkscanfax/pkg-plist Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/tkscanfax/pkg-plist Mon Nov 18 00:37:15 2013 (r334137)
@@ -1,3 +1,5 @@
+bin/tkfax
+bin/tkscan
%%TKSCANFAXDIR%%/Makefile
%%TKSCANFAXDIR%%/doc/C/Config_Help.html
%%TKSCANFAXDIR%%/doc/C/Cover_Page_Help.html
@@ -90,10 +92,6 @@
%%TKSCANFAXDIR%%/tkscan
%%TKSCANFAXDIR%%/tkscan.desktop
%%TKSCANFAXDIR%%/tkscanfax.spec
- at exec /bin/ln -sf %D/%%TKSCANFAXDIR%%/tkfax %D/bin
- at exec /bin/ln -sf %D/%%TKSCANFAXDIR%%/tkscan %D/bin
- at unexec /bin/rm -f %D/bin/tkfax
- at unexec /bin/rm -f %D/bin/tkscan
@dirrm %%TKSCANFAXDIR%%/tex
@dirrm %%TKSCANFAXDIR%%/scan-drivers
@dirrm %%TKSCANFAXDIR%%/images
Modified: head/comms/xdx/Makefile
==============================================================================
--- head/comms/xdx/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/xdx/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -16,10 +16,8 @@ USE_GNOME= gtk20
GNU_CONFIGURE= yes
USES= gmake pkgconfig
-MAN1= xdx.1
LICENSE= GPLv2
-NO_STAGE= yes
post-patch:
@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
's|-D.*_DISABLE_DEPRECATED||g'
Modified: head/comms/xdx/pkg-plist
==============================================================================
--- head/comms/xdx/pkg-plist Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/xdx/pkg-plist Mon Nov 18 00:37:15 2013 (r334137)
@@ -1,5 +1,11 @@
bin/xdx
+man/man1/xdx.1.gz
share/applications/Xdx.desktop
+share/locale/es/LC_MESSAGES/xdx.mo
+share/locale/fr/LC_MESSAGES/xdx.mo
+share/locale/nl/LC_MESSAGES/xdx.mo
+share/locale/pl/LC_MESSAGES/xdx.mo
+share/locale/pt/LC_MESSAGES/xdx.mo
%%DATADIR%%/MANUAL
%%DATADIR%%/MANUAL.es
%%DATADIR%%/MANUAL.fr
@@ -22,8 +28,3 @@ share/applications/Xdx.desktop
@dirrm %%DATADIR%%/sounds
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%
-share/locale/es/LC_MESSAGES/xdx.mo
-share/locale/fr/LC_MESSAGES/xdx.mo
-share/locale/nl/LC_MESSAGES/xdx.mo
-share/locale/pl/LC_MESSAGES/xdx.mo
-share/locale/pt/LC_MESSAGES/xdx.mo
Modified: head/comms/yaps/Makefile
==============================================================================
--- head/comms/yaps/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/yaps/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -15,22 +15,12 @@ LICENSE= GPLv2
USES= gmake
-MAN1= yaps.1
-PLIST_FILES= bin/yaps etc/yaps.rc.sample
-PORTDOCS= yaps.doc yaps.html
-PORTDATA= *
-
OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
post-install:
- ${INSTALL_DATA} ${WRKSRC}/yaps.rc ${PREFIX}/etc/yaps.rc.sample
- ${INSTALL_MAN} ${WRKSRC}/yaps.1 ${PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/yaps.doc ${WRKSRC}/yaps.html ${DOCSDIR}
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/yaps.rc ${STAGEDIR}${PREFIX}/etc/yaps.rc.sample
+ ${INSTALL_MAN} ${WRKSRC}/yaps.1 ${STAGEDIR}${PREFIX}/man/man1
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/yaps.doc ${WRKSRC}/yaps.html ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Added: head/comms/yaps/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/yaps/files/patch-Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -0,0 +1,21 @@
+--- Makefile.orig 2013-11-17 23:01:50.000000000 +0800
++++ Makefile 2013-11-17 23:04:00.000000000 +0800
+@@ -33,15 +33,15 @@ yaps.doc: yaps.html
+ lynx -cfg=/dev/null -nolist -dump $< > $@
+
+ install: $(DSTFLE) $(CFGFILE)
+- if [ ! -d $(YAPS_LIBDIR) ]; then \
+- install -d -m 755 -o $(YAPS_USER) -g $(YAPS_GROUP) $(YAPS_LIBDIR) ; \
++ if [ ! -d $(DESTDIR)$(YAPS_LIBDIR) ]; then \
++ install -d -m 755 -o $(YAPS_USER) -g $(YAPS_GROUP) $(DESTDIR)$(YAPS_LIBDIR) ; \
+ fi
+ @if [ -f contrib/Makefile ]; then \
+ $(MAKE) -C contrib install ; \
+ fi
+
+ $(DSTFLE): yaps
+- install -o $(YAPS_USER) -g $(YAPS_GROUP) -m $(YAPS_MODE) -s yaps $@
++ install -o $(YAPS_USER) -g $(YAPS_GROUP) -m $(YAPS_MODE) -s yaps $(DESTDIR)$@
+
+ $(CFGFILE): yaps.rc
+ @if [ ! -f $@ ]; then \
Added: head/comms/yaps/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/yaps/pkg-plist Mon Nov 18 00:37:15 2013 (r334137)
@@ -0,0 +1,6 @@
+bin/yaps
+etc/yaps.rc.sample
+man/man1/yaps.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/yaps.doc
+%%PORTDOCS%%%%DOCSDIR%%/yaps.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Modified: head/comms/zssh/Makefile
==============================================================================
--- head/comms/zssh/Makefile Sun Nov 17 23:25:47 2013 (r334136)
+++ head/comms/zssh/Makefile Mon Nov 18 00:37:15 2013 (r334137)
@@ -15,10 +15,8 @@ RUN_DEPENDS= lrz:${PORTSDIR}/comms/lrzsz
HAS_CONFIGURE= yes
-PLIST_FILES= bin/zssh bin/ztelnet
-MAN1= zssh.1 ztelnet.1
+PLIST_FILES= bin/zssh bin/ztelnet man/man1/zssh.1.gz man/man1/ztelnet.1.gz
-NO_STAGE= yes
post-configure:
@${REINPLACE_CMD} -e 's,^prefix.*,prefix = ${PREFIX},g' ${WRKSRC}/Makefile
Added: head/comms/zssh/files/patch-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/zssh/files/patch-Makefile.in Mon Nov 18 00:37:15 2013 (r334137)
@@ -0,0 +1,15 @@
+--- Makefile.in.orig 2013-11-17 23:06:21.000000000 +0800
++++ Makefile.in 2013-11-17 23:07:02.000000000 +0800
+@@ -75,9 +75,9 @@ ztelnet : $(NAME)
+
+ install :
+ strip $(NAME)
+- $(INSTALL) -m 0711 zssh @bindir@
+- ln -f @bindir@/zssh @bindir@/ztelnet
+- $(INSTALL) -m 0644 $(MANS) @mandir@/man1
++ $(INSTALL) -m 0711 zssh $(DESTDIR)@bindir@
++ (cd $(DESTDIR)@bindir@; ln -f zssh ztelnet)
++ $(INSTALL) -m 0644 $(MANS) $(DESTDIR)@mandir@/man1
+
+ uninstall :
+ -cd @bindir@ && rm $(PRGS)
More information about the svn-ports-head
mailing list