In pkgsrc, the directory layout does not depend on the operating system.

NetBSD · May 31, 2007 · 5394bdb · 5394bdb
1 parent 9e31b55
commit 5394bdb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/net/ser/distinfo b/net/ser/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $
+$NetBSD: distinfo,v 1.2 2007/05/31 04:22:10 rillig Exp $
 
 SHA1 (ser-0.8.14_src.tar.gz) = 91553951247506850d66da25819333b61b150d1d
 RMD160 (ser-0.8.14_src.tar.gz) = 72c3a0793f3dd88584ee65b3751ccf8a3776f840
 Size (ser-0.8.14_src.tar.gz) = 1551881 bytes
-SHA1 (patch-aa) = c3d5e9c97995f45fc0367502ae699c3cdb605f77
+SHA1 (patch-aa) = 25ee2488f106859ce1208923d5e5ae762dbe65f1
 SHA1 (patch-ad) = aa7a962546fbfcbecde79d68c0765ae34c2916da
diff --git a/net/ser/patches/patch-aa b/net/ser/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2007/05/31 04:22:10 rillig Exp $
 
---- Makefile.defs.orig	2004-07-27 11:38:33.000000000 +0000
-+++ Makefile.defs
+--- Makefile.defs.orig	2004-07-27 13:38:33.000000000 +0200
++++ Makefile.defs	2007-05-31 06:17:16.000000000 +0200
 @@ -77,7 +77,7 @@ prefix = $(PREFIX)
  BASEDIR ?=
  basedir = $(BASEDIR)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $
  bin-prefix = $(basedir)$(prefix)
  modules-prefix = $(basedir)$(prefix)
  doc-prefix = $(basedir)$(prefix)
-@@ -85,7 +85,8 @@ man-prefix = $(basedir)$(prefix)
+@@ -85,9 +85,14 @@ man-prefix = $(basedir)$(prefix)
  ut-prefix = $(basedir)$(prefix)
 
  # dirs
@@ -20,8 +20,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $
 +eg-dir  = $(EGDIR)/
  bin-dir = sbin/
  modules-dir = lib/ser/modules/
++ifeq (1, 1)
++	doc-dir = share/doc/ser
++	man-dir = $(PKGMANDIR)
++else
  ifeq ($(OS), linux)
-@@ -104,6 +105,10 @@ ifeq ($(OS), netbsd)
+ 	doc-dir = share/doc/ser/
+ 	man-dir = share/man/
+@@ -104,6 +109,10 @@ ifeq ($(OS), netbsd)
  	doc-dir = share/doc/ser
  	man-dir = man/
  else
@@ -32,10 +38,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $
  ifeq ($(OS), darwin)
  	doc-dir = share/doc/ser/
  	man-dir = man/
-@@ -115,9 +120,10 @@ endif
+@@ -115,9 +124,11 @@ endif
  endif
  endif
  endif
++endif
 +endif
  ut-prefix = bin/
  # target dirs for various stuff
@@ -44,7 +51,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $
  modules-target = $(prefix)/$(modules-dir)
 
 
-@@ -133,10 +139,10 @@ endif
+@@ -133,10 +144,10 @@ endif
  INSTALL-TOUCH = touch          # used to create the file first (good to 
                                 #  make solaris install work)
  # INSTALL-CFG = $(INSTALL) -m 644
@@ -59,15 +66,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $
 
  #set some vars from the environment (and not make builtins)
  CC   := $(shell echo "$${CC}")
-@@ -639,6 +645,7 @@ ifeq	($(CC_NAME), suncc)
+@@ -639,6 +650,7 @@ ifeq	($(CC_NAME), suncc)
  endif
 
  endif #mode=release
 +LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib
 
 
  #*FLAGS used for compiling the modules
-@@ -743,6 +750,19 @@ ifeq ($(OS), netbsd)
+@@ -743,6 +755,19 @@ ifeq ($(OS), netbsd)
  	LIBS= -lfl 
  endif