mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

get rid of libgnugetopt dependency for -CURRENT,

Browse Source 
use USE_GETOPT_LONG instead.
respect CC, CFLAGS.
use getopt_long() instead of getopt_long_only().
This commit is contained in:
FUJISHIMA Satsuki 2003-07-14 02:37:49 +00:00
parent 8e775bbe3a
commit f689ded903
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=84838
7 changed files with 134 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/htdump/Makefile
View File

@ -7,13 +7,16 @@
PORTNAME= htdump
PORTVERSION= 0.9x
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://arak.cs.hro.nl/~ren/linux/htdump/bin/
MAINTAINER= mux@FreeBSD.org
COMMENT= A tool to retrieve WWW data
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
USE_GETOPT_LONG=yes
CFLAGS+= ${CPPFLAGS}
MAKE_ENV= LDFLAGS="${LDFLAGS}"
.if defined(WITH_SSL)
USE_OPENSSL= yes

22
www/htdump/files/patch-aa
View File

@ -1,29 +1,23 @@
--- Makefile.orig Tue Dec 19 16:26:47 2000
+++ Makefile Wed Feb 21 00:33:15 2001
@@ -5,10 +5,11 @@
--- Makefile.orig Wed Dec 20 00:26:47 2000
+++ Makefile Sun Jul 6 20:19:19 2003
@@ -5,10 +5,8 @@
#
#
-CFLAGS = -O4 -m486 -Wall #-funsigned-char -Wshadow -Wmissing-prototypes -Wmissing-declarations -Winline
+CFLAGS = -O4 -Wall -I${PREFIX}/include #-funsigned-char -Wshadow -Wmissing-prototypes -Wmissing-declarations -Winline
PROGS = htdump
LFLAGS = -s #-static
CC = cc
+LDFLAGS += -L${PREFIX}/lib
-LFLAGS = -s #-static
-CC = cc
+LFLAGS = -s ${LDFLAGS}
# Nothing should have to change beneath this line
@@ -22,19 +23,19 @@
htdump: $(OBJS) socket.o
rm -f htdump
- $(CC) $(LFLAGS) -o htdump $(OBJS) socket.o
+ $(CC) $(LFLAGS) -o htdump $(OBJS) socket.o ${LDFLAGS} -lgnugetopt
@@ -26,15 +24,15 @@
ssl: $(OBJS) socket-ssl.o
rm -f htdump
- $(CC) $(LFLAGS) -o htdump $(OBJS) socket-ssl.o -lssl -lcrypto -L/usr/local/ssl/lib
+ $(CC) $(LFLAGS) -o htdump $(OBJS) socket-ssl.o ${LDFLAGS} -lssl -lcrypto -lgnugetopt
+ $(CC) $(LFLAGS) -o htdump $(OBJS) socket-ssl.o -lssl -lcrypto
-$(OBJS): %.o: %.c $(HDRS)
+$(OBJS): $(HDRS)

11
www/htdump/files/patch-init.c Normal file
View File

