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

- Fake

Browse Source 
- add HOMEPAGE, another distsite, NEED_VERSION and some more docs
- respect CC and CFLAGS
- move RESDIR from share to share/netatalk
- move examples from lib/netatalk to share/examples/netatalk
- remove the need for having the source tree installed, just use the
headers in /usr/include/netatalk
This commit is contained in:
brad 2000-08-10 17:53:31 +00:00
parent 5d97712ba2
commit f22b2212e6
28 changed files with 411 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
net/netatalk/Makefile
View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.11 2000/04/18 10:34:09 turan Exp $
# $OpenBSD: Makefile,v 1.12 2000/08/10 17:53:31 brad Exp $
DISTNAME= netatalk-990130
CATEGORIES= net
FAKE=No
MASTER_SITES= ftp://terminator.rs.itd.umich.edu/unix/netatalk/
NEED_VERSION= 1.310
MASTER_SITES= ftp://terminator.rs.itd.umich.edu/unix/netatalk/ \
ftp://ftp.hanse.de/sites/transit/mirror/terminator.rs.itd.umich.edu/unix/netatalk/
HOMEPAGE= http://www.umich.edu/~rsug/netatalk/
MAINTAINER= ianm@cit.nepean.uws.edu.au
@ -12,6 +15,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MAKE_FLAGS= CC="${CC}" OPTOPTS="${CFLAGS} -Wall"
FAKE_FLAGS= ${MAKE_FLAGS} PREFIX="${PREFIX}" DESTDIR="${WRKINST}"
# NOTES:
# Will compile with kerberos support in apfd and papd.
# Haven't tested kerberos support as there is no MacOS
@ -19,23 +25,19 @@ PERMIT_DISTFILES_FTP= Yes
# own. Still need to add support for AFS. Will update
# the Port shortly.
pre-fetch:
.if !defined(NO_WARNINGS)
@if [ ! -f /usr/src/sys/netatalk/at_extern.h ]; then \
echo "This port requires the kernel source code to compile properly,"; \
echo "specifically the source code in /usr/src/sys/netatalk"; \
false ; \
fi
.endif
pre-configure:
post-patch:
@rm -rf ${WRKSRC}/include/netatalk
@ln -sf /usr/src/sys/netatalk ${WRKSRC}/include/netatalk
@ln -sf /usr/include/netatalk ${WRKSRC}/include/netatalk
@rm -f ${WRKSRC}/sys/netatalk/*.h
post-install:
@cp ${WRKSRC}/config/AppleVolumes.system ${PREFIX}/lib/netatalk
@cp ${WRKSRC}/config/AppleVolumes.default ${PREFIX}/lib/netatalk
@PKG_PREFIX="${PREFIX}" sh ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netatalk
${INSTALL_DATA} ${WRKSRC}/config/AppleVolumes.system \
${PREFIX}/share/examples/netatalk
${INSTALL_DATA} ${WRKSRC}/config/AppleVolumes.default \
${PREFIX}/share/examples/netatalk
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/netatalk
${INSTALL_DATA} ${WRKSRC}/INSTALL/README.OPENBSD \
${PREFIX}/share/doc/netatalk
.include <bsd.port.mk>

11
net/netatalk/patches/patch-bin-makefile Normal file
View File

@ -0,0 +1,11 @@
--- bin/Makefile.orig Wed Aug 9 08:17:06 2000
+++ bin/Makefile Wed Aug 9 08:17:44 2000
@@ -20,7 +20,7 @@
done
install:
- -mkdir ${BINDIR}
+ -mkdir ${DESTDIR}${BINDIR}
for i in ${ALL}; \
do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \

11
net/netatalk/patches/patch-binaecho-makefile Normal file
View File

@ -0,0 +1,11 @@
--- bin/aecho/Makefile.orig Wed Aug 9 08:18:08 2000
+++ bin/aecho/Makefile Wed Aug 9 08:18:34 2000
@@ -15,7 +15,7 @@
${CC} ${CFLAGS} -o aecho ${OBJ} ${LIBDIRS} ${LIBS}
install : all
- ${INSTALL} -c aecho ${BINDIR}
+ ${INSTALL} -c aecho ${DESTDIR}${BINDIR}
clean :
rm -f a.out core* *.o *.bak *[Ee]rrs tags

11
net/netatalk/patches/patch-bingetzones-makefile Normal file
View File

@ -0,0 +1,11 @@
--- bin/getzones/Makefile.orig Wed Aug 9 08:19:13 2000
+++ bin/getzones/Makefile Wed Aug 9 08:19:30 2000
@@ -15,7 +15,7 @@
${CC} ${CFLAGS} -o getzones ${OBJ} ${LIBDIRS} ${LIBS}
install : all
- ${INSTALL} -c getzones ${BINDIR}
+ ${INSTALL} -c getzones ${DESTDIR}${BINDIR}
clean :
rm -f a.out core* *.o *.bak *[Ee]rrs tags

16
net/netatalk/patches/patch-binmegatron-makefile Normal file
View File

@ -0,0 +1,16 @@
--- bin/megatron/Makefile.orig Wed Aug 9 08:20:05 2000
+++ bin/megatron/Makefile Wed Aug 9 08:21:26 2000
@@ -18,10 +18,10 @@
${CC} ${CFLAGS} -o ${TARGET} ${OBJ} ${LIBDIRS} ${LIBS}
install : all
- ${INSTALL} -c ${TARGET} ${BINDIR}
+ ${INSTALL} -c ${TARGET} ${DESTDIR}${BINDIR}
for i in ${LINKS} ; do \
- rm -f ${BINDIR}/$$i; \
- ln -s ${TARGET} ${BINDIR}/$$i; \
+ rm -f ${DESTDIR}${BINDIR}/$$i; \
+ cd ${DESTDIR}${BINDIR} && ln -sf ${TARGET} $$i; \
done
clean :

11
net/netatalk/patches/patch-binnbp-makefile Normal file
View File

@ -0,0 +1,11 @@
--- bin/nbp/Makefile.orig Wed Aug 9 08:22:16 2000
+++ bin/nbp/Makefile Wed Aug 9 08:22:32 2000
@@ -21,7 +21,7 @@
${CC} ${CFLAGS} -o nbpunrgstr nbpunrgstr.o ${LIBDIRS} ${LIBS}
install : all
- for i in ${TARGETS}; do ${INSTALL} -c $$i ${BINDIR}; done
+ for i in ${TARGETS}; do ${INSTALL} -c $$i ${DESTDIR}${BINDIR}; done
clean:
rm -f a.out core* *.o *.bak *[Ee]rrs tags

11
net/netatalk/patches/patch-binpap-makefile Normal file
View File

@ -0,0 +1,11 @@
--- bin/pap/Makefile.orig Wed Aug 9 08:23:35 2000
+++ bin/pap/Makefile Wed Aug 9 08:23:19 2000
@@ -19,7 +19,7 @@
${CC} ${CFLAGS} -o papstatus papstatus.o ${LIBDIRS} ${LIBS}
install : all
- for i in ${TARGETS}; do ${INSTALL} -c $$i ${BINDIR}; done
+ for i in ${TARGETS}; do ${INSTALL} -c $$i ${DESTDIR}${BINDIR}; done
clean :
rm -f a.out core* *.o *.bak *[Ee]rrs tags

11
net/netatalk/patches/patch-binpsorder-makefile Normal file
View File

@ -0,0 +1,11 @@
--- bin/psorder/Makefile.orig Wed Aug 9 08:24:45 2000
+++ bin/psorder/Makefile Wed Aug 9 08:25:22 2000
@@ -15,7 +15,7 @@
${CC} ${CFLAGS} -o psorder ${OBJ} ${LIBDIRS} ${LIBS}
install : all
- ${INSTALL} -c psorder ${BINDIR}
+ ${INSTALL} -c psorder ${DESTDIR}${BINDIR}
lint :
lint ${DEFS} ${INCPATH} ${SRC}

11
net/netatalk/patches/patch-etc-makefile Normal file
View File

@ -0,0 +1,11 @@
--- etc/Makefile.orig Wed Aug 9 08:33:52 2000
+++ etc/Makefile Wed Aug 9 08:34:06 2000
@@ -21,7 +21,7 @@
done
install:
- -mkdir ${ETCDIR}
+ -mkdir ${DESTDIR}${ETCDIR}
for i in ${ALL}; \
do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \

20
net/netatalk/patches/patch-etcafpd-makefile
View File

@ -1,5 +1,5 @@
--- etc/afpd/Makefile.orig Fri Jun 26 00:07:32 1998
+++ etc/afpd/Makefile Fri Nov 19 18:24:09 1999
--- etc/afpd/Makefile.orig Thu Jun 25 10:07:32 1998
+++ etc/afpd/Makefile Wed Aug 9 08:33:25 2000
@@ -21,7 +21,7 @@
if [ x"${KRBDIR}" != x ]; then \
KRBLIBS="-lkrb -ldes"; \
@ -9,14 +9,12 @@
KRBDEFS="-DKRB"; \
fi; \
if [ x"${AFSDIR}" != x ]; then \
@@ -46,8 +46,8 @@
main.o : main.c
${CC} ${CFLAGS} \
- -D_PATH_AFPDDEFVOL=\"${ETCDIR}/AppleVolumes.default\" \
- -D_PATH_AFPDSYSVOL=\"${ETCDIR}/AppleVolumes.system\" \
+ -D_PATH_AFPDDEFVOL=\"/etc/netatalk/AppleVolumes.default\" \
+ -D_PATH_AFPDSYSVOL=\"/etc/netatalk/AppleVolumes.system\" \
-DVERSION=\"`cat ../../VERSION`\" \
@@ -52,7 +52,7 @@
${CPPFLAGS} -c main.c
install : all
- ${INSTALL} -c afpd ${SBINDIR}
+ ${INSTALL} -c afpd ${DESTDIR}${SBINDIR}
clean :
rm -f a.out core* *.o *.bak *[Ee]rrs tags

52
net/netatalk/patches/patch-etcatalkd-configc
View File

@ -1,5 +1,6 @@
$OpenBSD: patch-etcatalkd-configc,v 1.2 2000/08/10 17:53:33 brad Exp $
--- etc/atalkd/config.c.orig Tue Oct 7 01:43:08 1997
+++ etc/atalkd/config.c Tue Nov 30 17:19:12 1999
+++ etc/atalkd/config.c Sun Jul 23 23:58:24 2000
@@ -15,7 +15,8 @@
#include <atalk/paths.h>
#include <stdio.h>
@ -21,7 +22,7 @@
struct param {
char *p_name;
@@ -56,7 +59,7 @@
@@ -56,7 +59,7 @@ parseline( line )
}
argc = 0;
@ -30,7 +31,7 @@
p = buf;
/*
@@ -91,6 +94,7 @@
@@ -91,6 +94,7 @@ parseline( line )
return( argv );
}
@ -38,7 +39,7 @@
writeconf( cf )
char *cf;
{
@@ -117,10 +121,10 @@
@@ -117,10 +121,10 @@ writeconf( cf )
mode = st.st_mode;
}
@ -52,7 +53,7 @@
}
if (( fd = open( newpath, O_WRONLY|O_CREAT|O_TRUNC, mode )) < 0 ) {
syslog( LOG_ERR, "%s: %m", newpath );
@@ -209,6 +213,7 @@
@@ -209,6 +213,7 @@ writeconf( cf )
* zone for an interface is the first zone encountered for that
* interface.
*/
@ -60,15 +61,16 @@
readconf( cf )
char *cf;
{
@@ -228,6 +233,7 @@
@@ -228,7 +233,7 @@ readconf( cf )
if ( cf != NULL ) {
#endif __svr4__
perror( p );
+ fclose(conf);
exit( 1 );
- exit( 1 );
+ return( -1 );
#ifndef __svr4__
} else {
@@ -239,6 +245,7 @@
return( -1 );
@@ -239,6 +244,7 @@ readconf( cf )
#ifndef __svr4__
if (( s = socket( AF_APPLETALK, SOCK_DGRAM, 0 )) < 0 ) {
perror( "socket" );
@ -76,7 +78,7 @@
exit( 3 );
}
#endif __svr4__
@@ -253,7 +260,7 @@
@@ -253,7 +259,7 @@ readconf( cf )
* Check that av[ 0 ] is a valid interface.
* Not possible under sysV.
*/
@ -85,7 +87,7 @@
if ( ioctl( s, SIOCGIFFLAGS, &ifr ) < 0 ) {
perror( argv[ 0 ] );
exit( 1 );
@@ -335,6 +342,8 @@
@@ -335,6 +341,8 @@ readconf( cf )
}
/*ARGSUSED*/
@ -94,7 +96,7 @@
seed( iface, av )
struct interface *iface;
char **av;
@@ -351,6 +360,7 @@
@@ -351,6 +359,7 @@ seed( iface, av )
return( 1 );
}
@ -102,7 +104,7 @@
phase( iface, av )
struct interface *iface;
char **av;
@@ -379,6 +389,7 @@
@@ -379,6 +388,7 @@ phase( iface, av )
return( 2 );
}
@ -110,7 +112,7 @@
net( iface, av )
struct interface *iface;
char **av;
@@ -392,12 +403,12 @@
@@ -392,12 +402,12 @@ net( iface, av )
exit( 1 );
}
@ -125,7 +127,7 @@
exit( 1 );
}
@@ -423,7 +434,7 @@
@@ -423,7 +433,7 @@ net( iface, av )
if ( stop != 0 ) {
net = atoi( stop );
if ( net < 0 || net >= 0xffff ) {
@ -134,7 +136,7 @@
exit( 1 );
}
}
@@ -449,6 +460,7 @@
@@ -449,6 +459,7 @@ net( iface, av )
return( 2 );
}
@ -142,7 +144,7 @@
addr( iface, av )
struct interface *iface;
char **av;
@@ -485,6 +497,7 @@
@@ -485,6 +496,7 @@ addr( iface, av )
return( 2 );
}
@ -150,7 +152,7 @@
zone( iface, av )
struct interface *iface;
char **av;
@@ -526,6 +539,7 @@
@@ -526,6 +538,7 @@ zone( iface, av )
* Get the configuration from the kernel. Only called if there's no
* configuration.
*/
@ -158,7 +160,7 @@
getifconf()
{
struct ifconf ifc;
@@ -550,12 +564,13 @@
@@ -550,12 +563,13 @@ getifconf()
exit( 3 );
}
@ -174,7 +176,7 @@
exit( 1 );
}
@@ -574,6 +589,7 @@
@@ -574,6 +588,7 @@ getifconf()
if ( ioctl( s, SIOCGIFFLAGS, ifr ) < 0 ) {
perror( ifr->ifr_name );
@ -182,7 +184,7 @@
exit( 1 );
}
if ( ifr->ifr_flags & ( IFF_LOOPBACK | IFF_POINTOPOINT )) {
@@ -596,6 +612,7 @@
@@ -596,6 +611,7 @@ getifconf()
if (( niface = newiface( ifr->ifr_name )) == NULL ) {
perror( "newiface" );
@ -190,7 +192,7 @@
exit( 1 );
}
/*
@@ -613,6 +630,7 @@
@@ -613,6 +629,7 @@ getifconf()
}
if ( ifc.ifc_len != 0 ) {
fprintf( stderr, "Funky gifconf return.\n" );
@ -198,7 +200,7 @@
exit( 1 );
}
@@ -636,7 +654,7 @@
@@ -636,7 +653,7 @@ newiface( name )
return( NULL );
}
niface->i_next = NULL;
@ -207,7 +209,7 @@
niface->i_flags = 0;
niface->i_time = 0;
#ifdef BSD4_4
@@ -671,8 +689,8 @@
@@ -671,8 +688,8 @@ plumb()
continue;
}
@ -218,7 +220,7 @@
if (( p = strpbrk( device, "0123456789" )) == NULL ) {
syslog( LOG_ERR, "plumb: invalid device: %s", device );
exit( 1 );
@@ -690,15 +708,19 @@
@@ -690,15 +707,19 @@ plumb()
}
if ( ioctl( fd, IF_UNITSEL, ppa ) < 0 ) {
syslog( LOG_ERR, "IF_UNITSEL: %m" );

11
net/netatalk/patches/patch-etcatalkd-makefile
View File

@ -1,11 +0,0 @@
--- etc/atalkd/Makefile.orig Fri Nov 19 18:14:33 1999
+++ etc/atalkd/Makefile Fri Nov 19 18:14:57 1999
@@ -19,7 +19,7 @@
${CPPFLAGS} -c main.c
config.o : config.c
- ${CC} ${CFLAGS} -D_PATH_ATALKDCONF=\"${ETCDIR}/atalkd.conf\" \
+ ${CC} ${CFLAGS} -D_PATH_ATALKDCONF=\"/etc/netatalk/atalkd.conf\" \
${CPPFLAGS} -c config.c
install : all

18
net/netatalk/patches/patch-etcpapd-makefile
View File

@ -1,5 +1,5 @@
--- etc/papd/Makefile.orig Wed Oct 23 07:22:20 1996
+++ etc/papd/Makefile Fri Nov 19 18:13:17 1999
--- etc/papd/Makefile.orig Tue Oct 22 17:22:20 1996
+++ etc/papd/Makefile Wed Aug 9 08:36:59 2000
@@ -15,7 +15,7 @@
if [ x"${KRBDIR}" != x ]; then \
KRBLIBS="-lkrb -ldes"; \
@ -9,12 +9,12 @@
KRBDEFS="-DKRB"; \
fi; \
${MAKE} ${MFLAGS} CC="${CC}" ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" \
@@ -51,7 +51,7 @@
${CC} ${CFLAGS} ${LDFLAGS} -o papd ${OBJ} ${LIBDIRS} ${LIBS}
main.o : main.c
- ${CC} ${CFLAGS} -D_PATH_PAPDCONF=\"${ETCDIR}/papd.conf\" \
+ ${CC} ${CFLAGS} -D_PATH_PAPDCONF=\"/etc/netatalk/papd.conf\" \
-DVERSION=\"`cat ../../VERSION`\" \
@@ -56,7 +56,7 @@
${CPPFLAGS} -c main.c
install : all
- ${INSTALL} -c papd ${SBINDIR}
+ ${INSTALL} -c papd ${DESTDIR}${SBINDIR}
clean :
rm -f a.out core* *.o *.bak *[Ee]rrs tags

26
net/netatalk/patches/patch-etcpsf-makefile Normal file
View File

@ -0,0 +1,26 @@
--- etc/psf/Makefile.orig Thu Oct 2 22:35:26 1997
+++ etc/psf/Makefile Wed Aug 9 09:56:39 2000
@@ -31,15 +31,15 @@
${CPPFLAGS} -c psf.c
install : all
- -mkdir ${RESDIR}
- -mkdir ${RESDIR}/filters
- ${INSTALL} -c psa ${SBINDIR}
- ${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
- ${INSTALL} -c pagecount.ps ${RESDIR}
- ${INSTALL} -c psf ${SBINDIR}
+ -mkdir ${DESTDIR}${RESDIR}
+ -mkdir ${DESTDIR}${RESDIR}/filters
+ ${INSTALL} -c psa ${DESTDIR}${SBINDIR}
+ ${INSTALL} -c etc2ps.sh ${DESTDIR}${SBINDIR}/etc2ps
+ ${INSTALL} -c pagecount.ps ${DESTDIR}${RESDIR}
+ ${INSTALL} -c psf ${DESTDIR}${SBINDIR}
for i in ${LINKS} ; do \
- rm -f ${RESDIR}/filters/$$i; \
- ln -s ${SBINDIR}/psf ${RESDIR}/filters/$$i; \
+ rm -f ${DESTDIR}${RESDIR}/filters/$$i; \
+ cd ${DESTDIR}${RESDIR}/filters && ln -sf ${SBINDIR}/psf $$i; \
done
clean :

24
net/netatalk/patches/patch-include-makefile Normal file
View File

@ -0,0 +1,24 @@
--- include/Makefile.orig Tue Feb 20 11:38:02 1996
+++ include/Makefile Wed Aug 9 08:41:44 2000
@@ -1,16 +1,15 @@
-TARGETS= atalk netatalk
+TARGETS= atalk
INSTALL= install
all :
install : all
- -mkdir ${DESTDIR}
- -mkdir ${INCDIR}
+ -mkdir ${DESTDIR}${INCDIR}
for i in ${TARGETS}; do \
- rm -rf ${INCDIR}/$$i ; \
- mkdir ${INCDIR}/$$i ; \
- cp $$i/*.h ${INCDIR}/$$i ; \
+ rm -rf ${DESTDIR}${INCDIR}/$$i ; \
+ mkdir ${DESTDIR}${INCDIR}/$$i ; \
+ cp $$i/*.h ${DESTDIR}${INCDIR}/$$i ; \
done
clean :

19
net/netatalk/patches/patch-libatalk-makefile Normal file
View File

@ -0,0 +1,19 @@
--- libatalk/Makefile.orig Wed Aug 9 08:11:50 2000
+++ libatalk/Makefile Wed Aug 9 08:14:52 2000
@@ -44,11 +44,11 @@
done
install: all
- -mkdir ${LIBDIR}
- ${INSTALL} -c libatalk.a ${LIBDIR}/libatalk.a
- (cd ${LIBDIR}; ranlib ${LIBDIR}/libatalk.a)
- ${INSTALL} -c libatalk_p.a ${LIBDIR}/libatalk_p.a
- (cd ${LIBDIR}; ranlib ${LIBDIR}/libatalk_p.a)
+ -mkdir ${DESTDIR}${LIBDIR}
+ ${INSTALL} -c libatalk.a ${DESTDIR}${LIBDIR}/libatalk.a
+ (cd ${DESTDIR}${LIBDIR}; ranlib ${DESTDIR}${LIBDIR}/libatalk.a)
+ ${INSTALL} -c libatalk_p.a ${DESTDIR}${LIBDIR}/libatalk_p.a
+ (cd ${DESTDIR}${LIBDIR}; ranlib ${DESTDIR}${LIBDIR}/libatalk_p.a)
clean:
for i in ${ALL}; \

35
net/netatalk/patches/patch-makefile
View File

@ -1,27 +1,36 @@
--- Makefile.orig Mon Sep 13 14:42:56 1999
+++ Makefile Mon Sep 13 14:46:15 1999
@@ -1,17 +1,17 @@
--- Makefile.orig Wed Dec 17 12:25:39 1997
+++ Makefile Wed Aug 9 10:43:40 2000
@@ -1,22 +1,22 @@
# Root of installation. Subdirectories will be ${DESTDIR}/etc,
# ${DESTDIR}/bin, and ${DESTDIR}/lib.
-DESTDIR=/usr/local/atalk
+DESTDIR=$(PREFIX)
+DESTDIR=
# for system-level binaries
-SBINDIR=$(DESTDIR)/etc
+SBINDIR=$(DESTDIR)/libexec
+SBINDIR=${PREFIX}/libexec
# for user-level binaries
BINDIR=$(DESTDIR)/bin
-BINDIR=$(DESTDIR)/bin
+BINDIR=${PREFIX}/bin
# for program libraries (*.a)
LIBDIR=$(DESTDIR)/lib
-LIBDIR=$(DESTDIR)/lib
+LIBDIR=${PREFIX}/lib
# for machine-independent resources (pagecount.ps, etc.)
-RESDIR=$(DESTDIR)/etc
+RESDIR=$(DESTDIR)/share
+RESDIR=${PREFIX}/share/netatalk
# for configuration files (AppleVolumes.system, etc.)
-ETCDIR=$(DESTDIR)/etc
+ETCDIR=/etc/netatalk
# for include files
INCDIR=$(DESTDIR)/include
-INCDIR=$(DESTDIR)/include
+INCDIR=${PREFIX}/include
# Root of man pages. Subdirectories will be
# ${MANDIR}/man1, ${MANDIR}/man4, and ${MANDIR}/man8.
-MANDIR=$(DESTDIR)/man
+MANDIR=${PREFIX}/man
#SBINDIR=/usr/sbin
#BINDIR=/usr/bin
@@ -29,8 +29,8 @@
# Location of the AFS and Kerberos libraries and include files. Uncomment
# and edit these if you want to include AFS or Kerberos support in afpd
@ -33,3 +42,11 @@
##########################################################################
@@ -55,6 +55,7 @@
esac; \
echo "Making $@ for $$ARCH..."; \
cd sys/$$ARCH && ${MAKE} ${MFLAGS} \
+ CC="${CC}" OPTOPTS="${OPTOPTS}" \
SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \

11
net/netatalk/patches/patch-man-makefile Normal file
View File

@ -0,0 +1,11 @@
--- man/Makefile.orig Wed Aug 9 08:26:04 2000
+++ man/Makefile Wed Aug 9 08:26:14 2000
@@ -21,7 +21,7 @@
done
install:
- -mkdir ${MANDIR}
+ -mkdir ${DESTDIR}${MANDIR}
for i in ${ALL}; \
do (cd $$i; ${MAKE} ${MFLAGS} \
DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \

20
net/netatalk/patches/patch-manman1-makefile Normal file
View File

@ -0,0 +1,20 @@
--- man/man1/Makefile.orig Tue Feb 20 12:16:24 1996
+++ man/man1/Makefile Wed Aug 9 08:27:36 2000
@@ -13,14 +13,14 @@
all :
install : all
- -mkdir ${MANDIR}/man1
+ -mkdir ${DESTDIR}${MANDIR}/man1
for i in ${SRC} ; do \
- rm -f ${MANDIR}/man1/$$i; \
+ rm -f ${DESTDIR}${MANDIR}/man1/$$i; \
sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
-e s@:INCDIR:@${INCDIR}@ \
- < $$i > ${MANDIR}/man1/$$i; \
+ < $$i > ${DESTDIR}${MANDIR}/man1/$$i; \
done
clean :

20
net/netatalk/patches/patch-manman3-makefile Normal file
View File

@ -0,0 +1,20 @@
--- man/man3/Makefile.orig Tue Feb 20 12:16:49 1996
+++ man/man3/Makefile Wed Aug 9 08:28:58 2000
@@ -11,14 +11,14 @@
all :
install : all
- -mkdir ${MANDIR}/man3
+ -mkdir ${DESTDIR}${MANDIR}/man3
for i in ${SRC} ; do \
- rm -f ${MANDIR}/man3/$$i; \
+ rm -f ${DESTDIR}${MANDIR}/man3/$$i; \
sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
-e s@:INCDIR:@${INCDIR}@ \
- < $$i > ${MANDIR}/man3/$$i; \
+ < $$i > ${DESTDIR}${MANDIR}/man3/$$i; \
done
clean :

20
net/netatalk/patches/patch-manman4-makefile Normal file
View File

@ -0,0 +1,20 @@
--- man/man4/Makefile.orig Tue Feb 20 12:02:27 1996
+++ man/man4/Makefile Wed Aug 9 08:30:05 2000
@@ -10,14 +10,14 @@
all :
install : all
- -mkdir ${MANDIR}/man4
+ -mkdir ${DESTDIR}${MANDIR}/man4
for i in ${SRC} ; do \
- rm -f ${MANDIR}/man4/$$i; \
+ rm -f ${DESTDIR}${MANDIR}/man4/$$i; \
sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
-e s@:INCDIR:@${INCDIR}@ \
- < $$i > ${MANDIR}/man4/$$i; \
+ < $$i > ${DESTDIR}${MANDIR}/man4/$$i; \
done
clean :

20
net/netatalk/patches/patch-manman8-makefile Normal file
View File

@ -0,0 +1,20 @@
--- man/man8/Makefile.orig Tue Feb 20 12:16:10 1996
+++ man/man8/Makefile Wed Aug 9 08:31:14 2000
@@ -11,14 +11,14 @@
all :
install : all
- -mkdir ${MANDIR}/man8
+ -mkdir ${DESTDIR}${MANDIR}/man8
for i in ${SRC} ; do \
- rm -f ${MANDIR}/man8/$$i; \
+ rm -f ${DESTDIR}${MANDIR}/man8/$$i; \
sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
-e s@:INCDIR:@${INCDIR}@ \
- < $$i > ${MANDIR}/man8/$$i; \
+ < $$i > ${DESTDIR}${MANDIR}/man8/$$i; \
done
clean :

10
net/netatalk/patches/patch-rcatalkbsd
View File

@ -1,11 +1,11 @@
--- rc.atalk.bsd.orig Wed Feb 21 03:53:28 1996
+++ rc.atalk.bsd Wed Nov 10 11:08:51 1999
--- rc.atalk.bsd.orig Tue Feb 20 11:53:28 1996
+++ rc.atalk.bsd Wed Aug 9 08:44:39 2000
@@ -15,25 +15,25 @@
echo -n 'starting appletalk daemons:'
if [ -f :SBINDIR:/atalkd ]; then
- :SBINDIR:/atalkd; echo -n ' atalkd'
+ :SBINDIR:/atalkd -f /etc/netatalk/atalkd.conf; echo -n ' atalkd'
+ :SBINDIR:/atalkd -f :ETCDIR:/atalkd.conf; echo -n ' atalkd'
fi
if [ -f :BINDIR:/nbprgstr ]; then
@ -19,12 +19,12 @@
- :SBINDIR:/papd; echo -n ' papd'
-fi
+#if [ -f :SBINDIR:/papd ]; then
+# :SBINDIR:/papd -f /etc/netatalk/papd.conf; echo -n ' papd'
+# :SBINDIR:/papd -f :ETCDIR:/papd.conf; echo -n ' papd'
+#fi
if [ -f :SBINDIR:/afpd ]; then
- :SBINDIR:/afpd; echo -n ' afpd'
+ :SBINDIR:/afpd -f /etc/netatalk/AppleVolumes.default; echo -n ' afpd'
+ :SBINDIR:/afpd -f :ETCDIR:/AppleVolumes.default; echo -n ' afpd'
fi
-if [ -f :SBINDIR:/timelord ]; then

35
net/netatalk/patches/patch-sysopenbsd-makefile
View File

@ -1,34 +1,33 @@
--- sys/openbsd/Makefile.orig Sat Oct 17 23:54:53 1998
+++ sys/openbsd/Makefile Thu Nov 25 11:30:46 1999
@@ -1,6 +1,6 @@
# OpenBSD specific defines, passed to subdirectories.
DEFS= -DBSD4_4
-OPTOPTS= -O2
+OPTOPTS= -O2 -Wall
CC= gcc
INSTALL= install
ADDLIBS=
@@ -21,7 +21,8 @@
--- sys/openbsd/Makefile.orig Sat Oct 17 09:54:53 1998
+++ sys/openbsd/Makefile Wed Aug 9 09:12:15 2000
@@ -21,7 +21,9 @@
FRC:
install :
- -mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
+ -mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR} \
+ /usr/local/lib/netatalk
+ -mkdir ${DESTDIR}${PREFIX} ${DESTDIR}${SBINDIR} \
+ ${DESTDIR}${BINDIR} ${DESTDIR}${ETCDIR} ${DESTDIR}${LIBDIR}
+ -mkdir ${DESTDIR}${PREFIX}/share/examples/netatalk
for i in ${ALL}; \
do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
@@ -30,12 +31,11 @@
@@ -30,17 +32,12 @@
AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
INSTALL="${INSTALL}" $@); \
done
- rm -f ${ETCDIR}/rc.atalk
+ rm -f ${DESTDIR}${PREFIX}/share/examples/netatalk/rc.atalk
sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
-e s@:INCDIR:@${INCDIR}@ \
- < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
+ < ../../rc.atalk.bsd > /usr/local/lib/netatalk/rc.atalk
@echo
@echo "Install is done. Don't forget to add lines from"
@echo "services.atalk to /etc/services and to call rc.atalk"
- @echo
- @echo "Install is done. Don't forget to add lines from"
- @echo "services.atalk to /etc/services and to call rc.atalk"
- @echo "in /etc/rc. See README and README.OPENBSD for more"
- @echo "information."
+ < ../../rc.atalk.bsd > ${DESTDIR}${PREFIX}/share/examples/netatalk/rc.atalk
clean :
for i in ${ALL}; \

4
net/netatalk/pkg/DEINSTALL
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:21 brad Exp $
# $OpenBSD: DEINSTALL,v 1.3 2000/08/10 17:53:34 brad Exp $
#
# netatalk de-installation
@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=/etc/netatalk
if [ -d ${CONFIG_DIR} ]; then
if [ -d $CONFIG_DIR ]; then
echo
echo "+---------------"
echo "| To completely deinstall the $1 package you need to perform"

2
net/netatalk/pkg/DESCR
View File

@ -19,4 +19,4 @@ o Route AppleTalk between multiple Ethernet interfaces.
Requires AppleTalk support in the kernel (OpenBSD 2.2 or newer).
Compile a kernel with option NETATALK
See http://www.umich.edu/~rsug/netatalk/ for further information.
WWW: ${HOMEPAGE}

26
net/netatalk/pkg/INSTALL
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.4 2000/01/31 05:38:43 brad Exp $
# $OpenBSD: INSTALL,v 1.5 2000/08/10 17:53:35 brad Exp $
#
# Pre/post-installation setup of netatalk
@ -9,31 +9,27 @@ set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=/etc/netatalk
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/netatalk
# Function: tell the user what s/he needs to do to use the port just installed
#
do_notice()
{
echo
echo "+---------------"
echo "| The existing $1 configuration files in ${CONFIG_DIR},"
echo "| The existing $1 configuration files in $CONFIG_DIR,"
echo "| have NOT been changed. You may want to compare them to the"
echo "| current sample files, ${PREFIX}/lib/netatalk,"
echo "| current sample files in $SAMPLE_CONFIG_DIR,"
echo "| and update your configuration as needed."
echo "+---------------"
echo
}
# Function: install the netatalk configuration files from the samples
#
do_install()
{
mkdir -p ${CONFIG_DIR}
chmod 750 ${CONFIG_DIR}
cp ${PREFIX}/lib/netatalk/* ${CONFIG_DIR}
install -d -o root -g wheel -m 750 $CONFIG_DIR
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/* $CONFIG_DIR
echo
echo "+---------------"
echo "| The $1 configuration files in ${CONFIG_DIR},"
echo "| The $1 configuration files in $CONFIG_DIR,"
echo "| have been installed. Please view these files and change"
echo "| the configuration to meet your needs"
echo "+---------------"
@ -54,10 +50,12 @@ case $2 in
: nothing to pre-install for this port
;;
POST-INSTALL)
if [ -f ${CONFIG_DIR}/rc.atalk ]; then
do_notice $1
else
if [ ! -d $CONFIG_DIR ]; then
do_install $1
elif [ ! -f $CONFIG_DIR/rc.atalk ]; then
do_install $1
else
do_notice $1
fi
;;
*)

66
net/netatalk/pkg/PLIST
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2000/08/10 17:53:35 brad Exp $
bin/aecho
bin/getzones
bin/hqx2bin
@ -25,19 +26,8 @@ include/atalk/pap.h
include/atalk/paths.h
include/atalk/rtmp.h
include/atalk/zip.h
include/netatalk/aarp.h
include/netatalk/at.h
include/netatalk/at_extern.h
include/netatalk/at_var.h
include/netatalk/ddp.h
include/netatalk/ddp_var.h
include/netatalk/endian.h
include/netatalk/phase2.h
lib/libatalk.a
lib/libatalk_p.a
lib/netatalk/AppleVolumes.system
lib/netatalk/AppleVolumes.default
lib/netatalk/rc.atalk
libexec/afpd
libexec/atalkd
libexec/etc2ps
@ -66,28 +56,34 @@ man/man8/afpd.8
man/man8/atalkd.8
man/man8/papd.8
man/man8/psf.8
share/filters/ifmpap
share/filters/ifmpaprev
share/filters/ifpap
share/filters/ifpaprev
share/filters/ifwmpap
share/filters/ifwmpaprev
share/filters/ifwpap
share/filters/ifwpaprev
share/filters/ofmpap
share/filters/ofpap
share/filters/ofwmpap
share/filters/ofwpap
share/filters/tfmpap
share/filters/tfmpaprev
share/filters/tfpap
share/filters/tfpaprev
share/filters/tfwmpap
share/filters/tfwmpaprev
share/filters/tfwpap
share/filters/tfwpaprev
share/pagecount.ps
share/doc/netatalk/README
share/doc/netatalk/README.OPENBSD
share/examples/netatalk/AppleVolumes.system
share/examples/netatalk/AppleVolumes.default
share/examples/netatalk/rc.atalk
share/netatalk/pagecount.ps
share/netatalk/filters/ofpap
share/netatalk/filters/ifpap
share/netatalk/filters/tfpap
share/netatalk/filters/ifpaprev
share/netatalk/filters/tfpaprev
share/netatalk/filters/ofwpap
share/netatalk/filters/ifwpap
share/netatalk/filters/tfwpap
share/netatalk/filters/ifwpaprev
share/netatalk/filters/tfwpaprev
share/netatalk/filters/ofmpap
share/netatalk/filters/ifmpap
share/netatalk/filters/tfmpap
share/netatalk/filters/ifmpaprev
share/netatalk/filters/tfmpaprev
share/netatalk/filters/ofwmpap
share/netatalk/filters/ifwmpap
share/netatalk/filters/tfwmpap
share/netatalk/filters/ifwmpaprev
share/netatalk/filters/tfwmpaprev
@dirrm include/atalk
@dirrm include/netatalk
@dirrm lib/netatalk
@dirrm share/filters
@dirrm share/doc/netatalk
@dirrm share/examples/netatalk
@dirrm share/netatalk/filters
@dirrm share/netatalk