cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade from 0.41 to 0.42. Use configure and otherwise simplify the

Browse Source 
port. Resolve compiler-warnings (mostly about signed vs. unsigned
char).

Do not install the COPYING-file -- it is nothing but the recitation
of GPLv2 -- declare GPLv2 as LICENSE instead.

Do not install the README -- there is nothing in it, that the
man-page does not cover.

With only two files remaining -- the program and the man-page --
do away with pkg-plist and simply list the two in PLIST_FILES.
This commit is contained in:
Mikhail Teterin 2015-02-03 14:56:26 +00:00
parent 6f901b1ba8
commit becaeffa9b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=378355
4 changed files with 210 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
audio/fapg/Makefile
View File

@ -2,32 +2,19 @@
# $FreeBSD$
PORTNAME= fapg
PORTVERSION= 0.41
PORTVERSION= 0.42
CATEGORIES= audio
MASTER_SITES= http://royale.zerezo.com/${PORTNAME}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast Audio Playlist Generator
LICENSE= GPLv2
LIB_DEPENDS= liburiparser.so:${PORTSDIR}/net/uriparser
MAKE_ARGS+= CC="${CC}"
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
do-build:
@cd ${WRKSRC} && ${MAKE} ${PORTNAME}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/fapg.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for file in COPYING README
${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
.endfor
.endif
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-uriparser="${LOCALBASE}"
PLIST_FILES= bin/fapg man/man1/fapg.1.gz
.include <bsd.port.mk>

4
audio/fapg/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (fapg-0.41.tar.gz) = 0c09229c1473999f5939770326d8294adfa1847ae3da5f0c7827747284fc54ae
SIZE (fapg-0.41.tar.gz) = 94315
SHA256 (fapg-0.42.tar.gz) = f324eca6d5fe958be74beb6336d685aa305133c5da26c99b2c0dbc17c68c0076
SIZE (fapg-0.42.tar.gz) = 94920

213
audio/fapg/files/patch-fapg.c
View File

@ -1,16 +1,198 @@
--- fapg.c.orig 2008-03-11 02:18:04.000000000 +0800
+++ fapg.c 2008-05-01 17:46:37.000000000 +0800
@@ -1514,8 +1514,7 @@
--- fapg.c 2015-02-02 13:27:58.000000000 -0500
+++ fapg.c 2015-02-03 09:47:00.000000000 -0500
@@ -57,27 +57,27 @@
int debug = 0;
int format = FORMAT_M3U;
-char *genrelist = NULL;
-unsigned char *prefix = "";
-unsigned char *base = "";
-unsigned char *dir = "";
-unsigned char *hostname = "fritzserver.de";
+static char *genrelist = NULL;
+static char *prefix = "";
+static char *base = "";
+static char *dir = "";
+static const char *hostname = "fritzserver.de";
// unsigned char *referal="/usr/local/bin/fapg-rss.sh";
-unsigned char *referal = NULL;
+static const char *referal = NULL;
//int windows=0;
int fromstdin = 0;
int recursive = 0;
int avoidhlinked = 0;
int separator = '/';
-unsigned char *eol = "\n";
-unsigned char buffer[MAX];
+static const char *eol = "\n";
+static char buffer[MAX];
int counter = 0;
-unsigned char artist[1024];
-unsigned char title[1024];
-unsigned char genrebuf[1024];
-unsigned char genre = 0;
+static char artist[1024];
+static char title[1024];
+static char genrebuf[1024];
+static unsigned char genre = 0;
int duration;
#define MP2ENC 1
#define MP3ENC 2
@@ -87,7 +87,7 @@
#define WAVENC 6
#define WMAENC 7
-char *magic[] = { NULL,
+static const char *magic[] = { NULL,
"audio/mpeg", "audio/mpeg",
"audio/mpeg", "audio/mpeg",
"audio/ogg-vorbis", "audio/x-wav",
@@ -95,7 +95,7 @@
NULL
};
-unsigned char unix2dos[] =
+static unsigned char unix2dos[] =
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 70, 35, 36, 37, 38, 39, 40, 41, 82, 43, 44, 45, 46, 47,
@@ -126,7 +126,7 @@
unsigned char *basemap;
unsigned char *winorunix;
-unsigned char one2one[] =
+static unsigned char one2one[] =
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31,
@@ -160,7 +160,7 @@
248, 249, 250, 251, 252, 253, 254, 255
}; /* identical mapping */
-unsigned char noand[256] =
+static unsigned char noand[256] =
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31,
@@ -194,7 +194,7 @@
248, 249, 250, 251, 252, 253, 254, 255
}; /* only '&' is mapped to '+' */
-unsigned char *iso2web[256] = {
+static const char *iso2web[256] = {
"%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07",
"%08", "%09", "%0a", "%0b", "%0c", "%0d", "%0e", "%0f",
"%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17",
@@ -308,7 +308,7 @@
int pos = 0;
int cnt = 0;
char b;
- unsigned char *prefx;
+ char *prefx;
prefx = prefix;
@@ -344,7 +344,7 @@
{
int cnt = 0;
int pos;
- unsigned char *prefx;
+ char *prefx;
txxputnameoffset(c);
@@ -669,7 +669,7 @@
}
}
-void parse_mp3(unsigned char *file)
+void parse_mp3(const char *file)
{
int bitrates[2][3][15] =
{ {{0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384,
@@ -683,7 +683,7 @@
{0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160}}
};
FILE *fic;
- unsigned char *c;
+ char *c;
int lus;
genre = 0;
@@ -773,7 +773,7 @@
}
while(c < buffer + lus - 10) {
- if(*c == 0xFF && (*(c + 1) & 0xF0) == 0xF0) {
+ if((unsigned char)*c == 0xFF && (*(c + 1) & 0xF0) == 0xF0) {
int version;
int lay;
int bitrate_index;
@@ -823,10 +823,10 @@
fclose(fic);
}
-void parse_ogg(unsigned char *file)
+void parse_ogg(const char *file)
{
FILE *fic;
- unsigned char *c;
+ char *c;
int lus;
int sample_rate;
int samples;
@@ -911,10 +911,10 @@
fclose(fic);
}
-void parse_mpc(unsigned char *file)
+void parse_mpc(const char *file)
{
FILE *fic;
- unsigned char *c;
+ char *c;
int lus;
int sample_rates[4] = { 44100, 48000, 37800, 32000 };
int frame_count;
@@ -1253,9 +1253,9 @@
}
#endif
-void parse_file(unsigned char *newpath, unsigned char * original_path)
+void parse_file(char *newpath, const char * original_path)
{
- unsigned char ext[5];
+ char ext[5];
int j, encoding = 0;
for(j = 0; j < 5; j++)
@@ -1457,11 +1457,11 @@
}
}
-void parse_directory(unsigned char *path, unsigned char * original_path)
+void parse_directory(char *path, const char * original_path)
{
int i, n;
struct dirent **namelist;
- unsigned char newpath[PATH_MAX];
+ char newpath[PATH_MAX];
struct stat infos;
if(debug)
@@ -1520,8 +1520,7 @@
break;
case FORMAT_HTML:
printf
- ("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">%s%s<html>%s%s<head>%s<title>Playlist generated by FAPG "
- VERSION
+ ("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">%s%s<html>%s%s<head>%s<title>Playlist generated by FAPG 0.41"
+ ("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">%s%s<html>%s%s<head>%s<title>Playlist generated by FAPG 0.42"
"</title>%s<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />%s<style type=\"text/css\">%s<!--%s%sbody,td,tr {%s font-family: Verdana, Arial, Helvetica, sans-serif;%s font-size: 12px;%s color: #000000;%s}%s%sbody {%s background: #ffffff;%s}%s%sth {%s text-align: center;%s background: #ffcccc;%s padding-left: 15px;%s padding-right: 15px;%s border: 1px #dd8888 solid;%s}%s%std {%s text-align: center;%s background: #eeeeee;%s padding-left: 15px;%s padding-right: 15px;%s border: 1px #cccccc solid;%s}%s%sh1 {%s font-size: 25px;%s}%s%sp {%s font-size: 10px;%s}%s%sa {%s color: #993333;%s text-decoration: none;%s}%s%sa:hover {%s text-decoration: underline;%s}%s%s-->%s</style>%s</head>%s%s<body>%s%s<h1>Playlist</h1>%s%s<table>%s<tr><th>Entry</th><th>Artist</th><th>Title</th><th>Length</th></tr>%s",
eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol,
eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol,
@@ -1532,10 +1531,8 @@
@@ -1538,10 +1537,8 @@
strftime(timebuffer, 255, "%a %d %b %Y %T %z",
localtime(&zeit));
printf
@ -18,26 +200,35 @@
- VERSION
- " -->%s<rss xmlns:itunes=\"http://www.itunes.com/DTDs/Podcast-1.0.dtd\" version=\"2.0\">%s <channel>%s\t<title>%s - %s - %s</title>%s\t<description>Directory Tree %s</description>%s\t<link>%s</link>%s\t<itunes:image href=\"%s/xml/podcast.jpg\"/>%s\t<lastBuildDate>%s</lastBuildDate>%s\t<generator>FAPG "
- VERSION
+ ("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>%s<!-- generator=\"FAPG 0.41"
+ " -->%s<rss xmlns:itunes=\"http://www.itunes.com/DTDs/Podcast-1.0.dtd\" version=\"2.0\">%s <channel>%s\t<title>%s - %s - %s</title>%s\t<description>Directory Tree %s</description>%s\t<link>%s</link>%s\t<itunes:image href=\"%s/xml/podcast.jpg\"/>%s\t<lastBuildDate>%s</lastBuildDate>%s\t<generator>FAPG 0.41"
+ ("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>%s<!-- generator=\"FAPG 0.42"
+ " -->%s<rss xmlns:itunes=\"http://www.itunes.com/DTDs/Podcast-1.0.dtd\" version=\"2.0\">%s <channel>%s\t<title>%s - %s - %s</title>%s\t<description>Directory Tree %s</description>%s\t<link>%s</link>%s\t<itunes:image href=\"%s/xml/podcast.jpg\"/>%s\t<lastBuildDate>%s</lastBuildDate>%s\t<generator>FAPG 0.42"
"</generator>%s\t<image>%s\t\t<url>%s/podcast.jpg</url>%s\t\t<title>Server Logo</title>%s\t\t<link>%s</link>%s\t\t<description>Feed provided by FAPG. Click to visit.</description>%s\t</image>%s\t<itunes:owner>%s\t\t<itunes:name>Admin %s</itunes:name>%s\t\t<itunes:email>podcast@%s</itunes:email>%s\t</itunes:owner>%s\t<category>Various</category>%s\t<itunes:subtitle>Directory Tree %s</itunes:subtitle>%s\t<itunes:author>%s</itunes:author>%s\t<copyright>unknown</copyright>%s\t<language>%s</language>%s\t<itunes:explicit>No</itunes:explicit>%s\t<ttl>1800</ttl>%s",
eol, eol, eol, eol, hostname, dir, argv[optind], eol,
prefix, eol, base, eol, prefix, eol, timebuffer, eol, eol,
@@ -1560,7 +1557,7 @@
@@ -1566,7 +1563,7 @@
#ifdef HAVE_LIBURIPARSER
case FORMAT_XSPF:
printf("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n"
- "<!-- generator=\"FAPG " VERSION " -->\n"
+ "<!-- generator=\"FAPG 0.41 -->\n"
+ "<!-- generator=\"FAPG 0.42 -->\n"
"<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\">\n"
"<trackList>\n");
break;
@@ -1615,7 +1612,7 @@
@@ -1581,7 +1578,7 @@
sprintf(pwd, "%s/", pwd_source);
if(fromstdin) {
- unsigned char path[PATH_MAX];
+ char path[PATH_MAX];
int i;
while(fgets(path, PATH_MAX, stdin)) {
for(i = 0; i < PATH_MAX; i++)
@@ -1621,7 +1618,7 @@
case FORMAT_HTML:
printf
("</table>%s%s<p>Playlist generated by <a href=\"http://royale.zerezo.com/fapg/\">FAPG "
- VERSION "</a></p>%s%s</body>%s%s</html>", eol, eol, eol, eol,
+ "0.41</a></p>%s%s</body>%s%s</html>", eol, eol, eol, eol,
+ "0.42</a></p>%s%s</body>%s%s</html>", eol, eol, eol, eol,
eol, eol);
break;
case FORMAT_RSS:

4
audio/fapg/pkg-plist
View File

@ -1,4 +0,0 @@
bin/fapg
man/man1/fapg.1.gz
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/README