@ -0,0 +1,11 @@
--- init.c.orig Wed Dec 20 00:26:47 2000
+++ init.c Mon Jul 7 04:39:00 2003
@@ -121,7 +121,7 @@
CONFIG.new_argv = CONFIG.argv;
-while ((t = getopt_long_only(CONFIG.new_argc
+while ((t = getopt_long(CONFIG.new_argc
,CONFIG.new_argv
,"h"
,long_options

62
www/htdump/files/patch-usage.c Normal file
View File

@ -0,0 +1,62 @@
--- usage.c.orig Wed Dec 20 00:26:47 2000
+++ usage.c Mon Jul 7 04:43:54 2003
@@ -29,24 +29,24 @@
" OPTIONS\n"
" ===================================\n"
" Main mode of operation:\n"
- " -command=<command> Define request command. Default is 'GET'.\n"
- " -post=<form data> POST form data. When used, command is\n"
- " overriden to 'POST'\n"
+ " --command=<command> Define request command. Default is 'GET'.\n"
+ " --post=<form data> POST form data. When used, command is\n"
+ " overriden to 'POST'\n"
"\n"
" Miscellaneous:\n"
- " -debug=<level> Debug mode, specify level\n"
- " -file=<file> Dump data to file. (Auto-resumes)\n"
- " When omitted, output goes to stdout.\n"
+ " --debug=<level> Debug mode, specify level\n"
+ " --file=<file> Dump data to file. (Auto-resumes)\n"
+ " When omitted, output goes to stdout.\n"
"\n"
" Header adjustment:\n"
- " -accept=<Accept> Add 'Accept:' header\n"
- " -cookie=<Cookie> Add 'Cookie:' header\n"
- " -from=<From> Add 'From:' header\n"
- " -host=<Host> Add 'Host:' header (*)\n"
- " -referer=<Referer> Add 'Referer:' header\n"
- " -range=<Range string> Add 'Range:' header (*)\n"
- " -agent=<Agent string> Add 'User-Agent:' header\n"
- " -version=<0|1|r> Select HTTP version. Default is HTTP/1.1\n"
+ " --accept=<Accept> Add 'Accept:' header\n"
+ " --cookie=<Cookie> Add 'Cookie:' header\n"
+ " --from=<From> Add 'From:' header\n"
+ " --host=<Host> Add 'Host:' header (*)\n"
+ " --referer=<Referer> Add 'Referer:' header\n"
+ " --range=<Range string> Add 'Range:' header (*)\n"
+ " --agent=<Agent string> Add 'User-Agent:' header\n"
+ " --version=<0|1|r> Select HTTP version. Default is HTTP/1.1\n"
"\n"
" (*) = HTTP/1.1 only\n"
" You need version 1.1 to use password authentication\n"
@@ -56,13 +56,13 @@
" ===================================\n"
" htdump www.netscape.com\n"
" htdump https://flemming:secret@www.jamesbond.com/members/secret.html\n"
- " htdump -host=\"www.vhost1.com\" http://127.0.0.1/\n"
- " htdump -referer=\"www.fbi.gov\" http://www.arpa.mil/secret.zip\n"
- " htdump -version=r -agent=\"Crazy www browser 1.6\" http://bouncy.com/\n"
- " htdump -command=\"OPTIONS\" http://arak.cs.hro.nl/ -debug\n"
- " htdump -file=this.zip download.com/this.zip &\n"
- " htdump http://download.com/big.zip -range=\"644221-\" >> big.zip &\n"
- " htdump -post=\"name=Ren&op1=yes\" here.com/cgi-bin/prog\n"
+ " htdump --host=\"www.vhost1.com\" http://127.0.0.1/\n"
+ " htdump --referer=\"www.fbi.gov\" http://www.arpa.mil/secret.zip\n"
+ " htdump --version=r --agent=\"Crazy www browser 1.6\" http://bouncy.com/\n"
+ " htdump --command=\"OPTIONS\" http://arak.cs.hro.nl/ --debug\n"
+ " htdump --file=this.zip download.com/this.zip &\n"
+ " htdump http://download.com/big.zip --range=\"644221-\" >> big.zip &\n"
+ " htdump --post=\"name=Ren&op1=yes\" here.com/cgi-bin/prog\n"
"\n"
"\n"
" htdump "VERSION"\n"

6
x11/cnslock/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= cnslock
PORTVERSION= 1.02
PORTREVISION= 1
CATEGORIES= x11 windowmaker
MASTER_SITES= http://www.dockapps.com/download.php/id/181/ \
http://freebsd.nsu.ru/distfiles/
@ -14,12 +15,13 @@ MASTER_SITES= http://www.dockapps.com/download.php/id/181/ \
MAINTAINER= danfe@regency.nsu.ru
COMMENT= A visual indicator of the states of the three "lock" buttons
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
USE_GETOPT_LONG=yes
USE_GNOME= gtk12
USE_X_PREFIX= yes
USE_XPM= yes
MAKE_ENV= LDFLAGS="${LDFLAGS}"
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin

12
x11/cnslock/files/patch-Makefile
View File

@ -1,16 +1,16 @@
--- Makefile.orig Thu Apr 10 19:48:41 2003
+++ Makefile Thu Apr 10 20:03:05 2003
@@ -2,11 +2,11 @@
--- Makefile.orig Sun Oct 27 09:34:22 2002
+++ Makefile Sun Jul 6 20:33:58 2003
@@ -2,11 +2,10 @@
PREFIX = /usr/local
VERSION = 1.02
-CFLAGS = -O3 -Wall `gtk-config --cflags` -DVERSION=$(VERSION) ${EXTRA}
+CFLAGS += `gtk12-config --cflags` -DVERSION=$(VERSION) ${EXTRA}
CC = gcc
-CC = gcc
+CFLAGS += ${CPPFLAGS} `${GTK_CONFIG} --cflags` -DVERSION=$(VERSION) ${EXTRA}
OBJS = cnslock.o kleds.o applet.o
-LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
+LIBS = `gtk12-config --libs | sed "s/-lgtk12//g"` -lgnugetopt
+LIBS = `${GTK_CONFIG} --libs | sed "s/-lgtk12//g"` ${LDFLAGS}
all: cnslock

39
x11/cnslock/files/patch-cnslock.c Normal file
View File

@ -0,0 +1,39 @@
--- cnslock.c.orig Sun Oct 27 09:32:56 2002
+++ cnslock.c Mon Jul 7 04:47:44 2003
@@ -212,29 +212,26 @@
int c = 0;
struct option long_options[] = {
- {"help", no_argument, NULL, 1},
- {"h", no_argument, NULL, 1},
- {"version", no_argument, NULL, 2},
- {"v", no_argument, NULL, 2},
- {"window", no_argument, NULL, 3},
- {"w", no_argument, NULL, 3},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'v'},
+ {"window", no_argument, NULL, 'w'},
{0, 0, 0, 0}
};
- while ((c = getopt_long_only(argc, argv, "", long_options, NULL)) != -1)
+ while ((c = getopt_long(argc, argv, "", long_options, NULL)) != -1)
{
switch(c)
{
- case 1:
+ case 'h':
do_help();
exit(0);
break;
- case 2:
+ case 'v':
do_version();
exit(0);
break;
- case 3:
+ case 'w':
manager_style = 1;
break;
}