summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/portmap/files/make.patch83
-rwxr-xr-xmeta/packages/portmap/portmap/portmap.init (renamed from meta/packages/portmap/files/portmap.init)0
-rw-r--r--meta/packages/portmap/portmap_6.0.bb5
3 files changed, 3 insertions, 85 deletions
diff --git a/meta/packages/portmap/files/make.patch b/meta/packages/portmap/files/make.patch
deleted file mode 100644
index 2b83130437..0000000000
--- a/meta/packages/portmap/files/make.patch
+++ /dev/null
@@ -1,83 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- portmap_5beta/Makefile~make.patch
7+++ portmap_5beta/Makefile
8@@ -105,6 +105,13 @@
9 #
10 #CONST = -Dconst=
11
12+DESTDIR =
13+prefix = /usr
14+sbindir = /sbin
15+datadir = $(prefix)/share
16+mandir = $(datadir)/man
17+docdir = $(datadir)/doc/portmap
18+
19 ### End of configurable stuff.
20 ##############################
21
22@@ -122,35 +129,38 @@
23 COPT = $(CONST) $(HOSTS_ACCESS) $(CHECK_PORT) \
24 $(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(SA_LEN) \
25 $(LOOPBACK) $(SETPGRP)
26-CFLAGS = -Wall $(COPT) -O2 $(NSARCHS)
27+CFLAGS = -Wall -O2 $(NSARCHS)
28 OBJECTS = portmap.o pmap_check.o from_local.o $(AUX)
29
30 all: portmap pmap_dump pmap_set
31
32 portmap: $(OBJECTS) # $(WRAP_DIR)/libwrap.a
33- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(WRAP_LIB) $(LIBS)
34+ $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(WRAP_LIB) $(LIBS)
35
36-pmap_dump: pmap_dump.c
37- $(CC) $(CFLAGS) -o $@ $? $(LIBS)
38+pmap_dump: pmap_dump.o
39+ $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
40
41-pmap_set: pmap_set.c
42- $(CC) $(CFLAGS) -o $@ $? $(LIBS)
43+pmap_set: pmap_set.o
44+ $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
45
46 from_local: from_local.c
47- cc $(CFLAGS) -DTEST -o $@ from_local.c
48+ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ from_local.c
49
50 get_myaddress: get_myaddress.c
51- cc $(CFLAGS) -DTEST -o $@ get_myaddress.c $(LIBS)
52+ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ get_myaddress.c $(LIBS)
53
54 install: all
55- install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin
56- install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin
57- install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin
58- install -o root -g root -m 0644 portmap.8 ${BASEDIR}/usr/share/man/man8
59- install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8
60- install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8
61- cat BLURB >${BASEDIR}/usr/share/doc/portmap/portmapper.txt
62- gzip -9f ${BASEDIR}/usr/share/doc/portmap/portmapper.txt
63+ install -d $(DESTDIR)/$(sbindir) \
64+ $(DESTDIR)/$(docdir) \
65+ $(DESTDIR)/$(mandir)/man8
66+ install -m 0755 portmap $(DESTDIR)/$(sbindir)
67+ install -m 0755 pmap_dump $(DESTDIR)/$(sbindir)
68+ install -m 0755 pmap_set $(DESTDIR)/$(sbindir)
69+ install -m 0644 portmap.8 $(DESTDIR)/$(mandir)/man8
70+ install -m 0644 pmap_dump.8 $(DESTDIR)/$(mandir)/man8
71+ install -m 0644 pmap_set.8 $(DESTDIR)/$(mandir)/man8
72+ cat BLURB >$(DESTDIR)/$(docdir)/portmapper.txt
73+ gzip -9f $(DESTDIR)/$(docdir)/portmapper.txt
74
75
76 lint:
77@@ -176,3 +186,6 @@
78 portmap.o: portmap.c
79 portmap.o: pmap_check.h Makefile
80 strerror.o: strerror.c
81+
82+%.o: %.c
83+ $(CC) $(COPT) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $*.c -o $*.o
diff --git a/meta/packages/portmap/files/portmap.init b/meta/packages/portmap/portmap/portmap.init
index e46513e115..e46513e115 100755
--- a/meta/packages/portmap/files/portmap.init
+++ b/meta/packages/portmap/portmap/portmap.init
diff --git a/meta/packages/portmap/portmap_6.0.bb b/meta/packages/portmap/portmap_6.0.bb
index 7b23162ffa..f132295ff5 100644
--- a/meta/packages/portmap/portmap_6.0.bb
+++ b/meta/packages/portmap/portmap_6.0.bb
@@ -1,8 +1,8 @@
1require portmap.inc 1require portmap.inc
2 2
3PR = "r3" 3PR = "r5"
4 4
5SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \ 5SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \
6 file://destdir-no-strip.patch;patch=1 \ 6 file://destdir-no-strip.patch;patch=1 \
7 file://no-tcpd-support.patch;patch=1 \ 7 file://no-tcpd-support.patch;patch=1 \
8 file://no-libwrap.patch;patch=1;pnum=0 \ 8 file://no-libwrap.patch;patch=1;pnum=0 \
@@ -11,6 +11,7 @@ SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \
11S = "${WORKDIR}/${PN}_${PV}/" 11S = "${WORKDIR}/${PN}_${PV}/"
12 12
13CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS" 13CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS"
14CFLAGS += "-Wall -Wstrict-prototypes -fPIC"
14 15
15fakeroot do_install() { 16fakeroot do_install() {
16 install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d 17 install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d