aboutsummaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorsteve <steve@FreeBSD.org>2000-01-30 05:26:22 +0800
committersteve <steve@FreeBSD.org>2000-01-30 05:26:22 +0800
commitcd1c8f02c5b638329afdd4f538b79150c7753cad (patch)
tree7e5488b51ba854a32257bcad241b2fc987437287 /misc
parent5219af68a4bd07658440f20f77ebba6a73aa87d5 (diff)
downloadfreebsd-ports-gnome-cd1c8f02c5b638329afdd4f538b79150c7753cad.tar.gz
freebsd-ports-gnome-cd1c8f02c5b638329afdd4f538b79150c7753cad.tar.zst
freebsd-ports-gnome-cd1c8f02c5b638329afdd4f538b79150c7753cad.zip
Respect the LOCKDIR setting in the Makefile, as well as the global
CFLAGS. PR: 16307 Submitted by: Paul M. Lambert <plambert@plambert.net>
Diffstat (limited to 'misc')
-rw-r--r--misc/heyu/Makefile6
-rw-r--r--misc/heyu/distinfo2
-rw-r--r--misc/heyu/files/patch-aa30
-rw-r--r--misc/heyu/pkg-plist3
-rw-r--r--misc/heyu2/Makefile6
-rw-r--r--misc/heyu2/distinfo2
-rw-r--r--misc/heyu2/files/patch-aa30
-rw-r--r--misc/heyu2/pkg-plist3
8 files changed, 54 insertions, 28 deletions
diff --git a/misc/heyu/Makefile b/misc/heyu/Makefile
index 3e17f9398bcc..393e28fe296c 100644
--- a/misc/heyu/Makefile
+++ b/misc/heyu/Makefile
@@ -1,5 +1,5 @@
# New ports collection makefile for: heyu
-# Version required: 1.28f
+# Version required: 1.28h
# Date created: 27 December 1999
# Whom: plambert@plambert.net
#
@@ -7,7 +7,7 @@
#
DISTNAME= x10_heyu
-PKGNAME= heyu-1.28f
+PKGNAME= heyu-1.28h
CATEGORIES= misc
MASTER_SITES= http://www.prado.com/~dbs/
EXTRACT_SUFX= .tgz
@@ -28,7 +28,7 @@ post-install:
strip ${PREFIX}/bin/heyu
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/examples/heyu
- ${INSTALL_DATA} ${WRKSRC}/x10config ${PREFIX}/share/examples/heyu
+ ${INSTALL_DATA} ${WRKSRC}/x10config ${PREFIX}/share/examples/heyu/x10config.sample
${INSTALL_DATA} ${WRKSRC}/x10sched.conf.sample ${PREFIX}/share/examples/heyu
.endif
diff --git a/misc/heyu/distinfo b/misc/heyu/distinfo
index c09e7a350884..a1939e38cbb1 100644
--- a/misc/heyu/distinfo
+++ b/misc/heyu/distinfo
@@ -1 +1 @@
-MD5 (x10_heyu.tgz) = f41c73b9665242ce5b9aba2b9a4f92e8
+MD5 (x10_heyu.tgz) = 16127c9f27c15d5b7ec847b962e2625b
diff --git a/misc/heyu/files/patch-aa b/misc/heyu/files/patch-aa
index a924c133b1ed..6ca201db6652 100644
--- a/misc/heyu/files/patch-aa
+++ b/misc/heyu/files/patch-aa
@@ -1,14 +1,14 @@
---- Makefile.orig Tue Jan 4 23:10:44 2000
-+++ Makefile Tue Jan 4 23:12:54 2000
-@@ -3,7 +3,7 @@
- BIN = /usr/local/bin
+--- work/heyu.dir/Makefile Thu Jan 6 23:47:16 2000
++++ Makefile Sun Jan 23 00:35:45 2000
+@@ -4,7 +4,7 @@
MAN = /usr/local/man/man1
MAN5 = /usr/local/man/man5
--GROUP = sys
-+GROUP = wheel
- OWNER = bin
+ GROUP = sys
+-OWNER = bin
++OWNER = root
+ # set DFLAGS equal to:
@@ -13,19 +13,19 @@
# -DVOID if compiler doesn't understand 'void'
# -DMINIEXCH if using the DEC mini-exchange
@@ -20,8 +20,8 @@
LIBS = -lm -lc
## For LINUX, use the following defines in addition to what's above
--DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT
-+#DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT
+-DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX
++#DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX
## For solaris, use the following defines in addition to what's above
# DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DLOCKDIR=\"/var/spool/locks\" -DHASSELECT
@@ -32,3 +32,15 @@
## If you aren't sure, try this
#DFLAGS = -DSYSV -DPOSIX
+@@ -54,9 +54,10 @@
+ EVERYTHING = $(OTHERSRC) $(SRCS)
+
+ heyu: $(OBJS) version.h
+- cc $(LDFLAGS) -o heyu $(OBJS) $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DFLAGS) -o heyu $(OBJS) $(LIBS)
+
+ $(OBJS): x10.h
++ cc $(CFLAGS) $(DFLAGS) -c $<
+
+ eeprom.o: eeprom.h
+
diff --git a/misc/heyu/pkg-plist b/misc/heyu/pkg-plist
index e24c578722a1..ee07938e074e 100644
--- a/misc/heyu/pkg-plist
+++ b/misc/heyu/pkg-plist
@@ -1,3 +1,4 @@
bin/heyu
-share/examples/heyu/x10config
+share/examples/heyu/x10config.sample
share/examples/heyu/x10sched.conf.sample
+@dirrm share/examples/heyu
diff --git a/misc/heyu2/Makefile b/misc/heyu2/Makefile
index 3e17f9398bcc..393e28fe296c 100644
--- a/misc/heyu2/Makefile
+++ b/misc/heyu2/Makefile
@@ -1,5 +1,5 @@
# New ports collection makefile for: heyu
-# Version required: 1.28f
+# Version required: 1.28h
# Date created: 27 December 1999
# Whom: plambert@plambert.net
#
@@ -7,7 +7,7 @@
#
DISTNAME= x10_heyu
-PKGNAME= heyu-1.28f
+PKGNAME= heyu-1.28h
CATEGORIES= misc
MASTER_SITES= http://www.prado.com/~dbs/
EXTRACT_SUFX= .tgz
@@ -28,7 +28,7 @@ post-install:
strip ${PREFIX}/bin/heyu
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/examples/heyu
- ${INSTALL_DATA} ${WRKSRC}/x10config ${PREFIX}/share/examples/heyu
+ ${INSTALL_DATA} ${WRKSRC}/x10config ${PREFIX}/share/examples/heyu/x10config.sample
${INSTALL_DATA} ${WRKSRC}/x10sched.conf.sample ${PREFIX}/share/examples/heyu
.endif
diff --git a/misc/heyu2/distinfo b/misc/heyu2/distinfo
index c09e7a350884..a1939e38cbb1 100644
--- a/misc/heyu2/distinfo
+++ b/misc/heyu2/distinfo
@@ -1 +1 @@
-MD5 (x10_heyu.tgz) = f41c73b9665242ce5b9aba2b9a4f92e8
+MD5 (x10_heyu.tgz) = 16127c9f27c15d5b7ec847b962e2625b
diff --git a/misc/heyu2/files/patch-aa b/misc/heyu2/files/patch-aa
index a924c133b1ed..6ca201db6652 100644
--- a/misc/heyu2/files/patch-aa
+++ b/misc/heyu2/files/patch-aa
@@ -1,14 +1,14 @@
---- Makefile.orig Tue Jan 4 23:10:44 2000
-+++ Makefile Tue Jan 4 23:12:54 2000
-@@ -3,7 +3,7 @@
- BIN = /usr/local/bin
+--- work/heyu.dir/Makefile Thu Jan 6 23:47:16 2000
++++ Makefile Sun Jan 23 00:35:45 2000
+@@ -4,7 +4,7 @@
MAN = /usr/local/man/man1
MAN5 = /usr/local/man/man5
--GROUP = sys
-+GROUP = wheel
- OWNER = bin
+ GROUP = sys
+-OWNER = bin
++OWNER = root
+ # set DFLAGS equal to:
@@ -13,19 +13,19 @@
# -DVOID if compiler doesn't understand 'void'
# -DMINIEXCH if using the DEC mini-exchange
@@ -20,8 +20,8 @@
LIBS = -lm -lc
## For LINUX, use the following defines in addition to what's above
--DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT
-+#DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT
+-DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX
++#DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX
## For solaris, use the following defines in addition to what's above
# DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DLOCKDIR=\"/var/spool/locks\" -DHASSELECT
@@ -32,3 +32,15 @@
## If you aren't sure, try this
#DFLAGS = -DSYSV -DPOSIX
+@@ -54,9 +54,10 @@
+ EVERYTHING = $(OTHERSRC) $(SRCS)
+
+ heyu: $(OBJS) version.h
+- cc $(LDFLAGS) -o heyu $(OBJS) $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DFLAGS) -o heyu $(OBJS) $(LIBS)
+
+ $(OBJS): x10.h
++ cc $(CFLAGS) $(DFLAGS) -c $<
+
+ eeprom.o: eeprom.h
+
diff --git a/misc/heyu2/pkg-plist b/misc/heyu2/pkg-plist
index e24c578722a1..ee07938e074e 100644
--- a/misc/heyu2/pkg-plist
+++ b/misc/heyu2/pkg-plist
@@ -1,3 +1,4 @@
bin/heyu
-share/examples/heyu/x10config
+share/examples/heyu/x10config.sample
share/examples/heyu/x10sched.conf.sample
+@dirrm share/examples/heyu